diff --git a/lib/lists.nix b/lib/lists.nix
index 2dda700bef3..fa8cbddfd94 100644
--- a/lib/lists.nix
+++ b/lib/lists.nix
@@ -234,8 +234,8 @@ rec {
       in [x] ++ remove x xs;
 
   # Intersects list 'e' and another list
-  intersect = e: filter (x: elem x e);
+  intersectLists = e: filter (x: elem x e);
 
-  # Substracts list 'e' from another list
-  substract = e: filter (x: !(elem x e));
+  # Subtracts list 'e' from another list
+  subtractLists = e: filter (x: !(elem x e));
 }
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 9efadab18c0..3c3f9151d83 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -33,8 +33,8 @@ elif [[ $1 == build ]]; then
         echo "=== Checking PR"
         nox-review pr ${TRAVIS_PULL_REQUEST}
     fi
-    echo "=== Checking tarball creation"
-    nix-build pkgs/top-level/release.nix -A tarball
+    # echo "=== Checking tarball creation"
+    # nix-build pkgs/top-level/release.nix -A tarball
 else
     echo "$0: Unknown option $1" >&2
     false
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index f585a277479..db87f9fd0b1 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -489,6 +489,7 @@ in {
       utmp.gid = ids.gids.utmp;
       adm.gid = ids.gids.adm;
       grsecurity.gid = ids.gids.grsecurity;
+      input.gid = ids.gids.input;
     };
 
     system.activationScripts.users = stringAfter [ "etc" ]
diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix
index 2b20dc7395a..209310bec99 100644
--- a/nixos/modules/hardware/video/nvidia.nix
+++ b/nixos/modules/hardware/video/nvidia.nix
@@ -47,6 +47,15 @@ in
 
     boot.extraModulePackages = [ nvidia_x11 ];
 
+    # nvidia-uvm is required by CUDA applications.
+    boot.kernelModules = [ "nvidia-uvm" ];
+
+    # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded.
+    services.udev.extraRules =
+      ''
+        KERNEL=="nvidia_uvm", RUN+="${pkgs.stdenv.shell} -c 'mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \  -f 1) 0'"
+      '';
+
     boot.blacklistedKernelModules = [ "nouveau" "nvidiafb" ];
 
     services.acpid.enable = true;
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0c863ec8de1..bd0c0bef8b6 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -301,8 +301,6 @@
       mlmmj = 135;
       riemann = 137;
       riemanndash = 138;
-      hbase = 139;
-      opentsdb = 140;
       uhub = 142;
       mailpile = 146;
       redmine = 147;
@@ -313,14 +311,17 @@
       systemd-resolve = 153;
       systemd-timesync = 154;
       liquidsoap = 155;
-      fleet = 159;
+      hbase = 158;
+      opentsdb = 159;
       scollector = 160;
       bosun = 161;
       kubernetes = 162;
       gitlab = 165;
-      nylon = 166;
+      nylon = 168;
       panamax = 170;
       exim = 172;
+      fleet = 173;
+      input = 174;
 
       # 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/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix
index 157da76d752..1128c5e005e 100644
--- a/nixos/modules/virtualisation/xen-dom0.nix
+++ b/nixos/modules/virtualisation/xen-dom0.nix
@@ -59,11 +59,12 @@ in
 
     virtualisation.xen.stored =
       mkOption {
-        default = "${pkgs.xen}/bin/oxenstored";
+        default = null;
         description =
           ''
-            Xen Store daemon to use.
+            Xen Store daemon to use. Defaults to oxenstored of the xen package.
           '';
+        apply = x: if x == null then "${xen}/bin/oxenstored" else x;
       };
 
     virtualisation.xen.trace =
diff --git a/nixos/release.nix b/nixos/release.nix
index e7771788edc..cc451f7fe15 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -254,6 +254,7 @@ in rec {
   tests.fleet = scrubDrv (import tests/fleet.nix { system = "x86_64-linux"; });
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
+  tests.i3wm = callTest tests/i3wm.nix {};
   tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test);
   tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test);
   tests.installer.rebuildCD = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).rebuildCD.test);
diff --git a/nixos/tests/i3wm.nix b/nixos/tests/i3wm.nix
new file mode 100644
index 00000000000..0966dba8a3c
--- /dev/null
+++ b/nixos/tests/i3wm.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix {
+  name = "i3wm";
+
+  machine = { lib, pkgs, ... }: {
+    imports = [ ./common/x11.nix ./common/user-account.nix ];
+    services.xserver.displayManager.auto.user = "alice";
+    services.xserver.windowManager.default = lib.mkForce "i3";
+    services.xserver.windowManager.i3.enable = true;
+  };
+
+  testScript = { nodes, ... }: ''
+    $machine->waitForX;
+    $machine->waitForWindow(qr/first configuration/);
+    $machine->sleep(1);
+    $machine->screenshot("started");
+    $machine->sendKeys("ret");
+    $machine->sleep(1);
+    $machine->sendKeys("alt");
+    $machine->sleep(1);
+    $machine->screenshot("configured");
+    $machine->sendKeys("ret");
+    $machine->sleep(2);
+    $machine->sendKeys("alt-ret");
+    $machine->waitForWindow(qr/machine.*alice/);
+    $machine->sleep(1);
+    $machine->screenshot("terminal");
+  '';
+}
diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index 52c079791ac..bf437584559 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.2";
+  version = "0.6.3";
 
   src = fetchurl {
     url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
-    sha256 = "1mrd6m6ph0fscxp9x96ipxh6ai7w0n1miapcfqrqfy058qx5zbck";
+    sha256 = "00r2f7psd2jym2lxf3q3lz2lskz7091pz9glnxqam2bznwnlyxyp";
   };
 
   configureFlags = [ "BOOST_LIB_SUFFIX=" ]
diff --git a/pkgs/applications/editors/kdevelop/default.nix b/pkgs/applications/editors/kdevelop/default.nix
index b98e02fd7b9..b0ac24ee61a 100644
--- a/pkgs/applications/editors/kdevelop/default.nix
+++ b/pkgs/applications/editors/kdevelop/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "4.7.0";
+  version = "4.7.1";
   pname = "kdevelop";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "68de8f412e8ab6107766f00623e54c458d02825e3a70f5ea9969688f8c77c120";
+    sha256 = "e3ad5377f53739a67216d37cda3f88c03f8fbb0c96e2a9ef4056df3c124e95c1";
   };
 
   buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 93450d17916..efe8785654a 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram "$out/bin/mysql-workbench" \
       --prefix LD_LIBRARY_PATH : "${python}/lib" \
-      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64" \
+      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \
       --prefix PATH : "${gnome_keyring}/bin" \
       --prefix PATH : "${python}/bin" \
       --set PYTHONPATH $PYTHONPATH \
diff --git a/pkgs/applications/misc/procmail/CVE-2014-3618.patch b/pkgs/applications/misc/procmail/CVE-2014-3618.patch
new file mode 100644
index 00000000000..e3aa5600e40
--- /dev/null
+++ b/pkgs/applications/misc/procmail/CVE-2014-3618.patch
@@ -0,0 +1,18 @@
+From http://seclists.org/oss-sec/2014/q3/495 (with whitespace corrected).
+
+--- a/src/formisc.c 2013-08-04 00:13:33.000000000 -0700
++++ b/src/formisc.c 2014-09-03 11:42:25.986002396 -0700
+@@ -84,12 +84,11 @@
+ 	case '"':*target++=delim='"';start++;
+       }
+      ;{ int i;
+-	do
++	while(*start)
+ 	   if((i= *target++= *start++)==delim)	 /* corresponding delimiter? */
+ 	      break;
+ 	   else if(i=='\\'&&*start)		    /* skip quoted character */
+ 	      *target++= *start++;
+-	while(*start);						/* anything? */
+       }
+      hitspc=2;
+    }
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index c786eec7e64..f4980cb2c6b 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation {
     make DESTDIR=\$out install
    ";
 
-  phases = "unpackPhase installPhase";
+  phases = "unpackPhase patchPhase installPhase";
+
+  patches = [ ./CVE-2014-3618.patch ];
 
   src = fetchurl {
     url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz;
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index bd934b6cf73..1a9f8f8feab 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "profanity-${version}";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchurl {
     url = "http://www.profanity.im/profanity-${version}.tar.gz";
-    sha256 = "0qzwqxcxf695z3gf94psd2x619vlp4hkkjmkrpsla1ns0f6v6dkl";
+    sha256 = "17ra53c1m0w0lzm5bj63y1ysx8bv119z5h0csisxsn4r85z6cwln";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 256b4a7ed3a..313d2bce1b7 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
       echo "patching ts3client..."
       patchelf \
         --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \
+        --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
         --force-rpath \
         ts3client
     '';
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
index be5f6d0037c..1da719845a3 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
       echo "patching ts3server"
       patchelf \
         --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath $(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \
+        --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/${libDir} \
         --force-rpath \
         ts3server
     '';
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 3739d098acc..d5cc3fb7718 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
 , zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
-, pythonPackages, cacert, cmake, makeWrapper }:
+, pythonPackages, cacert, cmake, makeWrapper
+, extraBuildInputs ? [] }:
 
 stdenv.mkDerivation rec {
   version = "1.1.1";
@@ -15,18 +16,15 @@ stdenv.mkDerivation rec {
     [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
       libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
       cacert cmake ]
-    ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync;
+    ++ extraBuildInputs;
 
-  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}";
+  NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=${cacert}/etc/ca-bundle.crt";
 
   postInstall = ''
     NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    NIX_PYTHONPATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages"
-  '' + ''
-     wrapProgram "$out/bin/weechat" \
-       --prefix PYTHONPATH : "$PYTHONPATH" \
-       --prefix PYTHONPATH : "$NIX_PYTHONPATH"
+    wrapProgram "$out/bin/weechat" \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix PYTHONPATH : "$NIX_PYTHONPATH"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix
new file mode 100644
index 00000000000..6a54a0e7ff0
--- /dev/null
+++ b/pkgs/applications/networking/remote/teamviewer/10.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wineUnstable, makeWrapper, libXau
+, bash, patchelf, config }:
+
+let
+  topath = "${wineUnstable}/bin";
+
+  toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 
+    [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]);
+in
+stdenv.mkDerivation {
+  name = "teamviewer-10.0.37742";
+  src = fetchurl {
+    url = config.teamviewer10.url or "http://download.teamviewer.com/download/teamviewer_amd64.deb";
+    sha256 = config.teamviewer10.sha256 or "1j3zbvyj003gk8mm9sv1dld9x30l6fswwlhdyk46mixsqq5ayp6c";
+  };
+
+  buildInputs = [ makeWrapper patchelf ];
+
+  unpackPhase = ''
+    ar x $src
+    tar xf data.tar.gz
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/teamviewer $out/bin
+    cp -a opt/teamviewer/* $out/share/teamviewer
+    rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share}
+
+    cat > $out/bin/teamviewer << EOF
+    #!${bash}/bin/sh
+    export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
+    export PATH=${topath}\''${PATH:+:\$PATH}
+    $out/share/teamviewer/tv_bin/script/teamviewer "\$@"
+    EOF
+    chmod +x $out/bin/teamviewer
+
+    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/
+  '';
+
+  meta = {
+    homepage = "http://www.teamviewer.com";
+    license = stdenv.lib.licenses.unfree;
+    description = "Desktop sharing application, providing remote support and online meetings";
+  };
+}
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
deleted file mode 100644
index 55a5beb5093..00000000000
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes, wine, makeWrapper
-, bash, findutils, coreutils }:
-
-assert stdenv.system == "i686-linux";
-let
-  topath = "${wine}/bin";
-
-  toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") 
-    [ stdenv.cc.cc libX11 libXtst libXext libXdamage libXfixes wine ]);
-in
-stdenv.mkDerivation {
-  name = "teamviewer-7.0.9377";
-  src = fetchurl {
-    url = "http://download.teamviewer.com/download/version_7x/teamviewer_linux.tar.gz";
-    sha256 = "1f8934jqj093m1z56yl6k2ah6njkk6pz1rjvpqnryi29pp5piaiy";
-  };
-
-  buildInputs = [ makeWrapper ];
-
-  # I need patching, mainly for it not try to use its own 'wine' (in the tarball).
-  installPhase = ''
-    mkdir -p $out/share/teamviewer $out/bin
-    cp -a .tvscript/* $out/share/teamviewer
-    cp -a .wine/drive_c $out/share/teamviewer
-    sed -i -e 's/^tv_Run//' \
-      -e 's/^  setup_tar_env//' \
-      -e 's/^  setup_env//' \
-      -e 's,^  TV_Wine_dir=.*,  TV_Wine_dir=${wine},' \
-      -e 's,progsrc=.*drive_c,progsrc='$out'"/share/teamviewer/drive_c,' \
-      $out/share/teamviewer/wrapper
-
-    cat > $out/bin/teamviewer << EOF
-    #!${bash}/bin/sh
-    # Teamviewer puts symlinks to nix store paths in ~/.teamviewer. When those
-    # paths become garbage collected, teamviewer crashes upon start because of
-    # those broken symlinks. An easy workaround to this behaviour is simply to
-    # delete all symlinks before we start teamviewer. Teamviewer will fixup the
-    # symlinks, just like it did the first time the user ran it.
-    ${findutils}/bin/find "\$HOME"/.teamviewer/*/*/"Program Files/TeamViewer/" -type l -print0 | ${findutils}/bin/xargs -0 ${coreutils}/bin/rm
-
-    export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
-    export PATH=${topath}\''${PATH:+:\$PATH}
-    $out/share/teamviewer/wrapper wine "c:\Program Files\TeamViewer\Version7\TeamViewer.exe" "\$@"
-    EOF
-    chmod +x $out/bin/teamviewer
-  '';
-
-  meta = {
-    homepage = "http://www.teamviewer.com";
-    license = stdenv.lib.licenses.unfree;
-    description = "Desktop sharing application, providing remote support and online meetings";
-  };
-}
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index a1ad5ddc779..bdc0db6db14 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.10.23";
+  version = "0.10.24";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1f1a83d9e5f1b235d62ecbd86d3afb682d88c2471354ad308f00d2ef668e797e";
+    sha256 = "9c79f62a10c88fe5d3452f16b0f8ed9cde5a70ec82aaec1e7b99cc1fb41a3dda";
   };
 
   subPackages = [ "cmd/syncthing" ];
diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh
index 5cf03348839..79e5b309769 100644
--- a/pkgs/applications/taxes/aangifte-2007/builder.sh
+++ b/pkgs/applications/taxes/aangifte-2007/builder.sh
@@ -6,7 +6,7 @@ buildPhase() {
     for i in bin/*; do
         patchelf \
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \
+            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
             $i
     done
 }
diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh
index 5cf03348839..79e5b309769 100644
--- a/pkgs/applications/taxes/aangifte-2008/builder.sh
+++ b/pkgs/applications/taxes/aangifte-2008/builder.sh
@@ -6,7 +6,7 @@ buildPhase() {
     for i in bin/*; do
         patchelf \
             --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \
+            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
             $i
     done
 }
diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix
index 59d83f0ea94..c944fc3d68b 100644
--- a/pkgs/applications/taxes/aangifte-2009/default.nix
+++ b/pkgs/applications/taxes/aangifte-2009/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
       for i in bin/*; do
           patchelf \
               --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
               $i
       done
     '';
diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix
index 17a2c502e47..b5a85415c37 100644
--- a/pkgs/applications/taxes/aangifte-2010/default.nix
+++ b/pkgs/applications/taxes/aangifte-2010/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
       for i in bin/*; do
           patchelf \
               --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
               $i
       done
     '';
diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix
index 161a30d5a98..a38bc4254bb 100644
--- a/pkgs/applications/taxes/aangifte-2011/default.nix
+++ b/pkgs/applications/taxes/aangifte-2011/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
       for i in bin/*; do
           patchelf \
               --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
               $i
       done
     '';
diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix
index 9691f2fe9c6..2e51ef9ed4c 100644
--- a/pkgs/applications/taxes/aangifte-2012/default.nix
+++ b/pkgs/applications/taxes/aangifte-2012/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
       for i in bin/*; do
           patchelf \
               --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
               $i
       done
     '';
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
       mkdir -p $out
       cp -prvd * $out/
       wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1
+                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
     '';
 
   meta = {
diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix
index ce4d7f116a8..3cf85961a9b 100644
--- a/pkgs/applications/taxes/aangifte-2013/default.nix
+++ b/pkgs/applications/taxes/aangifte-2013/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
       for i in bin/*; do
           patchelf \
               --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
               $i
       done
     '';
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
       mkdir -p $out
       cp -prvd * $out/
       wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1
+                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
     '';
 
   meta = {
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 62535298060..6f5e20c6579 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -59,11 +59,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.8.0";
+  version = "0.8.2";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "110m4kdnggw0g1sl8jp3gjgjc3q7qb013dba0ggpvlqc8mwm4rg3";
+    sha256 = "19vlh2bzgf2vp1a4887xj7cmnhb42sc0cbqrdya4mck8yr5r6rd5";
   };
 
   buildInputs = 
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 7f12d2fa8f8..af0d5c7fffb 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.20"; # changes ./guest-additions as well
+  version = "4.3.24"; # 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 = "96996";
+  extpackRevision = "98716";
   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 = "7e1253f7013e9cdc84a614a0db38b40de7bbd330cb5b85bd3ef3de213773450d";
+    sha256 = "c6b61774e323b70da0d4f5677ef56f1c53990eccef859d3c720d814f98a01f8d";
     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 = "1484f8e9993ec4fe3892c5165db84d238713d2506e147ed8236541ece642e965";
+    sha256 = "e2123c9b6100fdd52a9b436fe29aa7215fce17c26904583977c1160b11b170cc";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index ba8fb4cd460..56fe2b1083c 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 = "9ab48f44ac26a6deb374cb5fe6bad103bbf4fdf5186140e2d40ebe48bd01f3ea";
+    sha256 = "df4385aaa80f322ee2acda0657a53d9ca5c489e695ee5f9776574b67c649c960";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
@@ -78,6 +78,10 @@ stdenv.mkDerivation {
         patchelf --set-rpath $out/lib:${dbus}/lib $i
     done
 
+    # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions
+    # NixOS module) to 98vboxadd-xclient. For now, just work around it:
+    mv lib/VBoxGuestAdditions/98vboxadd-xclient bin/VBoxClient-all
+
     # Remove references to /usr from various scripts and files
     sed -i -e "s|/usr/bin|$out/bin|" share/VBoxGuestAdditions/vboxclient.desktop
     sed -i -e "s|/usr/bin|$out/bin|" bin/VBoxClient-all
diff --git a/pkgs/build-support/gcc-cross-wrapper/builder.sh b/pkgs/build-support/gcc-cross-wrapper/builder.sh
index 1d7d1046d36..c6bc2a7c8bf 100644
--- a/pkgs/build-support/gcc-cross-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-cross-wrapper/builder.sh
@@ -109,7 +109,7 @@ chmod +x "$out/bin/$crossConfig-ld"
 
 # Emit a setup hook.  Also store the path to the original GCC and
 # Glibc.
-test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc
+test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc
 test -n "$libc" && echo $libc > $out/nix-support/orig-libc
 
 doSubstitute "$addFlags" "$out/nix-support/add-flags"
diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh
index c79680712ee..59cdd3f84ad 100644
--- a/pkgs/build-support/gcc-wrapper-old/builder.sh
+++ b/pkgs/build-support/gcc-wrapper-old/builder.sh
@@ -196,7 +196,7 @@ fi
 
 # Emit a setup hook.  Also store the path to the original GCC and
 # Glibc.
-test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc
+test -n "$gcc" && echo $gcc > $out/nix-support/orig-cc
 test -n "$libc" && echo $libc > $out/nix-support/orig-libc
 
 doSubstitute "$addFlags" "$out/nix-support/add-flags.sh"
diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
new file mode 100644
index 00000000000..b3413dc4738
--- /dev/null
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "d7e8c4cdcf";
+
+  package-name = "numix-icon-theme-circle";
+  
+  name = "${package-name}-20150304";
+
+  buildInputs = [ unzip ];
+  
+  src = fetchurl {
+    url = "https://github.com/numixproject/${package-name}/archive/${version}.zip";
+    sha256 = "672d6f4d000c4c75a64e0297f9609afab1035d082d7ab4f7abe3e2173cba9324";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -dm 755 $out/share/icons
+    cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/
+  '';
+  
+  meta = {
+    description = "Numix icon theme (circle version)";
+    homepage = https://numixproject.org;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
new file mode 100644
index 00000000000..d6ca570ba52
--- /dev/null
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, unzip }:
+
+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";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    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;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix
index a1eec63af56..3b9d4d39118 100644
--- a/pkgs/development/compilers/chicken/default.nix
+++ b/pkgs/development/compilers/chicken/default.nix
@@ -5,9 +5,9 @@ let
   platform = with stdenv;
     if isDarwin then "macosx"
     else if isCygwin then "cygwin"
-    else if isBSD then "bsd"
+    else if (isFreeBSD || isOpenBSD) then "bsd"
     else if isSunOS then "solaris"
-    else "linux";               # Should be a sane default
+    else "linux"; # Should be a sane default
   lib = stdenv.lib;
 in
 stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix
index aea58867a44..b4226163865 100644
--- a/pkgs/development/compilers/cudatoolkit/5.5.nix
+++ b/pkgs/development/compilers/cudatoolkit/5.5.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       --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-gcc)/lib \
+      --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
   '';
diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix
index 558034721ef..49a52fe5d32 100644
--- a/pkgs/development/compilers/cudatoolkit/6.0.nix
+++ b/pkgs/development/compilers/cudatoolkit/6.0.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       --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-gcc)/lib \
+      --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
   '';
diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix
index 9f9d3bc94bf..17156cd0664 100644
--- a/pkgs/development/compilers/cudatoolkit/6.5.nix
+++ b/pkgs/development/compilers/cudatoolkit/6.5.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     gtk2 glib fontconfig freetype unixODBC alsaLib
   ];
 
-  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64";
+  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
 
   unpackPhase = ''
     sh $src --keep --noexec
@@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     find . -type f -executable -exec patchelf \
-      --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+      --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_GCC/nix-support/orig-gcc)/lib \
+      --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
   '';
diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix
index b8e3c172739..a209e392bc6 100644
--- a/pkgs/development/compilers/gnatboot/default.nix
+++ b/pkgs/development/compilers/gnatboot/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     set +e
     for a in $out/bin/* ; do
       patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib $a
+        --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a
     done
     set -e
     mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 9acb399aa1b..37149625005 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
+{ stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }:
 
 let
   loader386 = "${glibc}/lib/ld-linux.so.2";
@@ -6,8 +6,8 @@ let
   loaderArm = "${glibc}/lib/ld-linux.so.3";
   srcs = {
     golang = fetchurl {
-      url = https://github.com/golang/go/archive/go1.4.1.tar.gz;
-      sha256 = "1q21i08nymy30vszbcah8l8yjxm32x2wmjs44kn2x2r4556y1mgi";
+      url = https://github.com/golang/go/archive/go1.4.2.tar.gz;
+      sha256 = "3e5d07bc5214a1ffe187cf6406c5b5a80ee44f12f6bca97a5463db0afee2f6ac";
     };
     tools = fetchgit {
       url = https://github.com/golang/tools.git;
@@ -18,12 +18,14 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "go-1.4.1";
+  name = "go-1.4.2";
 
   src = srcs.golang;
 
   # perl is used for testing go vet
-  buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ;
+  buildInputs = [ bison bash makeWrapper perl ]
+             ++ lib.optionals stdenv.isLinux [ glibc ]
+             ++ lib.optionals stdenv.isDarwin [ Security ];
 
   # I'm not sure what go wants from its 'src', but the go installation manual
   # describes an installation keeping the src.
@@ -76,10 +78,13 @@ stdenv.mkDerivation {
            else throw "Unsupported system";
   GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686
-  CGO_ENABLED = if stdenv.isDarwin then 0 else 1;
+  CGO_ENABLED = 1;
+
+  # The go build actually checks for CC=*/clang and does something different, so we don't
+  # just want the generic `cc` here.
+  CC = if stdenv.isDarwin then "clang" else "cc";
 
   installPhase = ''
-    export CC=cc
     mkdir -p "$out/bin"
     export GOROOT="$(pwd)/"
     export GOBIN="$out/bin"
diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix
index a9f2fba9409..9ed5b8950e9 100644
--- a/pkgs/development/compilers/microscheme/default.nix
+++ b/pkgs/development/compilers/microscheme/default.nix
@@ -1,27 +1,19 @@
-{ stdenv, fetchgit, vim, avrdude, avrgcclibc, makeWrapper }:
+{ stdenv, fetchzip, vim, avrdude, avrgcclibc, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "microscheme-${version}";
-  version = "2015-02-04";
+  version = "0.9.2";
 
-  # externalize url/rev/sha256 to permit easier override
-  rev = "2f14781034a67adc081a22728fbf47a632f4484e";
-  sha256 = "15bdlmchzbhxj262r2fj78wm4c4hfrap4kyzv8n5b624svszr0zd";
-  url = https://github.com/ryansuchocki/microscheme.git;
-
-  src = fetchgit {
-    inherit rev;
-    inherit sha256;
-    inherit url;
+  src = fetchzip {
+    name = "${name}-src";
+    url = "https://github.com/ryansuchocki/microscheme/archive/v${version}.tar.gz";
+    sha256 = "0ly1cphvnsip70kng9q0blb07pkyp9allav42sr6ybswqfqg60j9";
   };
 
   buildInputs = [ makeWrapper vim ];
 
   installPhase = ''
-    mkdir -p $out/bin && make install PREFIX=$out
-
-    mkdir -p $out/share/microscheme/
-    cp -r examples/ $out/share/microscheme
+    make install PREFIX=$out
 
     wrapProgram $out/bin/microscheme \
       --prefix PATH : "${avrdude}/bin:${avrgcclibc}/bin"
diff --git a/pkgs/development/compilers/rustc/1.0.0-alpha.nix b/pkgs/development/compilers/rustc/1.0.0-alpha.nix
index fa80bcb5e02..7a2e485c9c6 100644
--- a/pkgs/development/compilers/rustc/1.0.0-alpha.nix
+++ b/pkgs/development/compilers/rustc/1.0.0-alpha.nix
@@ -1,90 +1,17 @@
-{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper
-, tzdata, git, valgrind, procps, coreutils
-}:
-
-assert !stdenv.isFreeBSD;
-
-/* Rust's build process has a few quirks :
-
-- It requires some patched in llvm that haven't landed upstream, so it
-  compiles its own llvm. This might change in the future, so at some
-  point we may be able to switch to nix's llvm.
-
-- The Rust compiler is written is Rust, so it requires a bootstrap
-  compiler, which is downloaded during the build. To make the build
-  pure, we download it ourself before and put it where it is
-  expected. Once the language is stable (1.0) , we might want to
-  switch it to use nix's packaged rust compiler.
-
-*/
-
-with ((import ./common.nix) {inherit stdenv; version = "1.0.0-alpha"; });
-
-let snapshotHash = if stdenv.system == "i686-linux"
-      then "d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4"
-      else if stdenv.system == "x86_64-linux"
-      then "697880d3640e981bbbf23284363e8e9a158b588d"
-      else if stdenv.system == "i686-darwin"
-      then "a73b1fc03e8cac747aab0aa186292bb4332a7a98"
-      else if stdenv.system == "x86_64-darwin"
-      then "e4ae2670ea4ba5c2e5b4245409c9cab45c9eeb5b"
-      else abort "no-snapshot for platform ${stdenv.system}";
-    snapshotDate = "2015-01-07";
-    snapshotRev = "9e4e524";
-    snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
-
-in stdenv.mkDerivation {
-  inherit name;
-  inherit version;
-  inherit meta;
-
-  src = fetchurl {
-    url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "0p62gx3s087n09d2v3l9iyfx5cmsa1x91n4ysixcb7w3drr8a8is";
-  };
-
-  # We need rust to build rust. If we don't provide it, configure will try to download it.
-  snapshot = stdenv.mkDerivation {
-    name = "rust-stage0";
-    src = fetchurl {
-      url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
-      sha1 = snapshotHash;
-    };
-    dontStrip = true;
-    installPhase = ''
-      mkdir -p "$out"
-      cp -r bin "$out/bin"
-    '' + (if stdenv.isLinux then ''
-      patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
-               --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \
-               "$out/bin/rustc"
-    '' else "");
-  };
-
-  configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
-                ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
-
-  # The compiler requires cc, so we patch the source to tell it where to find it
-  patches = [ ./hardcode_paths.patch ./local_stage0.patch ]
-            ++ stdenv.lib.optional stdenv.needsPax ./grsec.patch;
-
-  postPatch = ''
-    substituteInPlace src/librustc_trans/back/link.rs \
-      --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/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"
-  '';
-
-  buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ];
-
-  enableParallelBuilding = false; # disabled due to rust-lang/rust#16305
-
-  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
-
-  doCheck = true;
+{ stdenv, callPackage }:
+callPackage ./makeRustcDerivation.nix {
+  shortVersion = "1.0.0-alpha";
+  isRelease = true;
+  srcSha = "0p62gx3s087n09d2v3l9iyfx5cmsa1x91n4ysixcb7w3drr8a8is";
+  snapshotHashLinux686 = "d8b73fc9aa3ad72ce1408a41e35d78dba10eb4d4";
+  snapshotHashLinux64 = "697880d3640e981bbbf23284363e8e9a158b588d";
+  snapshotHashDarwin686 = "a73b1fc03e8cac747aab0aa186292bb4332a7a98";
+  snapshotHashDarwin64 = "e4ae2670ea4ba5c2e5b4245409c9cab45c9eeb5b";
+  snapshotDate = "2015-01-07";
+  snapshotRev = "9e4e524";
+  patches = [
+    ./patches/hardcode_paths.alpha.patch
+    ./patches/local_stage0.alpha.patch
+    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 }
+
diff --git a/pkgs/development/compilers/rustc/1.0.0-alpha2.nix b/pkgs/development/compilers/rustc/1.0.0-alpha2.nix
new file mode 100644
index 00000000000..94bdd995592
--- /dev/null
+++ b/pkgs/development/compilers/rustc/1.0.0-alpha2.nix
@@ -0,0 +1,16 @@
+{ stdenv, callPackage }:
+callPackage ./makeRustcDerivation.nix {
+  shortVersion = "1.0.0-alpha.2";
+  isRelease = true;
+  srcSha = "1j2n34w0hdz7jrl100c9q9hl80l8nsc3xwnzizv9sh4gx52vjcd9";
+  snapshotHashLinux686 = "191ed5ec4f17e32d36abeade55a1c6085e51245c";
+  snapshotHashLinux64 = "acec86045632f4f3f085c072ba696f889906dffe";
+  snapshotHashDarwin686 = "9d9e622584bfa318f32bcb5b9ce6a365febff595";
+  snapshotHashDarwin64 = "e96c1e9860b186507cc75c186d1b96d44df12292";
+  snapshotDate = "2015-02-17";
+  snapshotRev = "f1bb6c2";
+  patches = [
+    ./patches/alpha2.patch
+    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+}
+
diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix
deleted file mode 100644
index 8debb4342da..00000000000
--- a/pkgs/development/compilers/rustc/common.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{stdenv, version}:
-
-{
-  inherit version;
-
-  platform = if stdenv.system == "i686-linux"
-    then "linux-i386"
-    else if stdenv.system == "x86_64-linux"
-    then "linux-x86_64"
-    else if stdenv.system == "i686-darwin"
-    then "macos-i386"
-    else if stdenv.system == "x86_64-darwin"
-    then "macos-x86_64"
-    else abort "no snapshot to bootstrap for this platform (missing platform url suffix)";
-
-  target = if stdenv.system == "i686-linux"
-    then "i686-unknown-linux-gnu"
-    else if stdenv.system == "x86_64-linux"
-    then "x86_64-unknown-linux-gnu"
-    else if stdenv.system == "i686-darwin"
-    then "i686-apple-darwin"
-    else if stdenv.system == "x86_64-darwin"
-    then "x86_64-apple-darwin"
-    else abort "no snapshot to bootstrap for this platform (missing target triple)";
-
-  meta = with stdenv.lib; {
-    homepage = http://www.rust-lang.org/;
-    description = "A safe, concurrent, practical language";
-    maintainers = with maintainers; [ madjar cstrahan wizeman ];
-    license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ];
-    platforms = platforms.linux;
-  };
-
-  name = "rustc-${version}";
-}
diff --git a/pkgs/development/compilers/rustc/grsec.HEAD.patch b/pkgs/development/compilers/rustc/grsec.HEAD.patch
deleted file mode 100644
index 84582ab7d70..00000000000
--- a/pkgs/development/compilers/rustc/grsec.HEAD.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
-index 2fcdd32..2d9ddb0 100644
---- a/src/test/run-make/relocation-model/Makefile
-+++ b/src/test/run-make/relocation-model/Makefile
-@@ -5,9 +5,11 @@ all:
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=static foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
diff --git a/pkgs/development/compilers/rustc/hardcode_paths.patch b/pkgs/development/compilers/rustc/hardcode_paths.patch
deleted file mode 100644
index 2a9cb09dcbd..00000000000
--- a/pkgs/development/compilers/rustc/hardcode_paths.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index 7ea192b..cd5d01b 100644
---- a/src/librustc_back/archive.rs
-+++ b/src/librustc_back/archive.rs
-@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
-           paths: &[&Path]) -> ProcessOutput {
-     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 dacf620..815ce60 100644
---- a/src/librustc_trans/back/link.rs
-+++ b/src/librustc_trans/back/link.rs
-@@ -348,8 +348,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/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index dd73449d5fd..5669b15a700 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -1,101 +1,18 @@
-{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper
-, tzdata, git, valgrind, procps, coreutils
-}:
-
-assert !stdenv.isFreeBSD;
-
-/* Rust's build process has a few quirks :
-
-- It requires some patched in llvm that haven't landed upstream, so it
-  compiles its own llvm. This might change in the future, so at some
-  point we may be able to switch to nix's llvm.
-
-- The Rust compiler is written is Rust, so it requires a bootstrap
-  compiler, which is downloaded during the build. To make the build
-  pure, we download it ourself before and put it where it is
-  expected. Once the language is stable (1.0) , we might want to
-  switch it to use nix's packaged rust compiler.
-
-
-NOTE : some derivation depend on rust. When updating this, please make
-sure those derivations still compile. (racer, for example).
-
-*/
-
-let shortVersion = "1.0.0-dev";
-    rev = "a833337943300db1c310a4cf9c84b7b4ef4e9468";
-    revShort = builtins.substring 0 7 rev;
-in
-
-with ((import ./common.nix) {inherit stdenv; version = "${shortVersion}-g${revShort}"; });
-
-let snapshotHash = if stdenv.system == "i686-linux"
-      then "0197ad7179d74eba06a8b46432548caf226aa03d"
-      else if stdenv.system == "x86_64-linux"
-      then "03459f8b216e96ed8b9abe25a42a75859195103d"
-      else if stdenv.system == "i686-darwin"
-      then "b5c004883ddff84159f11a3329cde682e0b7f75b"
-      else if stdenv.system == "x86_64-darwin"
-      then "b69ea42e1c995682adf0390ed4ef8a762c001a4e"
-      else abort "no snapshot for platform ${stdenv.system}";
-    snapshotDate = "2015-01-15";
-    snapshotRev = "9ade482";
-    snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
-in
-
-stdenv.mkDerivation {
-  inherit name;
-  inherit version;
-  inherit meta;
-
-  src = fetchgit {
-    url = https://github.com/rust-lang/rust;
-    inherit rev;
-    sha256 = "1b9rnx3j37ckxa3vf20g8amsbffzvk2m9lzv5x1m04ci54w85f56";
-  };
-
-  # We need rust to build rust. If we don't provide it, configure will try to download it.
-  snapshot = stdenv.mkDerivation {
-    name = "rust-stage0";
-    src = fetchurl {
-      url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
-      sha1 = snapshotHash;
-    };
-    dontStrip = true;
-    installPhase = ''
-      mkdir -p "$out"
-      cp -r bin "$out/bin"
-    '' + (if stdenv.isLinux then ''
-      patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
-               --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \
-               "$out/bin/rustc"
-    '' else "");
-  };
-
-  configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
-                ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
-
-  # The compiler requires cc, so we patch the source to tell it where to find it
-  patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ]
-            ++ stdenv.lib.optional stdenv.needsPax ./grsec.HEAD.patch;
-
-  postPatch = ''
-    substituteInPlace src/librustc_trans/back/link.rs \
-      --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/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"
-  '';
-
-  buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ];
-
-  enableParallelBuilding = false; # disabled due to rust-lang/rust#16305
-
-  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
-
-  doCheck = true;
+{ stdenv, callPackage }:
+callPackage ./makeRustcDerivation.nix {
+  shortVersion = "1.0.0-dev";
+  isRelease = false;
+  # src rev for master on 2015/03/01
+  srcRev = "157614249594f187f421cd97f928e64c5ab5c1fa";
+  srcSha = "06d6fwl1dg6wfnwa002ak89hnjplpf2sjhg78yjg4ki0ca7b0b74";
+  snapshotHashLinux686 = "3278ebbce8cb269acc0614dac5ddac07eab6a99c";
+  snapshotHashLinux64 = "72287d0d88de3e5a53bae78ac0d958e1a7637d73";
+  snapshotHashDarwin686 = "33b366b5287427a340a0aa6ed886d5ff4edf6a76";
+  snapshotHashDarwin64 = "914bf9baa32081a9d5633f1d06f4d382cd71504e";
+  snapshotDate = "2015-02-25";
+  snapshotRev = "880fb89";
+  patches = [
+    ./patches/head.patch
+  ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
 }
+
diff --git a/pkgs/development/compilers/rustc/local_stage0.patch b/pkgs/development/compilers/rustc/local_stage0.patch
deleted file mode 100644
index 2f38d7c1757..00000000000
--- a/pkgs/development/compilers/rustc/local_stage0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
-index e78f231..6b6773b 100755
---- a/src/etc/local_stage0.sh
-+++ b/src/etc/local_stage0.sh
-@@ -53,11 +53,6 @@
- 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/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
new file mode 100644
index 00000000000..7be005fb763
--- /dev/null
+++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
@@ -0,0 +1,140 @@
+{ stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper
+, tzdata, git, valgrind, procps, coreutils
+
+, shortVersion, isRelease
+, srcSha, srcRev ? ""
+, snapshotHashLinux686, snapshotHashLinux64
+, snapshotHashDarwin686, snapshotHashDarwin64
+, snapshotDate, snapshotRev
+
+, patches
+}:
+
+assert !stdenv.isFreeBSD;
+
+/* Rust's build process has a few quirks :
+
+- It requires some patched in llvm that haven't landed upstream, so it
+  compiles its own llvm. This might change in the future, so at some
+  point we may be able to switch to nix's llvm.
+
+- The Rust compiler is written is Rust, so it requires a bootstrap
+  compiler, which is downloaded during the build. To make the build
+  pure, we download it ourself before and put it where it is
+  expected. Once the language is stable (1.0) , we might want to
+  switch it to use nix's packaged rust compiler.
+
+NOTE : some derivation depend on rust. When updating this, please make
+sure those derivations still compile. (racer, for example).
+
+*/
+
+assert (if isRelease then srcRev == "" else srcRev != "");
+
+let version = if isRelease then
+        "${shortVersion}"
+      else
+        "${shortVersion}-g${builtins.substring 0 7 srcRev}";
+
+    name = "rustc-${version}";
+
+    platform = if stdenv.system == "i686-linux"
+      then "linux-i386"
+      else if stdenv.system == "x86_64-linux"
+      then "linux-x86_64"
+      else if stdenv.system == "i686-darwin"
+      then "macos-i386"
+      else if stdenv.system == "x86_64-darwin"
+      then "macos-x86_64"
+      else abort "no snapshot to bootstrap for this platform (missing platform url suffix)";
+
+    target = if stdenv.system == "i686-linux"
+      then "i686-unknown-linux-gnu"
+      else if stdenv.system == "x86_64-linux"
+      then "x86_64-unknown-linux-gnu"
+      else if stdenv.system == "i686-darwin"
+      then "i686-apple-darwin"
+      else if stdenv.system == "x86_64-darwin"
+      then "x86_64-apple-darwin"
+      else abort "no snapshot to bootstrap for this platform (missing target triple)";
+
+    meta = with stdenv.lib; {
+      homepage = http://www.rust-lang.org/;
+      description = "A safe, concurrent, practical language";
+      maintainers = with maintainers; [ madjar cstrahan wizeman ];
+      license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ];
+      platforms = platforms.linux;
+    };
+
+    snapshotHash = if stdenv.system == "i686-linux"
+      then snapshotHashLinux686
+      else if stdenv.system == "x86_64-linux"
+      then snapshotHashLinux64
+      else if stdenv.system == "i686-darwin"
+      then snapshotHashDarwin686
+      else if stdenv.system == "x86_64-darwin"
+      then snapshotHashDarwin64
+      else abort "no snapshot for platform ${stdenv.system}";
+    snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
+in
+
+stdenv.mkDerivation {
+  inherit name;
+  inherit version;
+  inherit meta;
+
+  src = if isRelease then
+      fetchurl {
+        url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
+        sha256 = srcSha;
+      }
+    else
+      fetchgit {
+        url = https://github.com/rust-lang/rust;
+        rev = srcRev;
+        sha256 = srcSha;
+      };
+
+  # We need rust to build rust. If we don't provide it, configure will try to download it.
+  snapshot = stdenv.mkDerivation {
+    name = "rust-stage0";
+    src = fetchurl {
+      url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
+      sha1 = snapshotHash;
+    };
+    dontStrip = true;
+    installPhase = ''
+      mkdir -p "$out"
+      cp -r bin "$out/bin"
+    '' + (if stdenv.isLinux then ''
+      patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
+               --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \
+               "$out/bin/rustc"
+    '' else "");
+  };
+
+  configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
+                ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
+
+  inherit patches;
+
+  postPatch = ''
+    substituteInPlace src/librustc_trans/back/link.rs \
+      --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/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"
+  '';
+
+  buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ];
+
+  enableParallelBuilding = false; # disabled due to rust-lang/rust#16305
+
+  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
+
+  doCheck = true;
+}
diff --git a/pkgs/development/compilers/rustc/patches/alpha2.patch b/pkgs/development/compilers/rustc/patches/alpha2.patch
new file mode 100644
index 00000000000..8c15af5aca9
--- /dev/null
+++ b/pkgs/development/compilers/rustc/patches/alpha2.patch
@@ -0,0 +1,44 @@
+diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
+index b506aff..b4b346b 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 c45ee25..0f91672 100644
+--- a/src/librustc_back/archive.rs
++++ b/src/librustc_back/archive.rs
+@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
+           paths: &[&Path]) -> ProcessOutput {
+     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 ef849bb..e090b99 100644
+--- a/src/librustc_trans/back/link.rs
++++ b/src/librustc_trans/back/link.rs
+@@ -350,8 +350,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/pkgs/development/compilers/rustc/grsec.patch b/pkgs/development/compilers/rustc/patches/grsec.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/grsec.patch
rename to pkgs/development/compilers/rustc/patches/grsec.patch
diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/patches/hardcode_paths.alpha.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch
rename to pkgs/development/compilers/rustc/patches/hardcode_paths.alpha.patch
diff --git a/pkgs/development/compilers/rustc/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch
new file mode 100644
index 00000000000..a0ecdaeb049
--- /dev/null
+++ b/pkgs/development/compilers/rustc/patches/head.patch
@@ -0,0 +1,44 @@
+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 6bf7453..319f9af 100644
+--- a/src/librustc_back/archive.rs
++++ b/src/librustc_back/archive.rs
+@@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
+           paths: &[&Path]) -> ProcessOutput {
+     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 ea5001a..911445c 100644
+--- a/src/librustc_trans/back/link.rs
++++ b/src/librustc_trans/back/link.rs
+@@ -350,8 +350,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/pkgs/development/compilers/rustc/local_stage0.HEAD.patch b/pkgs/development/compilers/rustc/patches/local_stage0.alpha.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/local_stage0.HEAD.patch
rename to pkgs/development/compilers/rustc/patches/local_stage0.alpha.patch
diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix
index 5bab88e9c41..f9b587c0504 100644
--- a/pkgs/development/compilers/yap/default.nix
+++ b/pkgs/development/compilers/yap/default.nix
@@ -20,5 +20,6 @@ stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;
+    broken = !stdenv.is64bit;   # the linux 32 bit build fails.
   };
 }
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bc18b1dc3ac..1558911ef8e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -57,6 +57,9 @@ self: super: {
     '';
   });
 
+  # The package doesn't know about the AL include hierarchy.
+  al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL";
+
   # Depends on code distributed under a non-free license.
   bindings-yices = dontDistribute super.bindings-yices;
   yices = dontDistribute super.yices;
@@ -117,6 +120,7 @@ self: super: {
   shakespeare-text = dontHaddock super.shakespeare-text;
   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;
 
   # jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
   darcs = overrideCabal super.darcs (drv: {
@@ -150,12 +154,6 @@ self: super: {
   # http://openradar.appspot.com/10207999 and similar issues
   fsnotify = if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify;
 
-  # Doesn't properly handle nonsense byte sequences on HFS+
-  # https://github.com/fpco/haskell-filesystem/issues/5
-  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
@@ -230,8 +228,9 @@ self: super: {
   postgresql-simple = dontCheck super.postgresql-simple;
   postgrest = dontCheck super.postgrest;
   snowball = dontCheck super.snowball;
+  test-sandbox = dontCheck super.test-sandbox;
   wai-middleware-hmac = dontCheck super.wai-middleware-hmac;
-  wai-middleware-throttle = dontCheck super.wai-middleware-throttle;
+  wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
   xmlgen = dontCheck super.xmlgen;
 
   # These packages try to access the network.
@@ -588,6 +587,30 @@ self: super: {
   lambdabot-reference-plugins = markBroken super.lambdabot-reference-plugins;
   lambdabot-social-plugins = markBroken super.lambdabot-social-plugins;
 
+  # Upstream provides no issue tracker and no contact details.
+  vivid = markBroken super.vivid;
+
+  # Test suite wants to connect to $DISPLAY.
+  hsqml = dontCheck super.hsqml;
+
+  # https://github.com/megantti/rtorrent-rpc/issues/1
+  rtorrent-rpc = markBroken super.rtorrent-rpc;
+
+  # https://github.com/PaulJohnson/geodetics/issues/1
+  geodetics = dontCheck super.geodetics;
+
+  # https://github.com/AndrewRademacher/aeson-casing/issues/1
+  aeson-casing = dontCheck super.aeson-casing;
+
+  # https://github.com/junjihashimoto/test-sandbox-compose/issues/2
+  test-sandbox-compose = dontCheck super.test-sandbox-compose;
+
+  # Broken by GLUT update.
+  Monadius = markBroken super.Monadius;
+
+  # https://github.com/ddssff/cabal-debian/issues/35
+  cabal-debian = markBroken super.cabal-debian;
+
 } // {
 
   # Not on Hackage.
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 5aec41b6c0f..66445100ed0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -81,25 +81,23 @@ self: super: {
   # Needs mtl 2.2.x due to "plailude".
   clac = dontDistribute super.clac;
 
-  # https://github.com/junjihashimoto/test-sandbox-compose/issues/1
-  hspec-test-sandbox = markBroken super.hspec-test-sandbox;
-  test-framework-sandbox = markBroken super.test-sandbox-quickcheck;
-  test-sandbox = markBroken super.test-sandbox;
-  test-sandbox-compose = markBroken super.test-sandbox-compose;
-  test-sandbox-hunit = markBroken super.test-sandbox-hunit;
-  test-sandbox-quickcheck = markBroken super.test-sandbox-quickcheck;
-
   # These packages need mtl 2.2.x directly or indirectly via dependencies.
   apiary-purescript = markBroken super.apiary-purescript;
   highlighter2 = markBroken super.highlighter2;
   hypher = markBroken super.hypher;
   purescript = markBroken super.purescript;
+  xhb-atom-cache = markBroken super.xhb-atom-cache;
+  xhb-ewmh = markBroken super.xhb-ewmh;
   yesod-purescript = markBroken super.yesod-purescript;
   yet-another-logger = markBroken super.yet-another-logger;
 
   # https://github.com/frosch03/arrowVHDL/issues/2
   ArrowVHDL = markBroken super.ArrowVHDL;
 
+  # https://ghc.haskell.org/trac/ghc/ticket/9625
+  wai-middleware-preprocessor = dontCheck super.wai-middleware-preprocessor;
+  incremental-computing = dontCheck super.incremental-computing;
+
 }
 
 // # packages relating to amazonka
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 87a9033cf95..bda9ddf5f28 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4098,6 +4098,7 @@ self: {
        pname = "Euterpea";
        version = "1.0.0";
        sha256 = "0cfcsrm47sb1z4zdmipipg9p31hzicwzpqdpa2m985j3hwm42vds";
+       editedCabalFile = "61d418cc49621a3373fd25f547d2dd6b76b700dcc4b7e38b2f055b5c6f781afd";
        buildDepends = [
          array arrows base bytestring CCA containers deepseq ghc-prim
          HCodecs heap markov-chain monadIO mtl PortMidi pure-fft random stm
@@ -4884,8 +4885,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLUtil";
-       version = "0.8.3";
-       sha256 = "0r99nv60zkr88nhiz438wy0grcgqz6nwlzbp9aj4jv5bwdiph7j9";
+       version = "0.8.4";
+       sha256 = "1bjc33cnlcb29hfyq2141cj2g2pklg5296hg1jpg246j0bcy9fcf";
        buildDepends = [
          array base bytestring containers cpphs directory filepath
          JuicyPixels linear OpenGL OpenGLRaw transformers vector
@@ -6491,8 +6492,8 @@ self: {
     ({ mkDerivation, base, hashable, mtl, unordered-containers }:
      mkDerivation {
        pname = "HMap";
-       version = "1.2.1";
-       sha256 = "12dbjjvq7qlr2clbzbhwcbvmwd9amlkwmf55cn46qvvakinv6x2i";
+       version = "1.2.3";
+       sha256 = "0gxs0l5v2kzgy8lfyz0l3ivv1w6cb8sm30h6yv91np1nvj231nf3";
        buildDepends = [ base hashable mtl unordered-containers ];
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
@@ -7250,8 +7251,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaTeX-qq";
-       version = "0.0.0.0";
-       sha256 = "1frqwgvjbr3pjzm9z98q1wn93q065vg773267p20la3h0ybq10rv";
+       version = "0.0.1.1";
+       sha256 = "1kjhdg9vm7n07zxgdkmqkgwpf2204hrjwslnyhg8i7f07cd3pdrl";
        buildDepends = [
          antiquoter base haskell-src-meta HaTeX template-haskell text
          uniplate
@@ -8139,11 +8140,11 @@ self: {
     ({ mkDerivation, base, bytestring, hashtables, syb, utf8-string }:
      mkDerivation {
        pname = "HsSyck";
-       version = "0.52";
-       sha256 = "1hdckbm60pzmydaz4rsw3kz9byd205987jcddakyhmgfinzvqwvc";
+       version = "0.53";
+       sha256 = "17r4jwnkjinmzpw9m2crjwccdyv9wmpljnv1ldgljkr9p9mb5ywf";
        buildDepends = [ base bytestring hashtables syb utf8-string ];
        description = "Fast, lightweight YAML loader and dumper";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "HsTools" = callPackage
@@ -9903,15 +9904,16 @@ self: {
      }) {};
 
   "MonadCompose" = callPackage
-    ({ mkDerivation, base, ghc-prim, MaybeT, mmorph, monad-products
-     , mtl, transformers
+    ({ mkDerivation, base, data-default, ghc-prim, MaybeT, mmorph
+     , monad-products, mtl, random, transformers
      }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.7.0.0";
-       sha256 = "1jy81fkqr3325j58qxajzdmy22ssds3v80ks8320f3ws7rgkdhrh";
+       version = "0.8.2.0";
+       sha256 = "1nzb4x8az1m4d5i75cshgjfr4xnkfi3s27rq6jkib9i67my0hsrq";
        buildDepends = [
-         base ghc-prim MaybeT mmorph monad-products mtl transformers
+         base data-default ghc-prim MaybeT mmorph monad-products mtl random
+         transformers
        ];
        homepage = "http://alkalisoftware.net";
        description = "Methods for composing monads";
@@ -10927,8 +10929,8 @@ self: {
      }:
      mkDerivation {
        pname = "OpenGL";
-       version = "2.10.0.2";
-       sha256 = "05w6yvn1bj4p7sqr8qnhabb5qjnigir7sxgf74k0fwk1aniikgys";
+       version = "2.11.1.0";
+       sha256 = "0fsk5jrap27rzv70q2257jwyrwr4g5qbv7kzi0fblydf7m1nq8hp";
        buildDepends = [ base bytestring GLURaw OpenGLRaw text ];
        extraLibraries = [ libX11 mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
@@ -14787,10 +14789,9 @@ self: {
     ({ mkDerivation, base, template-haskell, text, Win32 }:
      mkDerivation {
        pname = "Win32-errors";
-       version = "0.2.1";
-       sha256 = "13rqqk06r3rc9j6j72qcna26lj0r2fbrzys9zgr91knik9msl5di";
+       version = "0.2.2";
+       sha256 = "158p8130x1dmis08zaqm8zdhdhj0xjdmli5gn2w3f7rsz748rhvw";
        buildDepends = [ base template-haskell text Win32 ];
-       jailbreak = true;
        homepage = "http://github.com/mikesteele81/win32-errors";
        description = "Alternative error handling for Win32 foreign calls";
        license = stdenv.lib.licenses.bsd3;
@@ -14815,10 +14816,9 @@ self: {
     ({ mkDerivation, base, text, Win32, Win32-errors }:
      mkDerivation {
        pname = "Win32-junction-point";
-       version = "0.2";
-       sha256 = "1cbk6d47h83pp77522j55yy90vhi0d1jjb7rd1s98k6422fb316s";
+       version = "0.2.1";
+       sha256 = "0d2hpzrbcvqfaw6vp03n56k5zjs6kk582hr3pd25j93g3rcyc8mf";
        buildDepends = [ base text Win32 Win32-errors ];
-       jailbreak = true;
        homepage = "http://github.com/mikesteele81/Win32-junction-point";
        description = "Support for manipulating NTFS junction points";
        license = stdenv.lib.licenses.bsd3;
@@ -14908,9 +14908,9 @@ self: {
     ({ mkDerivation, base, boxes, cmdargs }:
      mkDerivation {
        pname = "Wordlint";
-       version = "0.2.0.0";
-       sha256 = "0vrfwx4276lyyz2z36nkjq5a0n3v53axf23mikc7m40fl8snp6l7";
-       isLibrary = false;
+       version = "0.2.0.4";
+       sha256 = "08d02h4ynkwxqxxqzk8hfmdj9y7rg23biybb969pk0scgvg7iyd5";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [ base boxes cmdargs ];
        homepage = "https://github.com/gbgar/Wordlint";
@@ -15132,17 +15132,17 @@ self: {
      }) {};
 
   "Xauth" = callPackage
-    ({ mkDerivation, base, xau }:
+    ({ mkDerivation, base, libXau }:
      mkDerivation {
        pname = "Xauth";
        version = "0.1";
        sha256 = "1mvflp6y1nz9961gngbwk0b7wr8sx3p6296jfvvb6ln1kvm2scxs";
        buildDepends = [ base ];
-       pkgconfigDepends = [ xau ];
+       pkgconfigDepends = [ libXau ];
        description = "A binding to the X11 authentication library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xau = null;};
+     }) { inherit (pkgs.xlibs) libXau;};
 
   "Xec" = callPackage
     ({ mkDerivation, base, binary, bytestring, cairo, containers
@@ -16097,6 +16097,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "acme-miscorder" = callPackage
+    ({ mkDerivation, base, random }:
+     mkDerivation {
+       pname = "acme-miscorder";
+       version = "0.1.0.0";
+       sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4";
+       buildDepends = [ base random ];
+       description = "Miscellaneous newtypes for orderings of discutable use";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "acme-missiles" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -16621,6 +16632,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-casing" = callPackage
+    ({ mkDerivation, aeson, base, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th
+     }:
+     mkDerivation {
+       pname = "aeson-casing";
+       version = "0.1.0.0";
+       sha256 = "0mlgrs6rb9vz67ggyrc51z1bm4586m6gwx54wg9dp8qb8jv3pknr";
+       buildDepends = [ aeson base ];
+       testDepends = [
+         aeson base tasty tasty-hunit tasty-quickcheck tasty-th
+       ];
+       description = "Tools to change the formatting of field names in Aeson instances";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "aeson-lens" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, lens, text
      , unordered-containers, vector
@@ -17122,6 +17149,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "al" = callPackage
+    ({ mkDerivation, base, c2hs, openal }:
+     mkDerivation {
+       pname = "al";
+       version = "0.1.1.2";
+       sha256 = "0cb6vvjc23nb7qfdkyc7g197rgb7shjyxv6q5kd9jdxr3rl1apf4";
+       buildDepends = [ base ];
+       buildTools = [ c2hs ];
+       extraLibraries = [ openal ];
+       homepage = "http://github.com/phaazon/al";
+       description = "OpenAL 1.1 raw API.";
+       license = stdenv.lib.licenses.bsd3;
+     }) { inherit (pkgs) openal;};
+
   "alarmclock" = callPackage
     ({ mkDerivation, base, stm, time, unbounded-delays }:
      mkDerivation {
@@ -17690,8 +17731,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "0.3.0";
-       sha256 = "0zjdd50rhkhb31y1c65wqggc1dgvl9ycxkr8hnqgsvq4q1nz0hn1";
+       version = "0.3.1";
+       sha256 = "01mxaqm1l3cmwsj9k61hh8wj5q9nja7j12dxpkns9ar7pbcllb3q";
        buildDepends = [
          amazonka-core base bytestring conduit conduit-extra cryptohash
          cryptohash-conduit exceptions http-conduit lens mmorph
@@ -17708,8 +17749,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "0.3.0";
-       sha256 = "1kp82bkcmpigidppb2a7isxjl9kls76csd85q4aym50apzhfvmqr";
+       version = "0.3.1";
+       sha256 = "0aqid2aardna2qngr2knf5dpkylchrxkl5v8y6rdf2a3kzmsivfp";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
@@ -17721,8 +17762,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "0.3.0";
-       sha256 = "1rxdlygbr423f4g6y5aizv3anpcyq56nx3yp5363v3k9xi96dnzq";
+       version = "0.3.1";
+       sha256 = "0gq65pyv1hsczlqc6i9l03rhgb2f086fqs2cfrr0aj8g5la6085r";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
@@ -17734,8 +17775,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "0.3.0";
-       sha256 = "02b09208amcv91jcc8lmznbjvvf1bgz9cp3vc9f1s69mb4b09azr";
+       version = "0.3.1";
+       sha256 = "0qsn88saidf2j0qmnndy0hcrp439354ys208sxfrrjn0xr5af8bh";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
@@ -17747,8 +17788,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "0.3.0";
-       sha256 = "0hjx5cxpf7wmz7pyc4ry7g8khp40f1i4fx366c7va48cmw42zkjl";
+       version = "0.3.1";
+       sha256 = "1vsrkk58fwbhnr9ksjld4i53yrnq8fsxsfkh7y6j6i4gbz003a7n";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
@@ -17760,8 +17801,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "0.3.0";
-       sha256 = "0kgrgc6l901y5vf6z8has0610cd29k6x3iicb3pwpq00vamiq1b4";
+       version = "0.3.1";
+       sha256 = "1kzcqn4fy6fhsg2afjv0sjim6g5n2zdm3q26rlmmwd3y4zmmb0zy";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
@@ -17773,8 +17814,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "0.3.0";
-       sha256 = "09xalcrw56wbba86ibhjkxpcmj4sdxkfzxy2s2n0i9zb0nk4asfw";
+       version = "0.3.1";
+       sha256 = "0c9glmfivx7hg77zn435ic5s07barpxb58rnypzni3q0y6skmnxl";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
@@ -17786,8 +17827,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "0.3.0";
-       sha256 = "1pzaqavz86h9a44gyby5qxjh5sikc105kh2kkpa6h3lhvpp4ka59";
+       version = "0.3.1";
+       sha256 = "0zfd7qld2wqsh7c5vkw613rq0x86nq84lvh1gk4grgkca636as5y";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
@@ -17799,8 +17840,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "0.3.0";
-       sha256 = "1xbqcid23k6y6b48fv4p3clbzd1inbm47lwyqyakxgk1ch6bgpzp";
+       version = "0.3.1";
+       sha256 = "1nmxviql0h7n6mj38p2ldgxk2dpns1lhmrr45gmndblg3mmlnmp4";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
@@ -17811,8 +17852,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "0.3.0";
-       sha256 = "00qlqrdzlljqy8cdi52qwxq3jxqh9rzif8pbz5r9ps3zw1ris1q7";
+       version = "0.3.1";
+       sha256 = "0ria2ayskcwjav3x2yk1kqpk16jn31hikf39vm3rb4p79mawkbjd";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
@@ -17824,8 +17865,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "0.3.0";
-       sha256 = "12bqpl3xvf9sk2aldxpjr98131j56yyjzwy01pynr9pid132c3a1";
+       version = "0.3.1";
+       sha256 = "0sswcgycxrfmpv6pv0jrrrjx9fkahm1nl35dkxvlr3h4q519nmhf";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
@@ -17837,8 +17878,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "0.3.0";
-       sha256 = "1v07fb55rc80w0pddryvn2qnxsd7g2j6rjpmydrflg3090jq8zbf";
+       version = "0.3.1";
+       sha256 = "0gqlsh9j00gjdrrp53ijpvc9q2zwd6p5813yqjllhhcxckk7nzmn";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
@@ -17850,8 +17891,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "0.3.0";
-       sha256 = "16cv000pmp9n0312sp9wnsj7h2z23w6657r0gi1q4z9xqwj4nkkz";
+       version = "0.3.1";
+       sha256 = "1mx2fn6w724hmy0yiwvgbyijx12ggiwqqhpikv9hfr6p520cxi9b";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
@@ -17863,8 +17904,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "0.3.0";
-       sha256 = "1znrz1gp52fv8qjyzlbygxcn10w687bakrczixcvwqnrw3krsi25";
+       version = "0.3.1";
+       sha256 = "1jnnwy7i1m5z0kbw4gzw1k7ma4mgfj3x924h55iq2q7vqipkqx5y";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
@@ -17883,8 +17924,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "0.3.0";
-       sha256 = "1pgxap976rc5sfqd1cy3092r6ckfnjswk44gccfy2rcxn0cxvmsj";
+       version = "0.3.1";
+       sha256 = "07s1ifpxbng05par9v2cyakzn1mdsspmf3r75rsscqkk2cflzrn3";
        buildDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bifunctors bytestring case-insensitive conduit conduit-extra
@@ -17905,8 +17946,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "0.3.0";
-       sha256 = "1q69c2chhnkz9sajcy6cpbzc3dlnq5fi7qppf63lfa3291a7pkpl";
+       version = "0.3.1";
+       sha256 = "03i8l4sa9mxfs3k0h6bg1zrqygza2wmh4pricxln3s78w46grx7m";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
@@ -17918,8 +17959,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "0.3.0";
-       sha256 = "0cvainbvqb2b9kn8l1jm6rvc16hwd8nd91bz46sm6r4i30yv0848";
+       version = "0.3.1";
+       sha256 = "1n2pqbg8sxci8b2ljfbjj02n04x2rgclp15ybb5f7h70fggs1f6m";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
@@ -17931,8 +17972,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "0.3.0";
-       sha256 = "1wyslkbj7jkz8y72djfwa9gknjxwckpm8k369slhqsrj3z0yhi3k";
+       version = "0.3.1";
+       sha256 = "1bp13d55qs4db3vpzvik033373gd02l5vcgppw51fzvh2l6kslfg";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
@@ -17944,8 +17985,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "0.3.0";
-       sha256 = "1ip5x1g6khnywmr0l0naswl02j1s35hxmklra07hz86v6zrlnxhh";
+       version = "0.3.1";
+       sha256 = "0p4gb3yaviyyppv641gz550ml5bvcwbpxv0fqkqqad0fp7k95zdh";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
@@ -17957,8 +17998,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "0.3.0";
-       sha256 = "0wm7si0yvn3xh5ad6ycz181yjqlil1l056asw73c8yxfy3g3n0q6";
+       version = "0.3.1";
+       sha256 = "0ls2vhx7isj210n7m5584xzmv78a2gnxwhpzdc7c7nxbfmkgj0b9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
@@ -17969,8 +18010,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "0.3.0";
-       sha256 = "0s97ssb4bgkc5ahrjm5dbydnjp7k3sqms1885d978bfnsmrrc91l";
+       version = "0.3.1";
+       sha256 = "0q64qkrb5dpr0h8kagnpd4ir1k5s15r2x6s2kpj4v6kx616nw1ib";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
@@ -17982,8 +18023,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "0.3.0";
-       sha256 = "02mznpghvzz6inf918dzv3cdid3yamnxfbq136aah97j8vzcj0g1";
+       version = "0.3.1";
+       sha256 = "0zcpj0kj54bdcximds5rx0i7y7zbd7a433fiw19cfx7gsh4gfrzc";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
@@ -17995,8 +18036,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "0.3.0";
-       sha256 = "0kbh30rz2zx7zw5sh32806g3kr19ijhp71c5wi07i1j949r2ixss";
+       version = "0.3.1";
+       sha256 = "1apzbahxv1b1hsmbhhwi2bhz0j89av3jqc8ad6q2smcj5jr4cj9m";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
@@ -18008,8 +18049,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "0.3.0";
-       sha256 = "14wvh8r63q5kyyfhh0nh5sq29wn19dy6kjj62k8ysph54bm7d7i2";
+       version = "0.3.1";
+       sha256 = "0p4pjrmkzn2n6r1idvyy34b2563zxnnwcrlnq8q766n7d403csjd";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
@@ -18021,8 +18062,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "0.3.0";
-       sha256 = "09f3yclyg0hjqybkpfi61wrsfvxa7mlcai8il3maya78sbrz8bj9";
+       version = "0.3.1";
+       sha256 = "0q6mz9811jya3qsvkc5m24r7b56ck127dwsskk3a1bg3qqh0b1a0";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
@@ -18034,8 +18075,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "0.3.0";
-       sha256 = "1gj17z7k63a0cdqhjn6f4ylawa8hv5b45hrdqw103fn13qn860hr";
+       version = "0.3.1";
+       sha256 = "1mxqgivngi9anxkm5smqysniw18gc55a1q31cis2rdz6r9nvknq7";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
@@ -18046,8 +18087,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "0.3.0";
-       sha256 = "0lch80bl2p5c78qqam1hwffslzdnqwc5paiyja70z41n4cf9zw9d";
+       version = "0.3.1";
+       sha256 = "1jdypy7npfyh0k8pcpbk8wp38sgkhnna0wbq1scnb6d1qppjjwzf";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
@@ -18059,8 +18100,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "0.3.0";
-       sha256 = "0kbsnbwnlxxnn58mwr7pkqc6jzkwlryq3h7vmzgvnm2xa0gv9vrp";
+       version = "0.3.1";
+       sha256 = "06q9w6752z6wgialms2ckra2bjhk6p87987pbmwsa48pjhyfya2q";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
@@ -18072,8 +18113,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "0.3.0";
-       sha256 = "157ayynhc847hc2mk14hkcxbx0z15r5ymfykhf909qwv6js70xs4";
+       version = "0.3.1";
+       sha256 = "045pn2rjh57an8kilcx78fsv5af6sbf3bfhsxvx3vaaspmls59f4";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
@@ -18085,8 +18126,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "0.3.0";
-       sha256 = "00psl8hffvgbl2zl24pfp7lrhis5j971cvyrazr4vgr43iss3ww4";
+       version = "0.3.1";
+       sha256 = "066k2jwin83sz0ry34hfni1zn6r66bcrdvnji9b3zacwsi032713";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
@@ -18097,8 +18138,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "0.3.0";
-       sha256 = "0il89vnwywqisfl4lyibjfi1ihpxba58drbvag4x5rf19nw1glc1";
+       version = "0.3.1";
+       sha256 = "14w1qr8y0kqhddsrr4yrh808k7rw2l815hy02lx3qv94sd8w42ya";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
@@ -18110,8 +18151,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "0.3.0";
-       sha256 = "07gz564x624jzh7yca4vkla770ly1781kyj5qg70qs3k4kf2b7gm";
+       version = "0.3.1";
+       sha256 = "1n6kgwm6wamnjgbk67v2cyl5f8f6clkraq74kmnl6gbb50bisd74";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
@@ -18123,8 +18164,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "0.3.0";
-       sha256 = "1bzxim2mafgb3gaxzj7vx04w4b1cljywwf3vyq9gn3p9i3dc2qh2";
+       version = "0.3.1";
+       sha256 = "1jz57hx4s0rbzgl3scb0kk7prf1lk48nhzdhijbcyrg1h4s06hac";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
@@ -18136,8 +18177,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "0.3.0";
-       sha256 = "1x5dbzdqrkdf47fixqajb13lqh9j5zpb1src45pszjgy1pnf9zkc";
+       version = "0.3.1";
+       sha256 = "17fr8apra72n3viwibyggniw84a96474w07vhi8qkzvxm949zidf";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
@@ -18149,8 +18190,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "0.3.0";
-       sha256 = "1pb5f2yl640kikqz83arwcnjxz5abwpx04klnp6ypay7sxnpl0sq";
+       version = "0.3.1";
+       sha256 = "0jyvn9rkgpyljx4b813m3na5s0glyzj4104cfl2942fi7b010lkl";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
@@ -18162,8 +18203,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "0.3.0";
-       sha256 = "15sk43545qbnh4r3chm44fxsjr1rjjafhqc8pmy0p08r45v82bf2";
+       version = "0.3.1";
+       sha256 = "14d8na8nl733w90i1vpv99y2r8cm4a4q6s8ayna26xpwncb7x0by";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
@@ -18175,8 +18216,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "0.3.0";
-       sha256 = "0akkfj6yzjpfgrpzi2mscv03hdhv3ym8vslms17xdp5f9ydba0wv";
+       version = "0.3.1";
+       sha256 = "0wj0wb09y6a9haxhwckx4rxsvjy8g44liwvfb3sgbq4924q0m875";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
@@ -18188,8 +18229,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "0.3.0";
-       sha256 = "10vm8jr7ljkmpa8xwn96262jf2i8cb3c1cxw0dagry101im7wxdg";
+       version = "0.3.1";
+       sha256 = "1l2pqzr3li3j9yrfgy42psgaw3sm1q70k9raxsklpy5z6dbwyj9n";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
@@ -18201,8 +18242,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "0.3.0";
-       sha256 = "1vmwkjb37w2jgrvfhj3mx3z6h3q52jkqh3c2fkc27a9q5jyi43p5";
+       version = "0.3.1";
+       sha256 = "0bgjc5nmhvy8cg2v477wad10dcg1sfnd3iyj25827f4spjyg1h9j";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
@@ -18214,8 +18255,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "0.3.0";
-       sha256 = "1njvanj7bw0r4l1fhg7nq89sz8sx9cahxjwczr7ab3cf7a03ndra";
+       version = "0.3.1";
+       sha256 = "0awnyw4yii1plbk8is64f6zlnckjb8l74la4d2zls8nmpd31i5n3";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
@@ -18227,8 +18268,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "0.3.0";
-       sha256 = "06786g4mdy58ca1hdwi6dfa3xlkzf2la8x7c8zqyf6848a573yb1";
+       version = "0.3.1";
+       sha256 = "1p32yl9wdchp4z2rq5b0qwl1hp6n6wvc4i7i6cpdwpq4sb0k968q";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
@@ -18236,12 +18277,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-ssm" = callPackage
+    ({ mkDerivation, amazonka-core, base }:
+     mkDerivation {
+       pname = "amazonka-ssm";
+       version = "0.3.1";
+       sha256 = "13v0vwdd4bq86s1ky1i54s0v82mcvrh9hq7nkb1fkzvsmmiyva7l";
+       buildDepends = [ amazonka-core base ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Simple Systems Management Service SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-storagegateway" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "0.3.0";
-       sha256 = "1d75q42z3yvwdav95na5xdxssk4zjgbr77fs1j63x1991p0ar06c";
+       version = "0.3.1";
+       sha256 = "1ljw1xj3m8qj971s36j2jsp8zppyh1zsi2jlb7ijw6yg3h1hvfl7";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
@@ -18253,8 +18306,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "0.3.0";
-       sha256 = "1xxkch0n5f89s7qqv14vfichv5ldlx6qk8gwzccqvf1wxwcgpbhc";
+       version = "0.3.1";
+       sha256 = "081mr98ib68j02symjmsx62lbzs1y6mf3bf4hppzq1fxx0qmw3bw";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
@@ -18266,8 +18319,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "0.3.0";
-       sha256 = "0c5fh50qyr8wfl7031x4gksablp3g9kyj6phjpxndzy6hh4cfim2";
+       version = "0.3.1";
+       sha256 = "0817k0kxbgc2df5g7k25d5gkbf4xylbjis9zf3in5yplrlr3m6gq";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
@@ -18279,8 +18332,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "0.3.0";
-       sha256 = "0s60jgyps1mgaa0kqpi7acqss8j1wn2mjrp8rl69ivarhsyh0ijh";
+       version = "0.3.1";
+       sha256 = "0n3kl5sz0ckwdr680jgi9rq604zlcyx9b3gx19yf08dkh8vpkn9h";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
@@ -18852,30 +18905,28 @@ self: {
 
   "apiary" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
-     , bytestring, bytestring-lexing, case-insensitive
-     , data-default-class, exceptions, hashable, http-date, http-types
-     , HUnit, mime-types, monad-control, mtl, process, QuickCheck
-     , stringsearch, template-haskell, test-framework
-     , test-framework-hunit, test-framework-quickcheck, text, time
-     , transformers, transformers-base, unix-compat
+     , bytestring, bytestring-read, case-insensitive, data-default-class
+     , exceptions, hashable, http-date, http-types, HUnit, mime-types
+     , monad-control, mtl, process, stringsearch, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, time, transformers
+     , transformers-base, types-compat, unix-compat
      , unordered-containers, vault, wai, wai-extra, web-routing
      }:
      mkDerivation {
        pname = "apiary";
-       version = "1.3.0";
-       sha256 = "1d182rqrkkp76hhq71rlh7plrcnnarhhzwm21619p7yw781dfcjy";
-       editedCabalFile = "a33e324c2280f4b84405bd625f6fb6b281352bc6c4dab01275b8a62114b0da16";
+       version = "1.4.0";
+       sha256 = "1z0wky3xhkgayxf6fzrj7dnll6r948vgqsvfhhjh32ybadmi97bm";
        buildDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
-         bytestring-lexing case-insensitive data-default-class exceptions
+         bytestring-read case-insensitive data-default-class exceptions
          hashable http-date http-types mime-types monad-control mtl process
          stringsearch template-haskell text time transformers
-         transformers-base unix-compat unordered-containers vault wai
-         web-routing
+         transformers-base types-compat unix-compat unordered-containers
+         vault wai web-routing
        ];
        testDepends = [
-         base bytestring http-types HUnit mtl QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck wai wai-extra
+         base bytestring http-types HUnit mtl tasty tasty-hunit
+         tasty-quickcheck wai wai-extra
        ];
        jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
@@ -18887,17 +18938,16 @@ self: {
     ({ mkDerivation, apiary, apiary-session, authenticate, base
      , blaze-builder, bytestring, cereal, data-default-class
      , http-client, http-client-tls, http-types, monad-control
-     , resourcet, text, wai, web-routing
+     , resourcet, text, types-compat, wai, web-routing
      }:
      mkDerivation {
        pname = "apiary-authenticate";
-       version = "1.3.0";
-       sha256 = "00ayjrkp8zdil6pc0prxv39l8rw44c225k85vnp3681qsb76am55";
-       editedCabalFile = "c97a06886c850111b3fa48e7000077c71b1198b9c4458e0bca77abd69673e12f";
+       version = "1.4.0";
+       sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0";
        buildDepends = [
          apiary apiary-session authenticate base blaze-builder bytestring
          cereal data-default-class http-client http-client-tls http-types
-         monad-control resourcet text wai web-routing
+         monad-control resourcet text types-compat wai web-routing
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "authenticate support for apiary web framework";
@@ -18911,8 +18961,8 @@ self: {
      }:
      mkDerivation {
        pname = "apiary-clientsession";
-       version = "1.3.0";
-       sha256 = "158zhcgrxgwn8ljh93qlls71wdfbd8081214cfmxb9k41l927y55";
+       version = "1.4.0";
+       sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6";
        buildDepends = [
          apiary apiary-cookie apiary-session base bytestring cereal
          clientsession data-default-class time unix-compat vault
@@ -18924,16 +18974,15 @@ self: {
 
   "apiary-cookie" = callPackage
     ({ mkDerivation, apiary, base, blaze-builder, blaze-html
-     , bytestring, cookie, time, wai, web-routing
+     , bytestring, cookie, time, types-compat, wai, web-routing
      }:
      mkDerivation {
        pname = "apiary-cookie";
-       version = "1.3.0";
-       sha256 = "1y152d92ksz64iqgv2ck4s4dxlpmg72gfk9yq6f2wx0axjwm16nm";
-       editedCabalFile = "cc3edd1f078c168eae05bc559a1ff96077e3d2ae158b081909ac7c9f7fe051c6";
+       version = "1.4.0";
+       sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx";
        buildDepends = [
-         apiary base blaze-builder blaze-html bytestring cookie time wai
-         web-routing
+         apiary base blaze-builder blaze-html bytestring cookie time
+         types-compat wai web-routing
        ];
        jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
@@ -18945,9 +18994,8 @@ self: {
     ({ mkDerivation, apiary, base, blaze-builder, wai-extra }:
      mkDerivation {
        pname = "apiary-eventsource";
-       version = "1.3.0";
-       sha256 = "192bhk54z1gw9r9gnws19z8b81i0v163vb2s09alad8c7v5d8ksp";
-       editedCabalFile = "ba4f13a331bfe4d0330e022352bba6878191a90eca5407971a2de4bb6f14c6c5";
+       version = "1.4.0";
+       sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7";
        buildDepends = [ apiary base blaze-builder wai-extra ];
        homepage = "https://github.com/philopon/apiary";
        description = "eventsource support for apiary web framework";
@@ -18956,15 +19004,16 @@ self: {
 
   "apiary-helics" = callPackage
     ({ mkDerivation, apiary, base, bytestring, data-default-class
-     , helics, helics-wai, monad-control, text, transformers, vault, wai
+     , helics, helics-wai, monad-control, text, transformers
+     , types-compat, vault, wai
      }:
      mkDerivation {
        pname = "apiary-helics";
-       version = "1.3.0";
-       sha256 = "04wbh5hn0ycr2mp4b3y9na61k26rd3y10724xwssfxjmk3lnh2bn";
+       version = "1.4.0";
+       sha256 = "1qm9fnhzafdja6fr20c7qhl6dmagmnzn23ni49ln5k55kbawfk8a";
        buildDepends = [
          apiary base bytestring data-default-class helics helics-wai
-         monad-control text transformers vault wai
+         monad-control text transformers types-compat vault wai
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "helics support for apiary web framework";
@@ -18975,16 +19024,18 @@ self: {
   "apiary-logger" = callPackage
     ({ mkDerivation, apiary, base, data-default-class, fast-logger
      , lifted-base, monad-control, monad-logger, transformers
-     , transformers-base
+     , transformers-base, types-compat
      }:
      mkDerivation {
        pname = "apiary-logger";
-       version = "1.3.0";
-       sha256 = "01kljhlkp6kdwbl4mxgvjd9h6iwrxkbgkik0wpv3rgzizacls1c3";
+       version = "1.4.0";
+       sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48";
        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;
@@ -18992,15 +19043,15 @@ self: {
 
   "apiary-memcached" = callPackage
     ({ mkDerivation, apiary, base, bytestring, data-default-class
-     , memcached-binary, monad-control, text, transformers
+     , memcached-binary, monad-control, text, transformers, types-compat
      }:
      mkDerivation {
        pname = "apiary-memcached";
-       version = "1.3.0";
-       sha256 = "11niagwak3qr493nq9h35px54qj5hn199ra97h99959hhh0d9gfa";
+       version = "1.4.0";
+       sha256 = "1rwkj7byc84yism5sxphs1s231910ay8w7lap2cdg0y9k9f24gby";
        buildDepends = [
          apiary base bytestring data-default-class memcached-binary
-         monad-control text transformers
+         monad-control text transformers types-compat
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "memcached client for apiary web framework";
@@ -19010,15 +19061,15 @@ self: {
   "apiary-mongoDB" = callPackage
     ({ mkDerivation, apiary, base, bson, data-default-class
      , lifted-base, monad-control, mongoDB, resource-pool, text, time
-     , transformers
+     , transformers, types-compat
      }:
      mkDerivation {
        pname = "apiary-mongoDB";
-       version = "1.3.0";
-       sha256 = "14k9b2cq0s3v4n4akyn4n65kcim02j5dki40zckf0754mxyh2ghi";
+       version = "1.4.0";
+       sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd";
        buildDepends = [
          apiary base bson data-default-class lifted-base monad-control
-         mongoDB resource-pool text time transformers
+         mongoDB resource-pool text time transformers types-compat
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "mongoDB support for apiary web framework";
@@ -19028,15 +19079,16 @@ self: {
   "apiary-persistent" = callPackage
     ({ mkDerivation, apiary, apiary-logger, base, monad-control
      , monad-logger, persistent, resource-pool, resourcet, transformers
-     , transformers-base, web-routing
+     , transformers-base, types-compat, web-routing
      }:
      mkDerivation {
        pname = "apiary-persistent";
-       version = "1.3.0";
-       sha256 = "0mr86mx3fplcbapgasi6famz16b0svzvn92bssdisfcqvs43ki8a";
+       version = "1.4.0";
+       sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9";
        buildDepends = [
          apiary apiary-logger base monad-control monad-logger persistent
-         resource-pool resourcet transformers transformers-base web-routing
+         resource-pool resourcet transformers transformers-base types-compat
+         web-routing
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "persistent support for apiary web framework";
@@ -19045,15 +19097,16 @@ self: {
 
   "apiary-purescript" = callPackage
     ({ mkDerivation, apiary, base, bytestring, data-default-class
-     , filepath, Glob, parsec, purescript, text, unordered-containers
+     , filepath, Glob, parsec, purescript, text, transformers
+     , types-compat, unordered-containers
      }:
      mkDerivation {
        pname = "apiary-purescript";
-       version = "1.3.1";
-       sha256 = "1pc8w90d3cnyrabgmn7ns1mf3pgzsvib5zq9c54926xavhb1h6nq";
+       version = "1.4.0";
+       sha256 = "0z1d2wqpa86bv6xkpiw696sn77fdq52vk2s8951v8qdffbxia3jz";
        buildDepends = [
          apiary base bytestring data-default-class filepath Glob parsec
-         purescript text unordered-containers
+         purescript text transformers types-compat unordered-containers
        ];
        homepage = "https://github.com/philopon/apiary";
        description = "purescript compiler for apiary web framework";
@@ -19061,12 +19114,12 @@ self: {
      }) {};
 
   "apiary-session" = callPackage
-    ({ mkDerivation, apiary, base, wai, web-routing }:
+    ({ mkDerivation, apiary, base, types-compat, wai, web-routing }:
      mkDerivation {
        pname = "apiary-session";
-       version = "1.3.0";
-       sha256 = "0sw33mbivb5849rsl1x5fbbh17is867l0n1f0vyrxrgpbvb58zi1";
-       buildDepends = [ apiary base wai web-routing ];
+       version = "1.4.0";
+       sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23";
+       buildDepends = [ apiary base types-compat wai web-routing ];
        homepage = "https://github.com/philopon/apiary";
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -19078,8 +19131,8 @@ self: {
      }:
      mkDerivation {
        pname = "apiary-websockets";
-       version = "1.3.0";
-       sha256 = "0kb4vjksdwr4p9qmbi7h0if4czdbp9mb2kb8xjgprdsn3wx13wzj";
+       version = "1.4.0";
+       sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1";
        buildDepends = [
          apiary base wai-websockets web-routing websockets
        ];
@@ -21484,8 +21537,8 @@ self: {
      }:
      mkDerivation {
        pname = "b9";
-       version = "0.2.4";
-       sha256 = "1s18423025r36gfvirwjx7p6zv612w0zsrdpchqzpp82jj989ym0";
+       version = "0.2.5";
+       sha256 = "0n5zc0k5fdpcljvrw38ma7x8q3dbqjbw98ji2mqb4rxbkqxz75jh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -22449,8 +22502,8 @@ self: {
      }:
      mkDerivation {
        pname = "bet";
-       version = "0.1.2.0";
-       sha256 = "1jpdy8p27nfwpinlbzbfy77nyf867qcjl96dzdw9q67b76v4gxc0";
+       version = "0.1.2.1";
+       sha256 = "1frl0a3sxracv32plx0imqpng3pn8v5z75a71mqvrinbsiyz7qbh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -25468,8 +25521,8 @@ self: {
      }:
      mkDerivation {
        pname = "buffer-builder";
-       version = "0.2.0.3";
-       sha256 = "154v17zgmp65a84cfij8qdankhsyww0avh5a5lqsqll6w3dxj6n9";
+       version = "0.2.1.0";
+       sha256 = "05kldfic7rmxqvq6mjy0q8gi5scpg9644rhni8jw9zrsh7j1f0n3";
        buildDepends = [
          base bytestring mtl text unordered-containers vector
        ];
@@ -26034,6 +26087,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytestring-read" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, tasty, tasty-quickcheck
+     , types-compat
+     }:
+     mkDerivation {
+       pname = "bytestring-read";
+       version = "0.2.0";
+       sha256 = "08622w2n7aphnv5wyisd5bz7r4nbyb1f86f4g1yia0r3x687sp5a";
+       buildDepends = [ base bytestring types-compat ];
+       testDepends = [ base bytestring doctest tasty tasty-quickcheck ];
+       homepage = "https://github.com/philopon/bytestring-read";
+       description = "fast ByteString to number converting library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bytestring-rematch" = callPackage
     ({ mkDerivation, base, bytestring, hspec, HUnit, rematch }:
      mkDerivation {
@@ -27177,8 +27245,8 @@ self: {
      }:
      mkDerivation {
        pname = "cairo";
-       version = "0.13.0.6";
-       sha256 = "0wwwk43ri3dgvzwpdfj1mdls714kll81c2jad0p84q0w9mrkqdax";
+       version = "0.13.1.0";
+       sha256 = "0vi7glzizi2nvv0p5wsdxlpkx3f1875jpij26k2j4h0h6z53z3kb";
        buildDepends = [ array base bytestring mtl text utf8-string ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ cairo ];
@@ -27380,8 +27448,8 @@ self: {
      }:
      mkDerivation {
        pname = "call";
-       version = "0.1.4.1";
-       sha256 = "16g961vg6yhbj8k47idf3bhaabpqkd4db1y5k5729l08wg04048b";
+       version = "0.1.4.2";
+       sha256 = "0q84q1821ilb0nh228jdpc6acxbbfngihir4mdklr8hywanz3s1g";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -27809,16 +27877,17 @@ self: {
 
   "cassandra-cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
-     , Decimal, MonadCatchIO-transformers, mtl, network, stm, text, time
-     , uuid
+     , Decimal, hslogger, MonadCatchIO-transformers, mtl, network
+     , resource-pool, stm, text, time, uuid
      }:
      mkDerivation {
        pname = "cassandra-cql";
-       version = "0.4.0.1";
-       sha256 = "0055vvnyqa8n5fma8kk0mxbyv6xnzqvdi6lpnk888c0xh2mqqv5m";
+       version = "0.5.0.1";
+       sha256 = "0n1w1hriscrjky3d4qwzzm3p41yg9gvnxyq9sfm3kb7lijc4xj2d";
        buildDepends = [
-         base bytestring cereal containers cryptohash Decimal
-         MonadCatchIO-transformers mtl network stm text time uuid
+         base bytestring cereal containers cryptohash Decimal hslogger
+         MonadCatchIO-transformers mtl network resource-pool stm text time
+         uuid
        ];
        description = "Haskell client for Cassandra's CQL protocol";
        license = stdenv.lib.licenses.bsd3;
@@ -29527,6 +29596,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "clash-prelude-quickcheck" = callPackage
+    ({ mkDerivation, base, clash-prelude, containers, mtl, QuickCheck
+     }:
+     mkDerivation {
+       pname = "clash-prelude-quickcheck";
+       version = "0.1.0.0";
+       sha256 = "0rn02hf5vj4yirh13y9h2jh2818lhchpabg5v6yqhngdj8rxys34";
+       buildDepends = [ base clash-prelude containers mtl QuickCheck ];
+       description = "QuickCheck instances for various types in the CλaSH Prelude";
+       license = "unknown";
+     }) {};
+
   "classify" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -29558,20 +29639,20 @@ self: {
     ({ mkDerivation, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, enclosed-exceptions, exceptions
      , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl
-     , old-locale, primitive, QuickCheck, semigroups, stm
-     , system-filepath, text, time, transformers, unordered-containers
-     , vector, vector-instances
+     , mutable-containers, old-locale, primitive, QuickCheck, semigroups
+     , stm, system-filepath, text, time, transformers
+     , unordered-containers, vector, vector-instances
      }:
      mkDerivation {
        pname = "classy-prelude";
-       version = "0.10.4";
-       sha256 = "1704y72zhpacs9hsab7kf4vhkj6bla988faz9w49v2xkw2zmdyz6";
+       version = "0.10.5";
+       sha256 = "1s9hydjs7x522w9hgrxjzx1d2zir80g140y4vdqd7mizv0yzisy3";
        buildDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          enclosed-exceptions exceptions ghc-prim hashable lifted-base
-         mono-traversable mtl old-locale primitive semigroups stm
-         system-filepath text time transformers unordered-containers vector
-         vector-instances
+         mono-traversable mtl mutable-containers old-locale primitive
+         semigroups stm system-filepath text time transformers
+         unordered-containers vector vector-instances
        ];
        testDepends = [
          base containers hspec QuickCheck transformers unordered-containers
@@ -29588,8 +29669,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-conduit";
-       version = "0.10.4";
-       sha256 = "0a4ll08p7wpw2m7pxy8vnac54ihmmzrg01527zzbp0wf2csz2x79";
+       version = "0.10.5";
+       sha256 = "1dy9jj260hn571z1wdm0v5zpgalwgij99clmh541b41h6pjbism2";
        buildDepends = [
          base bytestring classy-prelude conduit conduit-combinators
          monad-control resourcet system-fileio transformers void
@@ -29609,8 +29690,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-yesod";
-       version = "0.10.4";
-       sha256 = "0dbw0wxbliixky8rxbc7641np4hda76n6q3p8yfmlw4xvx8j0nvl";
+       version = "0.10.5";
+       sha256 = "0phaczjsn3blca3y6cwnqwhd9wrl7im1r2kh4i6a83c9kirsa5cx";
        buildDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
@@ -30245,6 +30326,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clustering" = callPackage
+    ({ mkDerivation, base, containers, hierarchical-clustering
+     , mwc-random, tasty, tasty-hunit, vector
+     }:
+     mkDerivation {
+       pname = "clustering";
+       version = "0.1.0";
+       sha256 = "04x6q7da64b2v326mbralkc13zb3b5x1fwdc3by703hf7mv28kd4";
+       buildDepends = [ base containers vector ];
+       testDepends = [
+         base hierarchical-clustering mwc-random tasty tasty-hunit vector
+       ];
+       description = "fast clustering algorithms";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "clustertools" = callPackage
     ({ mkDerivation, base, bio, bytestring, containers, QuickCheck
      , regex-compat, simpleargs
@@ -30649,18 +30746,18 @@ self: {
 
   "colada" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cmdargs, containers
-     , fclabels, ghc-prim, ListZipper, monad-atom, mtl, split, swift-lda
-     , text, vector
+     , fclabels, ghc-prim, ListZipper, monad-atom, mtl, nlp-scores
+     , split, swift-lda, text, vector
      }:
      mkDerivation {
        pname = "colada";
-       version = "0.8.0.0";
-       sha256 = "09a1izl99w532ldfma2zxhn6f1lsbisf3p0hy0dqkyyip01pcd8n";
+       version = "0.8.4.0";
+       sha256 = "16inmr2hp2racg85crrpwd45p1wgjhcp7w242nixc8dlwdy1lkz3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring cereal cmdargs containers fclabels ghc-prim
-         ListZipper monad-atom mtl split swift-lda text vector
+         ListZipper monad-atom mtl nlp-scores split swift-lda text vector
        ];
        jailbreak = true;
        homepage = "https://bitbucket.org/gchrupala/colada";
@@ -36992,17 +37089,20 @@ self: {
      }:
      mkDerivation {
        pname = "debian";
-       version = "3.85.2";
-       sha256 = "0fri7225aaj8pn2p0mn12rqaq540r9f8jnb3lak8zddvnj51kxaf";
+       version = "3.87.1";
+       sha256 = "1g8l293gk06qjyfng70nzwzir7w27fajbkc1ck6b9w96rpcr3ipf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         ansi-wl-pprint base bytestring bzlib containers directory either
-         exceptions filepath HaXml HUnit ListLike mtl network network-uri
-         old-locale parsec pretty prettyclass process process-extras pureMD5
+         base bytestring bzlib containers directory either exceptions
+         filepath HaXml HUnit ListLike mtl network network-uri old-locale
+         parsec pretty prettyclass process process-extras pureMD5
          regex-compat regex-tdfa template-haskell text time unix Unixutils
          utf8-string zlib
        ];
+       testDepends = [
+         ansi-wl-pprint base HUnit parsec pretty prettyclass regex-tdfa text
+       ];
        homepage = "https://github.com/ddssff/debian-haskell";
        description = "Modules for working with the Debian package system";
        license = stdenv.lib.licenses.bsd3;
@@ -37027,8 +37127,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.7.0.0";
-       sha256 = "19w6gylbhhg3cv424l3migdj23y7rhl9h9z2kbsv98pd43wn9128";
+       version = "0.7.1.0";
+       sha256 = "0hzvv6aazpf7r75yygcqy1ldz3j9shs6spv71nzn040rny67cdll";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -37678,6 +37778,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "derive-topdown" = callPackage
+    ({ mkDerivation, base, derive, mtl, template-haskell
+     , template-haskell-util
+     }:
+     mkDerivation {
+       pname = "derive-topdown";
+       version = "0.0.0.2";
+       sha256 = "0gdalqq1ks9jjp34kzavlx2ncpdad2pf6vdhx64yii5l2nl04r8p";
+       buildDepends = [
+         base derive mtl template-haskell template-haskell-util
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/HaskellZhangSong/derive-topdown";
+       description = "This library will help you generate Haskell empty Generic instances and deriving type instances from the top automatically to the bottom for composited data types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "derive-trie" = callPackage
     ({ mkDerivation, array, base, containers, template-haskell }:
      mkDerivation {
@@ -37748,8 +37865,8 @@ self: {
      }:
      mkDerivation {
        pname = "descriptive";
-       version = "0.9.2";
-       sha256 = "1dkq3ab8ggbaz8ahk7iik1bhwnhzffmpr0dp0n2gvrm7lnas2s77";
+       version = "0.9.3";
+       sha256 = "1kb6fca7fsg82ij6zlc85p9mfaxr3l5z45sjjcx6zvli1lknmqz0";
        buildDepends = [
          aeson base bifunctors containers mtl scientific text transformers
          vector
@@ -38079,6 +38196,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-hsqml" = callPackage
+    ({ mkDerivation, base, colour, containers, diagrams-core
+     , diagrams-lib, hsqml, lens, text, transformers
+     }:
+     mkDerivation {
+       pname = "diagrams-hsqml";
+       version = "0.0.0.2";
+       sha256 = "065jh6a24g25g1113iz4ml9vnrzpk2lyrf873jzq9x6awhi6ifng";
+       editedCabalFile = "bb0ff98c3522df34b9d9700a03600269cbb78d3e2a6796e6011778c315959490";
+       buildDepends = [
+         base colour containers diagrams-core diagrams-lib hsqml lens text
+         transformers
+       ];
+       homepage = "https://github.com/marcinmrotek/diagrams-hsqml";
+       description = "HsQML (Qt5) backend for Diagrams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-lib" = callPackage
     ({ mkDerivation, active, array, base, colour, containers
      , data-default-class, diagrams-core, dual-tree, filepath
@@ -39476,8 +39611,8 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.3.5.0";
-       sha256 = "1pi6vj6cxsp3kb9sd1qhvx9s09sa3vh7rm3czfssynnw9zanp99r";
+       version = "0.4.0.1";
+       sha256 = "15baqhwzhdsbn2iz2r7vkf66nbv0p4ni1qkpnpwblwbcnvfk2lzq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -39753,13 +39888,13 @@ self: {
 
   "docopt" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
-     , parsec, split
+     , parsec, split, template-haskell, th-lift
      }:
      mkDerivation {
        pname = "docopt";
-       version = "0.6.0.2";
-       sha256 = "1i57n3la71ny9nww5hrm5lvwidqk20rh3xfxf37m77zm0sjwsyk2";
-       buildDepends = [ base containers parsec ];
+       version = "0.7.0.1";
+       sha256 = "1i8san365h3g1jhkwh4dyphczdfyd1558744hj4sv5q9lnq86l4q";
+       buildDepends = [ base containers parsec template-haskell th-lift ];
        testDepends = [
          aeson ansi-terminal base bytestring containers parsec split
        ];
@@ -39775,8 +39910,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest";
-       version = "0.9.12";
-       sha256 = "0svm55qb8p6cb7359cpnfyg6i6smw5ajr6yyswl22mqqgxyydq53";
+       version = "0.9.13";
+       sha256 = "0xl570ay5bw1rpd1aw59c092rnwjbp9qykh2rhpxyvl333p8mg00";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -40837,6 +40972,7 @@ self: {
        pname = "dynamic-plot";
        version = "0.1.0.1";
        sha256 = "0yrkf28hsh992bd9cx3dpc69xg444n9j819ysqjfci7wwnvzxx31";
+       editedCabalFile = "bf93f06c056b95264f16bd647b64220d9dd81c421045b66a9a2d2005659cecf5";
        buildDepends = [
          async base colour constrained-categories containers deepseq
          diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib gtk
@@ -42273,8 +42409,8 @@ self: {
     ({ mkDerivation, base, bytestring, unix }:
      mkDerivation {
        pname = "entropy";
-       version = "0.3.5";
-       sha256 = "0myv4r5cwmw4l990r1vmqp4sbgriaizai11477x27pw9ajy93fd2";
+       version = "0.3.6";
+       sha256 = "1sfv930hvdmf018ngdl15jac2bgj75941w0ndlh78n1jgmf04jhn";
        buildDepends = [ base bytestring unix ];
        homepage = "https://github.com/TomMD/entropy";
        description = "A platform independent entropy source";
@@ -43140,13 +43276,13 @@ self: {
      }) {};
 
   "euler" = callPackage
-    ({ mkDerivation, base, hspec }:
+    ({ mkDerivation, base, hlint, hspec }:
      mkDerivation {
        pname = "euler";
-       version = "0.3.0";
-       sha256 = "0spxm1g2fpqjdz1k7zf1na2grs0x3yr1w60kv9ikznr5w1hfpbv4";
+       version = "0.3.3";
+       sha256 = "16rd09kg7wcnli8fg5m6415hxx2y50930qad7ifglkw2p6cfwxg2";
        buildDepends = [ base ];
-       testDepends = [ base hspec ];
+       testDepends = [ base hlint hspec ];
        homepage = "https://github.com/decomputed/euler";
        description = "Mathematics utilities for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -44039,16 +44175,16 @@ self: {
      }) {};
 
   "fast-logger" = callPackage
-    ({ mkDerivation, array, auto-update, base, blaze-builder
-     , bytestring, directory, filepath, hspec, text
+    ({ mkDerivation, array, auto-update, base, bytestring
+     , bytestring-builder, directory, filepath, hspec, text
      }:
      mkDerivation {
        pname = "fast-logger";
-       version = "2.2.3";
-       sha256 = "0zap61gz0snbq42h8nyjh637fr2cm1ny9f77sqd6v3yfqjq0ljh3";
+       version = "2.3.0";
+       sha256 = "1ii4wkpsi5w2230bzhnzcpgckd5gkawckws2vyggw78b91dw9dc5";
        buildDepends = [
-         array auto-update base blaze-builder bytestring directory filepath
-         text
+         array auto-update base bytestring bytestring-builder directory
+         filepath text
        ];
        testDepends = [ base bytestring directory hspec ];
        description = "A fast logging system";
@@ -44203,8 +44339,8 @@ self: {
      }:
      mkDerivation {
        pname = "fay";
-       version = "0.23.0.1";
-       sha256 = "13n7ywx2vwrn37cwrwdn94cghr18lfn67hxk08cmip6pxy5r9kf4";
+       version = "0.23.1.0";
+       sha256 = "1xrsa9hj70792fv8lbd820n7k44q2xhjzplzc4j7np4l8nd9n6l5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -44943,8 +45079,8 @@ self: {
      }:
      mkDerivation {
        pname = "file-embed";
-       version = "0.0.8.1";
-       sha256 = "14ip9c3sqbpv580p402xxwjnylr1p9yqw8q9b5pg1481glwg3w0k";
+       version = "0.0.8.2";
+       sha256 = "1gdxz9244wjhfigpsyaan81gyx6vanb8574xxi7944sj9pcgi74y";
        buildDepends = [
          base bytestring directory filepath template-haskell
        ];
@@ -45938,14 +46074,14 @@ self: {
      }) {};
 
   "fltkhs" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, process }:
+    ({ mkDerivation, base, bytestring, c2hs, directory, process }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.1.0.0";
-       sha256 = "1c8wdxxrx8y0911m3aa3b9svk7d3iqdsc2q0zrs67f0jv4wmd0dx";
+       version = "0.1.0.1";
+       sha256 = "026cx8l24qjf91d8ikqyz7bj92apm3qzq0ml6rvybj44mrpd1c34";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base bytestring process ];
+       buildDepends = [ base bytestring directory process ];
        buildTools = [ c2hs ];
        homepage = "http://github.com/deech/fltkhs";
        description = "FLTK bindings";
@@ -48142,6 +48278,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "generic-xmlpickler" = callPackage
+    ({ mkDerivation, base, generic-deriving, hxt, text }:
+     mkDerivation {
+       pname = "generic-xmlpickler";
+       version = "0.1.0.0";
+       sha256 = "0ybh3laciskf7yyhb8li4l8w758avgywfl7gy0df16im3x0cx0jy";
+       buildDepends = [ base generic-deriving hxt text ];
+       homepage = "http://github.com/silkapp/generic-xmlpickler";
+       description = "Generic generation of HXT XmlPickler instances using GHC Generics";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "generics-sop" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
@@ -49960,8 +50108,8 @@ self: {
      }:
      mkDerivation {
        pname = "glib";
-       version = "0.13.0.7";
-       sha256 = "16x6vqajixd6iws9ydn5a77phkckilxyvg48lcawk53nk8rvapzy";
+       version = "0.13.1.0";
+       sha256 = "11scv2imljnr6ng7692jdagr7fc924hgfwfbnw4a5sra3w7ja7fz";
        buildDepends = [ base bytestring containers text utf8-string ];
        buildTools = [ gtk2hs-buildtools ];
        pkgconfigDepends = [ glib ];
@@ -50723,13 +50871,12 @@ self: {
      }:
      mkDerivation {
        pname = "graceful";
-       version = "0.1.1.4";
-       sha256 = "1dj23pkvh013428247s6n6vsbv3klfa5gj9wrjs1qmaz1gkc216a";
+       version = "0.1.1.5";
+       sha256 = "1kl4y01ny5w1y77r2jf830d7vd99by7frk106m2wc9nbl066mbhr";
        buildDepends = [ base directory network stm unix ];
        testDepends = [
          base directory filepath hspec network process stm unix
        ];
-       jailbreak = true;
        description = "Library to write graceful shutdown / upgrade service";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51282,17 +51429,17 @@ self: {
      }) {};
 
   "gravatar" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, HTTP, pureMD5
-     , text
+    ({ mkDerivation, base, bytestring, data-default, hspec, HTTP
+     , pureMD5, text
      }:
      mkDerivation {
        pname = "gravatar";
-       version = "0.6";
-       sha256 = "035qhrk0s4bpv9xvji4j7w2r98gppn2armz4wjdjy8f50anjpfw3";
+       version = "0.8.0";
+       sha256 = "1mzl08qzwzzhz6bvkz4qnrdnzsgvsmi2lnhzf743yzx4msn00q3g";
        buildDepends = [ base bytestring data-default HTTP pureMD5 text ];
-       homepage = "http://github.com/pbrisbin/gravatar";
-       description = "Look up gravatar image urls by email address";
-       license = stdenv.lib.licenses.bsd3;
+       testDepends = [ base hspec text ];
+       description = "Generate Gravatar image URLs";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "gray-code" = callPackage
@@ -54758,22 +54905,24 @@ self: {
 
   "happstack-server" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
-     , containers, directory, extensible-exceptions, filepath, hslogger
-     , html, HUnit, monad-control, mtl, network, network-uri, old-locale
-     , parsec, process, sendfile, syb, system-filepath, template-haskell
-     , text, threads, time, time-compat, transformers, transformers-base
+     , containers, directory, exceptions, extensible-exceptions
+     , filepath, hslogger, html, HUnit, monad-control, mtl, network
+     , network-uri, old-locale, parsec, process, sendfile, syb
+     , system-filepath, template-haskell, text, threads, time
+     , time-compat, transformers, transformers-base, transformers-compat
      , unix, utf8-string, xhtml, zlib
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.4.0";
-       sha256 = "009y87g4wika9g0p58v8sdayh41rixkivhvi7j1dnxbm4qy89qpk";
+       version = "7.4.1";
+       sha256 = "0y3y4im18vihh4phhb6mx194gdz02z46mxrfgvf8kmg3db5bmqlk";
        buildDepends = [
          base base64-bytestring blaze-html bytestring containers directory
-         extensible-exceptions filepath hslogger html monad-control mtl
-         network network-uri old-locale parsec process sendfile syb
-         system-filepath template-haskell text threads time time-compat
-         transformers transformers-base unix utf8-string xhtml zlib
+         exceptions extensible-exceptions filepath hslogger html
+         monad-control mtl network network-uri old-locale parsec process
+         sendfile syb system-filepath template-haskell text threads time
+         time-compat transformers transformers-base transformers-compat unix
+         utf8-string xhtml zlib
        ];
        testDepends = [ base bytestring containers HUnit parsec zlib ];
        jailbreak = true;
@@ -55031,6 +55180,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { groonga = null;};
 
+  "haroonga-httpd" = callPackage
+    ({ mkDerivation, base, directory, haroonga, http-types, old-locale
+     , optparse-applicative, scotty, text, time, transformers, wai-extra
+     }:
+     mkDerivation {
+       pname = "haroonga-httpd";
+       version = "0.1.0.0";
+       sha256 = "15236s7289mckymapnvs6fx31lp6j68d8c38882qh6wwk9z71d5j";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base directory haroonga http-types old-locale optparse-applicative
+         scotty text time transformers wai-extra
+       ];
+       description = "Yet another Groonga http server";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {};
+
   "harp" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -57397,8 +57564,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.4.4.1";
-       sha256 = "1h98zwyf0ycdrzxwak40accr6xyi38s6ckkyl4mqfvbm3hz2vfq8";
+       version = "0.4.4.4";
+       sha256 = "19raiciwll7pgc73h2h704yi9wcifcn7s2gxyjrndp6d7kf1ygyy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -59912,8 +60079,8 @@ self: {
      }:
      mkDerivation {
        pname = "highlight-versions";
-       version = "0.1.3.4";
-       sha256 = "0gizqvn9a36hsvxvq9b76hbwpl3x0fgwba2l105d5ypzig9wss99";
+       version = "0.1.3.5";
+       sha256 = "0nk7kdzzlyq2ml30mj661616h23zar3kqq8xd36lqs1ssr7nqnj7";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ ansi-terminal base Cabal containers hackage-db ];
@@ -60558,6 +60725,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hjcase" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HUnit, test-framework
+     , test-framework-hunit, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjcase";
+       version = "0.1.0.0";
+       sha256 = "0n2wy39i3v2asifk3n9mlz1dwgyv9fr2mkqp9dbdbawnk2g96y4l";
+       buildDepends = [
+         aeson base bytestring HUnit test-framework test-framework-hunit
+         text unordered-containers vector
+       ];
+       homepage = "https://github.com/seagreen/hjcase";
+       description = "Jcase library for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hjpath" = callPackage
     ({ mkDerivation, base, containers, hjson, parsec }:
      mkDerivation {
@@ -60655,24 +60839,25 @@ self: {
      }) {};
 
   "hjsonschema" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, filepath
-     , hashable, HUnit, lens, regexpr, scientific, test-framework
-     , test-framework-hunit, text, unordered-containers, vector, wreq
+    ({ mkDerivation, aeson, base, bytestring, directory, file-embed
+     , filepath, hashable, hjsonpointer, http-types, HUnit, lens
+     , regexpr, scientific, test-framework, test-framework-hunit, text
+     , unordered-containers, vector, wreq
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "0.3.0.0";
-       sha256 = "1p229bbfpbs1d4hirk12hlyj4ghyw1w3k1p4aydvrqz6sp19nkk4";
+       version = "0.4.0.0";
+       sha256 = "0jak4ffjhbpwcmbx5jp6pbba52xr9zyhjjwn9y5gdqjny2scnb67";
        buildDepends = [
-         aeson base bytestring hashable lens regexpr scientific text
-         unordered-containers vector wreq
+         aeson base bytestring file-embed hashable hjsonpointer http-types
+         lens regexpr scientific text unordered-containers vector wreq
        ];
        testDepends = [
          aeson base bytestring directory filepath HUnit test-framework
          test-framework-hunit text unordered-containers vector
        ];
        homepage = "https://github.com/seagreen/hjsonschema";
-       description = "Haskell implementation of JSON Schema v4";
+       description = "Haskell implementation of JSON Schema Draft 4";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -60818,15 +61003,16 @@ self: {
      }) {};
 
   "hledger-irr" = callPackage
-    ({ mkDerivation, base, Cabal, hledger-lib, statistics, time }:
+    ({ mkDerivation, base, Cabal, Decimal, hledger-lib, statistics
+     , time
+     }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.4";
-       sha256 = "0nqd8br86d71dpwq7p8956q74pgqdimid42xikp9zvf632x2s8ax";
+       version = "0.1.1.5";
+       sha256 = "0xv8rmxf1534g6mbxlhmrx71w0amdrhhj1dwyw5dv91i743br5mp";
        isLibrary = false;
        isExecutable = true;
-       buildDepends = [ base Cabal hledger-lib statistics time ];
-       jailbreak = true;
+       buildDepends = [ base Cabal Decimal hledger-lib statistics time ];
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60951,19 +61137,18 @@ self: {
 
   "hlint" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
-     , directory, extra, filepath, haskell-src-exts, process
+     , directory, extra, filepath, haskell-src-exts, hscolour, process
      , transformers, uniplate
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.16";
-       sha256 = "11ykjslyr8sgpa1jpnv3vdzz0nxyrxw3mzcsdbidgzw7aphpzcb3";
-       editedCabalFile = "4e3f4397ef78f431aadf4644b37ec01d624dd14dd70fec81953a509546182b8a";
+       version = "1.9.17";
+       sha256 = "1z304qas7h8y9d2jnq8hkg3p50cpx3ni6fwyaj1qwlqrcm4n5rv8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          ansi-terminal base cmdargs containers cpphs directory extra
-         filepath haskell-src-exts process transformers uniplate
+         filepath haskell-src-exts hscolour process transformers uniplate
        ];
        homepage = "http://community.haskell.org/~ndm/hlint/";
        description = "Source code suggestions";
@@ -61485,8 +61670,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnetcdf";
-       version = "0.2.2.0";
-       sha256 = "1v1z6xvzmnhsvmxvncrf6bb2bf2map0kqwjn1myqm3pf1zpiqrxj";
+       version = "0.3.0.0";
+       sha256 = "1309kzb5jrc9yy18bir3dy3r5xhmfnbd180ky9x4l3i1m4q5r31s";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -61952,22 +62137,21 @@ self: {
 
   "hoodle" = callPackage
     ({ mkDerivation, base, cmdargs, configurator, containers, directory
-     , dyre, filepath, hoodle-core, mtl
+     , filepath, hoodle-core, mtl
      }:
      mkDerivation {
        pname = "hoodle";
-       version = "0.3";
-       sha256 = "01wz7bwdr3i43ikaiaq8vpn6b0clxjnjyaw6nl6zaq489dhj6fv5";
+       version = "0.4.0";
+       sha256 = "0ygmizbhag16ifdyp8gcvs0m9vinvirn8v7jfbi2m457bllmbsmq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base cmdargs configurator containers directory dyre filepath
-         hoodle-core mtl
+         base cmdargs configurator containers directory filepath hoodle-core
+         mtl
        ];
        homepage = "http://ianwookim.org/hoodle";
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-builder" = callPackage
@@ -61976,8 +62160,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoodle-builder";
-       version = "0.3";
-       sha256 = "0mj58g7kfr5hpqv6idjb24d3gdh25z5x2ym62c6ckm5g3f4x3jm9";
+       version = "0.3.0";
+       sha256 = "0g4a3gf1mgf5gyniif0i2b89dz416h28171mwx7k7ivjw23gjvm7";
        buildDepends = [
          base blaze-builder bytestring double-conversion hoodle-types lens
          strict text
@@ -61988,35 +62172,35 @@ self: {
 
   "hoodle-core" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
-     , base64-bytestring, binary, bytestring, cairo, cereal
-     , configurator, containers, coroutine-object, dbus, Diff, directory
-     , dyre, either, errors, filepath, fsnotify, gd, gtk, hoodle-builder
-     , hoodle-parser, hoodle-render, hoodle-types, lens, libX11, libXi
-     , monad-loops, mtl, network, network-info, network-simple
-     , old-locale, pango, poppler, process, pureMD5, stm, strict
-     , svgcairo, system-filepath, template-haskell, text, time
-     , transformers, transformers-free, unordered-containers, uuid
-     , vector, xournal-parser
+     , base64-bytestring, binary, bytestring, cairo, case-insensitive
+     , cereal, configurator, containers, coroutine-object, Diff
+     , directory, either, errors, filepath, fsnotify, gd, gtk
+     , handa-gdata, hoodle-builder, hoodle-parser, hoodle-publish
+     , hoodle-render, hoodle-types, http-types, lens, libX11, libXi
+     , monad-loops, mtl, network-uri, old-locale, pango, poppler
+     , process, pureMD5, stm, strict, svgcairo, system-filepath
+     , template-haskell, text, time, transformers, transformers-free
+     , unordered-containers, uuid, vector, websockets, xournal-parser
      }:
      mkDerivation {
        pname = "hoodle-core";
-       version = "0.14";
-       sha256 = "1njkjxcbnwh9b7mg0xcqkc0clfz64n5h9jqf3323npyw8bhw34b8";
+       version = "0.15.0";
+       sha256 = "04007hbnv4n3dl2yngfjzl6vrqd40yk5h9lq0ws2z33k4xa3a3rk";
        buildDepends = [
          aeson aeson-pretty array attoparsec base base64-bytestring binary
-         bytestring cairo cereal configurator containers coroutine-object
-         dbus Diff directory dyre either errors filepath fsnotify gd gtk
-         hoodle-builder hoodle-parser hoodle-render hoodle-types lens
-         monad-loops mtl network network-info network-simple old-locale
-         pango poppler process pureMD5 stm strict svgcairo system-filepath
-         template-haskell text time transformers transformers-free
-         unordered-containers uuid vector xournal-parser
+         bytestring cairo case-insensitive cereal configurator containers
+         coroutine-object Diff directory either errors filepath fsnotify gd
+         gtk handa-gdata hoodle-builder hoodle-parser hoodle-publish
+         hoodle-render hoodle-types http-types lens monad-loops mtl
+         network-uri old-locale pango poppler process pureMD5 stm strict
+         svgcairo system-filepath template-haskell text time transformers
+         transformers-free unordered-containers uuid vector websockets
+         xournal-parser
        ];
        extraLibraries = [ libX11 libXi ];
        homepage = "http://ianwookim.org/hoodle";
        description = "Core library for hoodle";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXi;};
 
   "hoodle-extra" = callPackage
@@ -62053,8 +62237,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoodle-parser";
-       version = "0.3";
-       sha256 = "1ihpmkhjzsf8w4ygljx2agx31xblc0ch4y8m9pwj7rnnjj1sw15i";
+       version = "0.3.0";
+       sha256 = "0qp7x6csacf4w9crvmyrs7qsm9caici95qiwm11zyzyz2k9nm52g";
        buildDepends = [
          attoparsec base bytestring containers either hoodle-types lens mtl
          strict text transformers xournal-types
@@ -62066,48 +62250,46 @@ self: {
 
   "hoodle-publish" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cairo, cmdargs
-     , containers, coroutine-object, directory, directory-tree, filepath
-     , gtk, hoodle-parser, hoodle-render, hoodle-types, HTTP, io-streams
-     , lens, mtl, network, pdf-toolbox-core, pdf-toolbox-document
-     , poppler, process, transformers, uuid
+     , containers, directory, directory-tree, filepath, gtk
+     , hoodle-parser, hoodle-render, hoodle-types, HTTP, io-streams
+     , lens, mtl, network-uri, pdf-toolbox-core, pdf-toolbox-document
+     , process, transformers, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "hoodle-publish";
-       version = "0.1";
-       sha256 = "13753yhv9vlpbjjigciqingjxwm4vhv8lmam8qyqykrmd33ygj31";
-       isLibrary = false;
+       version = "0.2.0";
+       sha256 = "1nx2y4f000gid9mps0xxx4l6h0nh120568h9cl45gsp6qlw3sa5m";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         attoparsec base bytestring cairo cmdargs containers
-         coroutine-object directory directory-tree filepath gtk
-         hoodle-parser hoodle-render hoodle-types HTTP io-streams lens mtl
-         network pdf-toolbox-core pdf-toolbox-document poppler process
-         transformers uuid
+         attoparsec base bytestring cairo cmdargs containers directory
+         directory-tree filepath gtk hoodle-parser hoodle-render
+         hoodle-types HTTP io-streams lens mtl network-uri pdf-toolbox-core
+         pdf-toolbox-document process transformers unordered-containers uuid
        ];
        homepage = "http://ianwookim.org/hoodle";
        description = "publish hoodle files as a static web site";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hoodle-render" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cairo
-     , containers, directory, filepath, gd, gtk, hoodle-types, lens
-     , monad-loops, mtl, poppler, stm, strict, svgcairo, transformers
-     , unix, unordered-containers, uuid
+     , containers, directory, filepath, gd, gtk, hashable, hoodle-types
+     , lens, monad-loops, mtl, poppler, stm, strict, svgcairo, time
+     , transformers, unix, unordered-containers, uuid
      }:
      mkDerivation {
        pname = "hoodle-render";
-       version = "0.4";
-       sha256 = "06ds0fzw11a10m927y2jvmgbsjy7cxdpppb6ifxkg173csp92a2d";
+       version = "0.5.0";
+       sha256 = "0460j9flj5cnvgv6cnchc6am0r5sw81lp67qf45rgcyjpz9q424i";
        buildDepends = [
          base base64-bytestring bytestring cairo containers directory
-         filepath gd gtk hoodle-types lens monad-loops mtl poppler stm
-         strict svgcairo transformers unix unordered-containers uuid
+         filepath gd gtk hashable hoodle-types lens monad-loops mtl poppler
+         stm strict svgcairo time transformers unix unordered-containers
+         uuid
        ];
        description = "Hoodle file renderer";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hoodle-types" = callPackage
@@ -62116,8 +62298,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoodle-types";
-       version = "0.3";
-       sha256 = "0n9plj6hhsc5482pl7sw4gw7py8r6cn0cl7hg35g2qxdxnzapifm";
+       version = "0.3.0";
+       sha256 = "0mkx3n1sni43665dk5ify890wdfxamxvkx1h61kzsk3c3bazngr5";
        buildDepends = [
          base bytestring cereal containers lens mtl strict text uuid
        ];
@@ -62392,8 +62574,8 @@ self: {
     ({ mkDerivation, AC-Angle, base, time }:
      mkDerivation {
        pname = "horizon";
-       version = "0.1.0";
-       sha256 = "0yzchd0kfszwf0dwr8vbg7zbr6an5zk0hw658mj82d89jmzldwjv";
+       version = "0.1.1";
+       sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4";
        buildDepends = [ AC-Angle base time ];
        homepage = "https://github.com/intractable/horizon";
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
@@ -62781,18 +62963,18 @@ self: {
 
   "hpc-coveralls" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cmdargs
-     , containers, curl, hpc, HUnit, process, regex-posix, retry, safe
-     , split
+     , containers, curl, directory, directory-tree, hpc, HUnit, process
+     , pureMD5, regex-posix, retry, safe, split
      }:
      mkDerivation {
        pname = "hpc-coveralls";
-       version = "0.8.3";
-       sha256 = "02nqp267dcqrl81p7pn0bwpi44lakwl6pi47n9i1cnr7abcadglb";
+       version = "0.9.0";
+       sha256 = "0ika073kkm8kivd0m2dhb7ysk5h7q9vsj02xf4azh3c4xpvw4086";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson async base bytestring cmdargs containers curl hpc process
-         regex-posix retry safe split
+         aeson async base bytestring cmdargs containers curl directory
+         directory-tree hpc process pureMD5 regex-posix retry safe split
        ];
        testDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
@@ -62886,25 +63068,25 @@ self: {
      }) {};
 
   "hpqtypes" = callPackage
-    ({ mkDerivation, base, bytestring, containers, exceptions, HUnit
-     , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
-     , resource-pool, test-framework, test-framework-hunit, text, time
-     , transformers, transformers-base, vector
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , exceptions, HUnit, lifted-base, monad-control, mtl, postgresql
+     , QuickCheck, random, resource-pool, test-framework
+     , test-framework-hunit, text, time, transformers, transformers-base
+     , vector
      }:
      mkDerivation {
        pname = "hpqtypes";
-       version = "1.3.2";
-       sha256 = "10axgrdhfas2rgy56yzcdwr0bbi6kijkbn3b8cpi7jkxs7pnqp6x";
+       version = "1.4.0";
+       sha256 = "0sq4abqqqq71yw2rgpx5xmm7h8fhcj654vbkhb4wlgi1g5kj9kh1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring containers exceptions HUnit lifted-base
-         monad-control mtl QuickCheck random resource-pool test-framework
-         test-framework-hunit text time transformers transformers-base
-         vector
+         base bytestring containers data-default-class exceptions HUnit
+         lifted-base monad-control mtl QuickCheck random resource-pool
+         test-framework test-framework-hunit text time transformers
+         transformers-base vector
        ];
        extraLibraries = [ postgresql ];
-       jailbreak = true;
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) postgresql;};
@@ -63511,6 +63693,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hs-re" = callPackage
+    ({ mkDerivation, array, base, regex-base, regex-posix }:
+     mkDerivation {
+       pname = "hs-re";
+       version = "0.1.0";
+       sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb";
+       buildDepends = [ array base regex-base regex-posix ];
+       description = "Easy to use Regex";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hs-scrape" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , exceptions, hspec, html-conduit, lens, retry, safe, tasty
@@ -65322,8 +65515,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "0.3.2.2";
-       sha256 = "0w2zvzpa5294y8hbjjnpd9kyq42i8l5ca6dpf2zl8mwnmfqzc733";
+       version = "0.3.2.3";
+       sha256 = "187j2fhiwv3v2rlh1h9jdxpywdms9n37yp3597dmsbq2kggzsigh";
        buildDepends = [
          base bytestring containers digestive-functors HandsomeSoup hspec
          hspec-core hxt lens mtl snap snap-core text transformers
@@ -65583,9 +65776,8 @@ self: {
      }) { inherit (pkgs) sqlite;};
 
   "hsqml" = callPackage
-    ({ mkDerivation, base, c2hs, containers, directory, filepath
-     , Qt5Core, Qt5Gui, Qt5Qml, Qt5Quick, Qt5Widgets, QuickCheck, tagged
-     , text, transformers
+    ({ mkDerivation, base, c2hs, containers, directory, filepath, qt5
+     , QuickCheck, tagged, text, transformers
      }:
      mkDerivation {
        pname = "hsqml";
@@ -65596,13 +65788,11 @@ self: {
        ];
        testDepends = [ base containers directory QuickCheck tagged text ];
        buildTools = [ c2hs ];
-       pkgconfigDepends = [ Qt5Core Qt5Gui Qt5Qml Qt5Quick Qt5Widgets ];
+       pkgconfigDepends = [ qt5 ];
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Qt5Core = null;  Qt5Gui = null;  Qt5Qml = null;
-          Qt5Quick = null;  Qt5Widgets = null;};
+     }) { inherit (pkgs) qt5;};
 
   "hsqml-demo-morris" = callPackage
     ({ mkDerivation, base, containers, deepseq, directory, hsqml
@@ -66391,19 +66581,19 @@ self: {
 
   "http-client" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , data-default-class, deepseq, exceptions, filepath, ghc-prim
-     , hspec, http-types, mime-types, monad-control, network
+     , blaze-builder, bytestring, case-insensitive, clock, containers
+     , cookie, data-default-class, deepseq, exceptions, filepath
+     , ghc-prim, hspec, http-types, mime-types, monad-control, network
      , network-uri, publicsuffixlist, random, streaming-commons, text
      , time, transformers, zlib
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.7.1";
-       sha256 = "1vkz0a8rzdgx1lnxcic62hbp8v3y0dvqr1dv6h7lq0d6rbv24hk3";
+       version = "0.4.7.2";
+       sha256 = "1y788yj3jaw4l10p31qvhpy33sn9spfrql4ydrs67mkalbad0f7a";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie data-default-class deepseq
+         case-insensitive clock containers cookie data-default-class deepseq
          exceptions filepath ghc-prim http-types mime-types network
          network-uri publicsuffixlist random streaming-commons text time
          transformers
@@ -67266,6 +67456,88 @@ self: {
        license = "GPL";
      }) {};
 
+  "hunt-searchengine" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
+     , containers, data-default, data-r-tree, data-stringmap, deepseq
+     , directory, dlist, filepath, hslogger, HUnit, hxt-regex-xmlschema
+     , monad-parallel, mtl, murmur-hash, old-locale, parsec, QuickCheck
+     , random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hunt-searchengine";
+       version = "0.3.0.1";
+       sha256 = "1y8pq158jwdl3zq5f0xdgszihp8z181lhwd92d66ckw9nh0sllw6";
+       buildDepends = [
+         aeson aeson-pretty base binary bytestring containers data-default
+         data-r-tree data-stringmap deepseq dlist filepath hslogger
+         hxt-regex-xmlschema monad-parallel mtl murmur-hash parsec text time
+         transformers unordered-containers vector
+       ];
+       testDepends = [
+         aeson base binary containers data-default data-r-tree directory
+         HUnit monad-parallel mtl old-locale QuickCheck random
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/hunt-framework/";
+       description = "A search and indexing engine";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hunt-server" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, binary, blaze-html
+     , blaze-markup, bytestring, cmdargs, containers, data-default
+     , deepseq, ekg-core, hamlet, hslogger, http-types
+     , hunt-searchengine, mtl, scotty, shakespeare-js, text, wai
+     , wai-extra, wai-middleware-static, warp
+     }:
+     mkDerivation {
+       pname = "hunt-server";
+       version = "0.3.0.2";
+       sha256 = "19bbn97pj01sbqbjkgh82hiwzxfybnnm29wj4irgicab0d72jvg6";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson aeson-pretty base binary blaze-html blaze-markup bytestring
+         cmdargs containers data-default deepseq ekg-core hamlet hslogger
+         http-types hunt-searchengine mtl scotty shakespeare-js text wai
+         wai-extra wai-middleware-static warp
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/hunt-framework";
+       description = "A search and indexing engine server";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hunt-server-cli" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
+     , conduit, conduit-extra, containers, csv-conduit, data-default
+     , docopt, hslogger, http-types, hunt-client, hunt-searchengine, mtl
+     , resourcet, string-conversions, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "hunt-server-cli";
+       version = "0.2.0.0";
+       sha256 = "1pmlg06jipmc99v7clz2q7x3bh4ndar55595fx729khnjrbiy9bz";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson aeson-pretty base binary bytestring conduit conduit-extra
+         containers csv-conduit data-default docopt hslogger http-types
+         hunt-client hunt-searchengine mtl resourcet string-conversions text
+         time transformers unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/hunt-framework";
+       description = "A Command line Interface for the Hunt server";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) { hunt-client = null;};
+
   "hurdle" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, kangaroo }:
      mkDerivation {
@@ -67413,13 +67685,14 @@ self: {
      }:
      mkDerivation {
        pname = "hwsl2";
-       version = "0.2.0.0";
-       sha256 = "0cyc4y99ird4mxpasrbk82x7xl63r7cc710qisvm8qvjlmriw87b";
+       version = "0.3.0.1";
+       sha256 = "1zs1wlnvh316n914mrlihrd4njbnq9n070ckq5f7hbax37v3h9p5";
        buildDepends = [ base bytestring ];
        testDepends = [
          base bytestring Cabal cabal-test-quickcheck QuickCheck
          quickcheck-properties
        ];
+       jailbreak = true;
        homepage = "https://github.com/srijs/hwsl2";
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
@@ -69219,6 +69492,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "incremental-computing" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers
+     , dlist, fingertree, order-maintenance, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "incremental-computing";
+       version = "0.0.0.0";
+       sha256 = "0zdq122m0nq18igvdxis7lqgdflf6sc94m1aqypjwfkxy4qfvvq3";
+       buildDepends = [
+         base containers dlist fingertree order-maintenance transformers
+       ];
+       testDepends = [
+         base Cabal cabal-test-quickcheck containers QuickCheck
+       ];
+       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
+       description = "Incremental computing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "incremental-parser" = callPackage
     ({ mkDerivation, base, checkers, monoid-subclasses, QuickCheck
      , tasty, tasty-quickcheck
@@ -70492,11 +70784,10 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "ireal";
-       version = "0.1";
-       sha256 = "0qphr5fr118549wr09aq6yf4v7f346pdv0w8ga7a1svq3ckkyp5d";
-       editedCabalFile = "af37b981aa1951e703f72692dfc337c0a0048afaf2148307d5061b035ab62ef7";
+       version = "0.2";
+       sha256 = "0my93h51lfziqvqnnvzkrqpnc5bjg6blr46drd37861l5svid2a1";
        buildDepends = [ base QuickCheck ];
-       description = "Real numbers and intervals with not so inefficient exact arithmetic";
+       description = "Real numbers and intervals with relatively efficient exact arithmetic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -72499,8 +72790,8 @@ self: {
      }:
      mkDerivation {
        pname = "kansas-lava-papilio";
-       version = "0.1.0";
-       sha256 = "0ikc6yfcv2fjx0szfmp92nrdhdfdivlc14a7w214i0q3vrncjkzm";
+       version = "0.2.0";
+       sha256 = "1p1mlpcm5jaxa6ja5g9vcgkf1dqnh6b2xzy45m0qas9ak47qrhrd";
        buildDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava kansas-lava-cores netlist network sized-types
@@ -74974,8 +75265,8 @@ self: {
      }:
      mkDerivation {
        pname = "learning-hmm";
-       version = "0.3.1.1";
-       sha256 = "1ry8g3gkmvj5xk4llrll40g8xdddg8g2rbg8qwjwqpdd1ni9hck4";
+       version = "0.3.1.2";
+       sha256 = "0inj841fdh6d8d2i5r2mnsw14fxzdcg92n91gfbaginds4mhjf7d";
        buildDepends = [
          base containers deepseq hmatrix random-fu random-source vector
        ];
@@ -75186,8 +75477,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "lens-family-th";
-       version = "0.4.0.0";
-       sha256 = "02fc3kppb7y2c6j22wi2mzcxffj4k3dl3x09vjllqchfpfcpwbm5";
+       version = "0.4.1.0";
+       sha256 = "084yng26xyhw6c6hij3p70zvjpvm1dlw6klphw51car9gi6dqkvm";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
@@ -75963,20 +76254,20 @@ self: {
      }) { inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
-    ({ mkDerivation, base, bytestring, glib, tag_c, taglib_c }:
+    ({ mkDerivation, base, bytestring, glib, taglib }:
      mkDerivation {
        pname = "libtagc";
        version = "0.12.0";
        sha256 = "1f7r82cfrkxrqcrxk92y6zhk79qwpack2g67crww5q8hs7438vja";
        buildDepends = [ base bytestring glib ];
-       extraLibraries = [ tag_c ];
-       pkgconfigDepends = [ taglib_c ];
+       extraLibraries = [ taglib ];
+       pkgconfigDepends = [ taglib ];
        jailbreak = true;
        homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home";
        description = "Binding to TagLib C library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { tag_c = null;  taglib_c = null;};
+     }) { inherit (pkgs) taglib;};
 
   "libvirt-hs" = callPackage
     ({ mkDerivation, base, c2hs, syb, virt }:
@@ -76363,6 +76654,7 @@ self: {
        buildDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
@@ -80615,8 +80907,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi-util";
-       version = "0.1";
-       sha256 = "19b6x7n49yd6jwld65k2z5zj4mg5s0zgs3zb7y8a4fj2jp15p8kn";
+       version = "0.1.1";
+       sha256 = "14apfrhahm5pniwpjgk5ckgb1y6zlfxcb91xsh4qpg1axav89cr2";
        buildDepends = [ base containers event-list midi non-negative ];
        homepage = "http://github.com/mtolly/midi-util";
        description = "Utility functions for processing MIDI files";
@@ -81683,8 +81975,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger";
-       version = "0.3.13";
-       sha256 = "00gzv4yfh3xj95nl6jyqc0d7m8n98inbmkxinq66ny9159qry0jg";
+       version = "0.3.13.1";
+       sha256 = "0mwdihxly22axrjs9g741zab2yyrm6zy73di99m7lvg8jdj4m2r6";
        buildDepends = [
          base blaze-builder bytestring conduit conduit-extra exceptions
          fast-logger lifted-base monad-control monad-loops mtl resourcet stm
@@ -81857,6 +82149,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-parallel-progressbar" = callPackage
+    ({ mkDerivation, base, monad-parallel, monadIO
+     , terminal-progress-bar
+     }:
+     mkDerivation {
+       pname = "monad-parallel-progressbar";
+       version = "0.1.0.0";
+       sha256 = "0h714gijrmg5z1cjn86j0q58igcrqwbad5yazhhmnb2xzvz1r2p5";
+       buildDepends = [
+         base monad-parallel monadIO terminal-progress-bar
+       ];
+       homepage = "https://github.com/mnacamura/monad-parallel-progressbar";
+       description = "Parallel execution of monadic computations with a progress bar";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "monad-param" = callPackage
     ({ mkDerivation, base, mtl, stm }:
      mkDerivation {
@@ -82691,22 +82999,22 @@ self: {
      }) { morfeusz = null;};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, containers, happy
+    ({ mkDerivation, alex, array, base, binary, deepseq, happy
      , lens-family-core, optparse-applicative, pipes, text, transformers
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.0.1";
-       sha256 = "0gn4fdvc61f59k06s7gbds351vljd3lbwvl7mka59kk39i7flfyq";
+       version = "1.1.1";
+       sha256 = "0daq0894kmd938k7qdbi7f1axih5gx5yrimx5pssfvhvw78bdqp4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base binary containers lens-family-core optparse-applicative
+         array base binary deepseq lens-family-core optparse-applicative
          pipes text transformers
        ];
        buildTools = [ alex happy ];
        jailbreak = true;
-       description = "Bare-bones calculus of constructions";
+       description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -85458,10 +85766,9 @@ self: {
      }:
      mkDerivation {
        pname = "network-simple";
-       version = "0.4.0.3";
-       sha256 = "0nbs79v07x18y324drngr1zrcgjla2y9qjxkd64qwbldw48s1i85";
+       version = "0.4.0.4";
+       sha256 = "0qa3ax29ci7m01af0d2rvnx9m24q1d9zw727bzhc88k2g6k2xzah";
        buildDepends = [ base bytestring exceptions network transformers ];
-       jailbreak = true;
        homepage = "https://github.com/k0001/network-simple";
        description = "Simple network sockets usage patterns";
        license = stdenv.lib.licenses.bsd3;
@@ -85966,8 +86273,8 @@ self: {
     ({ mkDerivation, base, containers, strict }:
      mkDerivation {
        pname = "nlp-scores";
-       version = "0.6.2";
-       sha256 = "0zknj60jh2pg5lih1hbmhbig7mhqz22pybxr6hvm562j17jysg4k";
+       version = "0.7.0";
+       sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m";
        buildDepends = [ base containers strict ];
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Scoring functions commonly used for evaluation in NLP and IR";
@@ -87805,6 +88112,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "order-maintenance" = callPackage
+    ({ mkDerivation, base, containers, transformers }:
+     mkDerivation {
+       pname = "order-maintenance";
+       version = "0.0.0.0";
+       sha256 = "1d416a277fcchcgyn4n5m7kpn0aky8gsi8fkk0gh3a4lcap18h2d";
+       buildDepends = [ base containers 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;
+     }) {};
+
   "order-statistics" = callPackage
     ({ mkDerivation, base, containers, math-functions, statistics
      , vector, vector-space
@@ -89913,8 +90232,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.1.1.6";
-       sha256 = "1jz77x8ikplp5v866x73iii49g2r28dj1xg7gv1c1ypqsz14scsr";
+       version = "2.1.1.7";
+       sha256 = "1nj2nwjzg95k1xyhk31mpmyy0flw4hjjf8r0959i1x1makrfy32f";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
@@ -90244,6 +90563,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persona-idp" = callPackage
+    ({ mkDerivation, aeson, asn1-types, base, blaze-markup, bytestring
+     , crypto-random, directory, filepath, hamlet, http-types, jose
+     , lens, optparse-applicative, pem, persona, scotty, shakespeare
+     , text, time, transformers, unix, wai, x509
+     }:
+     mkDerivation {
+       pname = "persona-idp";
+       version = "0.1.0.0";
+       sha256 = "11zwic1id47a9zmxg0jd2qfsaygmy5izc8xpl5c5mkby3r7akp78";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson asn1-types base blaze-markup bytestring crypto-random
+         directory filepath hamlet http-types jose lens optparse-applicative
+         pem persona scotty shakespeare text time transformers unix wai x509
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/frasertweedale/hs-persona-idp";
+       description = "Persona (BrowserID) Identity Provider";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "pesca" = callPackage
     ({ mkDerivation, base, process }:
      mkDerivation {
@@ -90330,8 +90672,8 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "7.5";
-       sha256 = "00v80ppb3fl89jd8kdzs3phskbm3d2c27f8hxckdfrrq05wa56b3";
+       version = "7.6";
+       sha256 = "1vgvf7xbzkmb5nbxgaf552i18p22pkj9wgyz3mhbg1m0j2jr1dnj";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -91340,12 +91682,12 @@ self: {
      }) {};
 
   "plist" = callPackage
-    ({ mkDerivation, base, dataenc, hxt }:
+    ({ mkDerivation, base, base64-bytestring, bytestring, hxt }:
      mkDerivation {
        pname = "plist";
-       version = "0.0.5";
-       sha256 = "1c77p62sgc8zs9856h1glsfi384fjnxd9rblw2xhbszr9j6h6rxh";
-       buildDepends = [ base dataenc hxt ];
+       version = "0.0.6";
+       sha256 = "0xsx1pvlnqyidpvswisir9p9054r7fczi81nccflazijn3pr9rgb";
+       buildDepends = [ base base64-bytestring bytestring hxt ];
        description = "Generate and parse Mac OS X property list format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91564,6 +91906,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pocket-dns" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cabal-test-bin
+     , data-default, dns, hspec, hspec-contrib, hspec-server
+     , hspec-test-sandbox, http-conduit, iproute, monad-control, network
+     , optparse-applicative, persistent, persistent-sqlite
+     , persistent-template, persistent-zookeeper, shakespeare, shelly
+     , test-sandbox, text, transformers, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "pocket-dns";
+       version = "0.1.1";
+       sha256 = "1736gj66ljgarmdxwzc9m5aa9inkmgzfmn9sjcqlcs0kpp5faqsh";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring data-default dns http-conduit iproute
+         monad-control network optparse-applicative persistent
+         persistent-sqlite persistent-template persistent-zookeeper shelly
+         text transformers unordered-containers yaml
+       ];
+       testDepends = [
+         base cabal-test-bin hspec hspec-contrib hspec-server
+         hspec-test-sandbox shakespeare test-sandbox text transformers
+       ];
+       description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pointed" = callPackage
     ({ mkDerivation, base, comonad, containers, data-default-class
      , kan-extensions, semigroupoids, semigroups, stm, tagged
@@ -92038,7 +92408,7 @@ self: {
 
   "poppler" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers
-     , gdk_pixbuf, glib, gtk, gtk2hs-buildtools, mtl, pango, popplerGlib
+     , gdk_pixbuf, glib, gtk, gtk2hs-buildtools, mtl, pango, poppler
      }:
      mkDerivation {
        pname = "poppler";
@@ -92048,13 +92418,12 @@ self: {
          array base bytestring cairo containers glib gtk mtl
        ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gdk_pixbuf pango popplerGlib ];
+       pkgconfigDepends = [ gdk_pixbuf pango poppler ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) gdk_pixbuf;  inherit (pkgs.gnome) pango;
-          popplerGlib = null;};
+          inherit (pkgs) poppler;};
 
   "populate-setup-exe-cache" = callPackage
     ({ mkDerivation, base }:
@@ -92320,6 +92689,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-config" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
+     , postgresql-simple, resource-pool, time
+     }:
+     mkDerivation {
+       pname = "postgresql-config";
+       version = "0.0.1";
+       sha256 = "1hp6ki078d4hvb910403ppvcb8q6ji79z3ccv6alkpnd494wd4wr";
+       buildDepends = [
+         aeson base bytestring monad-control mtl postgresql-simple
+         resource-pool time
+       ];
+       homepage = "https://bitbucket.org/s9gf4ult/postgresql-config";
+       description = "Types for easy adding postgresql configuration to your program";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-copy-escape" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -92365,6 +92751,35 @@ self: {
        license = "GPL";
      }) {};
 
+  "postgresql-query" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , containers, either, exceptions, file-embed, haskell-src-meta
+     , 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, time, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "postgresql-query";
+       version = "1.0.1";
+       sha256 = "0p11a6rzcpwnq55s9hslfqbi70g39gf1qbz6805a232y9wwkf8rn";
+       buildDepends = [
+         aeson attoparsec base blaze-builder bytestring containers either
+         exceptions file-embed haskell-src-meta monad-control monad-logger
+         mtl postgresql-simple resource-pool semigroups template-haskell
+         text time transformers transformers-base transformers-compat
+       ];
+       testDepends = [
+         attoparsec base QuickCheck quickcheck-assertions
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th
+         text
+       ];
+       homepage = "https://bitbucket.org/s9gf4ult/postgresql-query";
+       description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-simple" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , blaze-builder, blaze-textual, bytestring, case-insensitive
@@ -92374,8 +92789,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-simple";
-       version = "0.4.9.0";
-       sha256 = "0mb3ymw57w7zk2fz8g8m0fz1nhx52c21lxwk3nnkp9qqk26jslws";
+       version = "0.4.10.0";
+       sha256 = "0ar8rjd3fsk56ykf7ys3f14ld3771dknhvkfk08fq7054rilrir0";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-textual bytestring
          case-insensitive containers hashable postgresql-libpq scientific
@@ -92987,8 +93402,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-show";
-       version = "1.6.8";
-       sha256 = "0vfb712dvbb91659sch62d06vm0451b9l4l0hdwnlbhzjymmh2rs";
+       version = "1.6.8.2";
+       sha256 = "1s95nzjkmqb747s50i68c9s8p91cxgydzqkd2l5yjzdaygrvrhqv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -92997,7 +93412,7 @@ self: {
        buildTools = [ happy ];
        homepage = "http://wiki.github.com/yav/pretty-show";
        description = "Tools for working with derived `Show` instances and generic inspection of values";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "pretty-sop" = callPackage
@@ -98325,8 +98740,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-core";
-       version = "0.35";
-       sha256 = "1ykfni3jn31hgk2s1028r6am3bnf3nwndkd39in70q9sjjzmfr25";
+       version = "0.35.1";
+       sha256 = "16mzvbkv69i0kabjj214166rmsqqc0ga5ad1i7yhm6202s11fx4n";
        buildDepends = [
          aeson aeson-utils base bytestring case-insensitive either errors
          fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart
@@ -98346,20 +98761,20 @@ self: {
     ({ mkDerivation, aeson, base, containers, filepath, generic-aeson
      , hxt, json-schema, mtl, regular, regular-xmlpickler, rest-core
      , rest-gen, safe, stm, text, time, transformers, transformers-base
-     , unordered-containers
+     , transformers-compat, unordered-containers
      }:
      mkDerivation {
        pname = "rest-example";
-       version = "0.1.2.2";
-       sha256 = "0xhdk792zncqljlhvr4f04sy2mwf6j9aq2cg74ci35sjfg3bp42x";
+       version = "0.2.0.0";
+       sha256 = "1442hi8av2vlbzr1ffjfn32plxs0i60bb0g0fnjrprjmcii7dzd5";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson base containers filepath generic-aeson hxt json-schema mtl
          regular regular-xmlpickler rest-core rest-gen safe stm text time
-         transformers transformers-base unordered-containers
+         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;
@@ -98447,8 +98862,8 @@ self: {
      }:
      mkDerivation {
        pname = "rest-types";
-       version = "1.13";
-       sha256 = "0z8wvg9w4am3y5dy5nmabz4ngpks3abrg5gibwcq56x8h8rf8405";
+       version = "1.13.1";
+       sha256 = "09lyx0a4w1mp1ivcky3wnlhisp2a8sd3f37zcr5ckxi8sjmcvsli";
        buildDepends = [
          aeson base case-insensitive generic-aeson hxt json-schema mtl
          regular regular-xmlpickler rest-stringmap text transformers
@@ -98614,14 +99029,13 @@ self: {
      }:
      mkDerivation {
        pname = "retry";
-       version = "0.5.1";
-       sha256 = "1k5qv7c960dayhddvra1gpy1zv90rdjcrzpg8nzar9bpcxapczvj";
+       version = "0.6";
+       sha256 = "1ry2zqs5361mg5ibnd6awjpl3nl3a6ha18m0v2f28hs9kw6dnsgj";
        buildDepends = [ base data-default-class exceptions transformers ];
        testDepends = [
          base data-default-class exceptions hspec HUnit QuickCheck time
          transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/Soostone/retry";
        description = "Retry combinators for monadic actions that may fail";
        license = stdenv.lib.licenses.bsd3;
@@ -98683,8 +99097,8 @@ self: {
      }:
      mkDerivation {
        pname = "reverse-geocoding";
-       version = "0.1.1.1";
-       sha256 = "05a6s6ax047b8mg73b9zs4qv33qnmlhk87a8lxnd8xx2gba9vxcb";
+       version = "0.2.1";
+       sha256 = "089p1fv1ghznfsnhw1bdnwna3hcxmmqakw2qgzg91w5gifzaf18s";
        buildDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
@@ -100465,8 +100879,8 @@ self: {
      }:
      mkDerivation {
        pname = "satchmo";
-       version = "2.8.2";
-       sha256 = "1c0p5prhrm05km9sym62nyxacipdy2yib84yw6d869dh3kbd97kq";
+       version = "2.9.2";
+       sha256 = "0dc5bmwv19jxv6wqkhy3mc2fdawl53c3y0cyy0zyh4zb30iwkpi5";
        buildDepends = [
          array base bytestring containers directory minisat mtl process
        ];
@@ -100548,6 +100962,7 @@ self: {
        version = "0.2.0.0";
        sha256 = "10prfalf8gic4p5sj35svnypzdgn69f6vwbj9dh55bcq70gqqgn2";
        buildDepends = [ array base containers satchmo toysolver ];
+       jailbreak = true;
        homepage = "https://github.com/msakai/satchmo-toysat";
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
@@ -102209,8 +102624,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.2.1";
-       sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x";
+       version = "0.2.2";
+       sha256 = "1pblmnarq1939d2krwbmd9ssm68ar9ip54dl28zjv2j51vhhhzhc";
        buildDepends = [
          base parsec string-conversions template-haskell text
        ];
@@ -102224,18 +102639,18 @@ self: {
 
   "servant-client" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
-     , either, exceptions, hspec, http-client, http-types, network
-     , network-uri, QuickCheck, safe, servant, servant-server
-     , string-conversions, text, transformers, wai, warp
+     , either, exceptions, hspec, http-client, http-client-tls
+     , http-types, network, network-uri, QuickCheck, safe, servant
+     , servant-server, string-conversions, text, transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.2.1";
-       sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn";
+       version = "0.2.2";
+       sha256 = "0b96aglic4aawdcpaxyv9k807kjfrr0a9kniqgj5nfcpgwglnp5r";
        buildDepends = [
          aeson attoparsec base bytestring either exceptions http-client
-         http-types network-uri safe servant string-conversions text
-         transformers
+         http-client-tls http-types network-uri safe servant
+         string-conversions text transformers
        ];
        testDepends = [
          aeson base bytestring deepseq either hspec http-types network
@@ -102253,8 +102668,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.3";
-       sha256 = "0frwzd90yjvrwkgbwhr4vf1cr0ndzsp56hi2lp3np8axmha4q1fr";
+       version = "0.3.1";
+       sha256 = "1xbwi5ix5yanrcldc97dwim7s358g7hbr5pwk3r6azknwjzf5fd4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -102372,8 +102787,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.2.3";
-       sha256 = "0n4r145jd1g07g0a1mhbc7s61h6cbbvjvhzwngff756iky7fkcb9";
+       version = "0.2.4";
+       sha256 = "11bds7zhkvqg9w27kb0dd792qvz8gjgkmkpbnijvwwzah5gmipi0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -102886,6 +103301,30 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "shake-minify" = callPackage
+    ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }:
+     mkDerivation {
+       pname = "shake-minify";
+       version = "0.1.1";
+       sha256 = "0jg7mzgmi15ig1xwkw8mn593h9246k0higy7hlmlzh4qx4pz0w9v";
+       buildDepends = [ base bytestring css-text hjsmin shake text ];
+       homepage = "https://github.com/LukeHoersten/shake-minify";
+       description = "Shake Minify Rules";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shake-pack" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib, shake, tar }:
+     mkDerivation {
+       pname = "shake-pack";
+       version = "0.1.0";
+       sha256 = "158xjn4lzcj8gk4b9z4rhql7mqdp7v5x8rpc0sb3mlws2drr8yh0";
+       buildDepends = [ base bytestring bzlib shake tar ];
+       homepage = "https://github.com/LukeHoersten/shake-pack";
+       description = "Shake File Pack Actions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shaker" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, haskeline, haskell-src, HUnit, mtl
@@ -103099,8 +103538,8 @@ self: {
      }:
      mkDerivation {
        pname = "shell-conduit";
-       version = "4.5.1";
-       sha256 = "048808f4kszb0x24yh7njkbygxl2jn2aadizcssh6rajpbj4zzlj";
+       version = "4.5.2";
+       sha256 = "04kc9gzlqbw3d2pj6qn13pnmmrlmx8nmmj5bvxn7zdmh25nw6ys2";
        buildDepends = [
          async base bytestring conduit conduit-extra control-monad-loop
          directory filepath monad-control monads-tf process resourcet
@@ -103211,8 +103650,8 @@ self: {
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.6.1.1";
-       sha256 = "1yv29fjyxfqykg7l8r4la1j4kz3ixmklhw15ki2b9dgwsp7vzmfh";
+       version = "1.6.1.2";
+       sha256 = "0iv0ypl6qbrcax43smqc7s5zpm5ck5a5zby59ibnahv5a6wn16ki";
        buildDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
@@ -104488,6 +104927,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "slack-notify-haskell" = callPackage
+    ({ mkDerivation, base, bytestring, containers, HTTP, http-client
+     , http-client-tls, network, text
+     }:
+     mkDerivation {
+       pname = "slack-notify-haskell";
+       version = "0.2.3";
+       sha256 = "0sz05v40b78qdpz8cqpnblhjy4dxqsz5175hq5083j7iv3xi3kc7";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring containers HTTP http-client http-client-tls network
+         text
+       ];
+       homepage = "https://github.com/tattsun/slack-notify-haskell";
+       description = "Slack notifier for Haskell project";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "slave-thread" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
@@ -108900,6 +109358,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "string-conv" = callPackage
+    ({ mkDerivation, base, bytestring, text }:
+     mkDerivation {
+       pname = "string-conv";
+       version = "0.1";
+       sha256 = "0zjmlkjmdiqnfnb9qqam6bkipwqz5iwy4bjy9xcs20ljf01586l6";
+       buildDepends = [ base bytestring text ];
+       description = "Standardized conversion between string types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "string-conversions" = callPackage
     ({ mkDerivation, base, bytestring, text, utf8-string }:
      mkDerivation {
@@ -109079,17 +109548,17 @@ self: {
      }:
      mkDerivation {
        pname = "stripe-haskell";
-       version = "0.1.1.0";
-       sha256 = "0ys54lwbqk8dv5pslw2krd1bdh8giwr54nwq1vq35lqijgm6ywvz";
+       version = "0.1.3.0";
+       sha256 = "0crh5kmb3bql0ba8srs58hn68q6cl9iaxy2p4phmwzw4xzganawq";
        buildDepends = [
          aeson base bytestring either HsOpenSSL http-streams io-streams mtl
-         text time transformers unordered-containers
+         random text time transformers unordered-containers
        ];
        testDepends = [
-         aeson base bytestring either HsOpenSSL hspec random text time
-         transformers
+         aeson base bytestring either HsOpenSSL hspec http-streams random
+         text time transformers
        ];
-       homepage = "https://github.com/dmjio/stripe-haskell";
+       homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109102,8 +109571,8 @@ self: {
      }:
      mkDerivation {
        pname = "strive";
-       version = "0.7.1";
-       sha256 = "1s2rbmkalrnyqfahrp5vibgdzykzanxk9g9hh9qzv8ap3j6yfi7l";
+       version = "0.8.0";
+       sha256 = "0n9j3mpknmqm2y4psbg2yjrs6ddgw5j3ha26aq2mxqb9cz1kb29z";
        buildDepends = [
          aeson base bytestring data-default gpolyline http-conduit
          http-types template-haskell text time transformers
@@ -110354,8 +110823,8 @@ self: {
      }:
      mkDerivation {
        pname = "system-canonicalpath";
-       version = "0.3.1.0";
-       sha256 = "1ziv64rdydx0kg1wip3mskwaj35la1h94017dy5hnn2hj4g8fh3j";
+       version = "0.3.2.0";
+       sha256 = "031m5j7xglxdgp3rkgf2v37jya1a3hhjp3mxbfyyjl27wv7pzhjy";
        buildDepends = [
          base basic-prelude directory system-filepath text
        ];
@@ -110386,9 +110855,8 @@ self: {
      }:
      mkDerivation {
        pname = "system-fileio";
-       version = "0.3.16";
-       sha256 = "1x18ffhas6bhjis0glf0xd6ap8vy7cap8lkmnkn4px83d82yzi8k";
-       editedCabalFile = "27687f6a2383c74296863a8593ee788f1310d0795a5a110f4bdf80bb74e6d23f";
+       version = "0.3.16.1";
+       sha256 = "037p2i5gmcnw3qqh3yhn700w51kkyc7rpw9c77wlgdq5bgbyfkbk";
        buildDepends = [ base bytestring system-filepath text time unix ];
        testDepends = [
          base bytestring chell system-filepath temporary text time
@@ -110722,8 +111190,8 @@ self: {
     ({ mkDerivation, base, csv, html, mtl }:
      mkDerivation {
        pname = "tabular";
-       version = "0.2.2.6";
-       sha256 = "0biqi0cypzwf7s15an7njklxk7j0psfk13ii9w72vpv5vmvf1acf";
+       version = "0.2.2.7";
+       sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k";
        buildDepends = [ base csv html mtl ];
        homepage = "http://hub.darcs.net/kowey/tabular";
        description = "Two-dimensional data tables with rendering functions";
@@ -110915,8 +111383,8 @@ self: {
      }:
      mkDerivation {
        pname = "taggy";
-       version = "0.1.3";
-       sha256 = "18azsibsfjz4zj69dk4a3jrdw6zvd8n1gsd1ynd2hy7i9z168iw8";
+       version = "0.1.4";
+       sha256 = "1fanngprqscpjczqi7v0h5s6qd52y3vj11jv1fasp4hwj6gx92f7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -110950,21 +111418,20 @@ self: {
      }) {};
 
   "taglib" = callPackage
-    ({ mkDerivation, base, bytestring, tag_c, taglib_c, utf8-string }:
+    ({ mkDerivation, base, bytestring, taglib, utf8-string }:
      mkDerivation {
        pname = "taglib";
        version = "0.1.1";
        sha256 = "16qyfy8rxaab0q9j2v00h4j5d3la95acfhmp32x1hdxz1rwr6zfp";
        buildDepends = [ base bytestring utf8-string ];
-       extraLibraries = [ tag_c ];
-       pkgconfigDepends = [ taglib_c ];
+       extraLibraries = [ taglib ];
+       pkgconfigDepends = [ taglib ];
        description = "Binding to TagLib (ID3 tag library)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { tag_c = null;  taglib_c = null;};
+     }) { inherit (pkgs) taglib;};
 
   "taglib-api" = callPackage
-    ({ mkDerivation, base, bytestring, containers, mtl, taglib_c, text
+    ({ mkDerivation, base, bytestring, containers, mtl, taglib, text
      , transformers
      }:
      mkDerivation {
@@ -110974,12 +111441,11 @@ self: {
        buildDepends = [
          base bytestring containers mtl text transformers
        ];
-       pkgconfigDepends = [ taglib_c ];
+       pkgconfigDepends = [ taglib ];
        jailbreak = true;
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { taglib_c = null;};
+     }) { inherit (pkgs) taglib;};
 
   "tagset-positional" = callPackage
     ({ mkDerivation, base, binary, containers, parsec, text
@@ -111509,23 +111975,23 @@ self: {
      }) {};
 
   "tasty-silver" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers, deepseq
-     , directory, filepath, mtl, optparse-applicative, process
-     , process-extras, tagged, tasty, tasty-hunit, temporary-rc, text
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , deepseq, directory, filepath, mtl, optparse-applicative, process
+     , process-extras, stm, tagged, tasty, tasty-hunit, temporary-rc
+     , text
      }:
      mkDerivation {
        pname = "tasty-silver";
-       version = "3.0.1.0";
-       sha256 = "18hai87p79kj0l7bhgb434ygl6lsqdwr3y6jvsvmyy2jylrz1q1z";
+       version = "3.0.2.2";
+       sha256 = "0pla52i547mjr06nm2d5y3bf4gnw89mgw3d2gic90v6c3daynk97";
        buildDepends = [
-         async base bytestring containers deepseq directory filepath mtl
-         optparse-applicative process process-extras tagged tasty
-         temporary-rc text
+         ansi-terminal async base bytestring containers deepseq directory
+         filepath mtl optparse-applicative process process-extras stm tagged
+         tasty temporary-rc text
        ];
        testDepends = [
          base directory filepath process tasty tasty-hunit temporary-rc
        ];
-       jailbreak = true;
        homepage = "https://github.com/phile314/tasty-silver";
        description = "Golden tests support for tasty. Fork of tasty-golden.";
        license = stdenv.lib.licenses.mit;
@@ -111703,6 +112169,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "teeth" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "teeth";
+       version = "0.1.0.0";
+       sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl";
+       editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416";
+       buildDepends = [ base ];
+       homepage = "https://github.com/expipiplus1/teeth";
+       description = "Dental data types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tellbot" = callPackage
     ({ mkDerivation, base, bifunctors, containers, errors, mtl, network
      , split, time, transformers
@@ -111757,12 +112236,12 @@ self: {
      }) {};
 
   "template-haskell-util" = callPackage
-    ({ mkDerivation, base, template-haskell }:
+    ({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "template-haskell-util";
-       version = "0.1.0.1";
-       sha256 = "085b9ybdihmns45pbwzalipmak6am83fsx61m2ik3a1y2y780910";
-       buildDepends = [ base template-haskell ];
+       version = "0.1.1.0";
+       sha256 = "032gkb6pgd5l8ih48971ckiy7spvvr6fcmjx4ysiyyaj7hra174f";
+       buildDepends = [ base GenericPretty ghc-prim template-haskell ];
        homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils";
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
@@ -112331,8 +112810,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-sandbox";
-       version = "0.1.1";
-       sha256 = "1prcw01kq8ifvl918i6a6cdy8zfb54sb7321advw4z0h83gd1bpd";
+       version = "0.1.2";
+       sha256 = "0zv9is4gapa06a3iyc505hzcydkia2dm6901m2y6jcav6rmykmk8";
        buildDepends = [
          base bytestring cereal containers data-default directory filepath
          lifted-base monad-control monad-loops mtl network process random
@@ -112580,15 +113059,15 @@ self: {
      }) {};
 
   "text-and-plots" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
-     , markdown, unordered-containers
+    ({ mkDerivation, base, blaze-html, bytestring, containers, markdown
+     , text, unordered-containers
      }:
      mkDerivation {
        pname = "text-and-plots";
-       version = "0.1.1.0";
-       sha256 = "1z395lps6js993by3pg4vi6g373r85j36g5akfqd9s0k6bz67wsm";
+       version = "0.2.0.0";
+       sha256 = "1wmb3myk1002qhnwsybca6mhzc36c7kxk4ykcnfqb9728x4jrcms";
        buildDepends = [
-         aeson base blaze-html bytestring containers markdown
+         base blaze-html bytestring containers markdown text
          unordered-containers
        ];
        homepage = "https://github.com/andersjel/haskell-text-and-plots";
@@ -113200,8 +113679,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-lift";
-       version = "0.7.1";
-       sha256 = "18a9iz56nkdwlqrrrq4dsafnrlcw7cf0pxadbl14sfjlma2ypdff";
+       version = "0.7.2";
+       sha256 = "0jl2x09mh9frsx5bccw8m4m3h72bncjaix9ylyfpvizisivj8p3m";
        buildDepends = [ base template-haskell ];
        testDepends = [ base template-haskell ];
        homepage = "http://github.com/mboes/th-lift";
@@ -114292,6 +114771,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timestamper" = callPackage
+    ({ mkDerivation, base, old-locale, time }:
+     mkDerivation {
+       pname = "timestamper";
+       version = "1.0";
+       sha256 = "14b9zg2lyd8lja9agy73vpscjbkv5nwk6h780wl0xk6m4md9vyj3";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base old-locale time ];
+       homepage = "https://github.com/kisom/timestamper";
+       description = "Read standard input and prepend each line with a timestamp";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "timezone-olson" = callPackage
     ({ mkDerivation, base, binary, bytestring, extensible-exceptions
      , time, timezone-series
@@ -114357,6 +114850,7 @@ self: {
          auto-update base bytestring containers double-conversion
          fast-logger text transformers unix-time
        ];
+       jailbreak = true;
        homepage = "https://github.com/twittner/tinylog/";
        description = "Simplistic logging using fast-logger";
        license = "unknown";
@@ -115378,6 +115872,7 @@ self: {
        pname = "trivial-constraint";
        version = "0.3.0.0";
        sha256 = "0fl72wai6yj5wflhx3cbvi3ixcfrc73217skncyb9b1ai7vg3x3y";
+       editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b";
        buildDepends = [ base ];
        homepage = "https://github.com/leftaroundabout/trivial-constraint";
        description = "Constraints that any type, resp. no type fulfills";
@@ -115687,8 +116182,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.0.1";
-       sha256 = "15y2shxmvhhy5cpnbkqj91b4x3hpbdr1vdkw41b4q6px49f67r1x";
+       version = "1.0.2";
+       sha256 = "1qff8qd46583d8pyh9ac11r91cnzgncpjlnpdw5kg81xxldjv1n8";
        buildDepends = [
          async base clock directory foldl managed process system-fileio
          system-filepath temporary text time transformers unix
@@ -116693,10 +117188,11 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "types-compat";
-       version = "0.1.0";
-       sha256 = "14szcqcff3zl7092qnrxgiyh1gbnkx7y557n491r3am42c79d90r";
+       version = "0.1.1";
+       sha256 = "1fl3ddsz9m0s0mnd7wq6lqkkmpq0dz83aisqgs1cpg91xlllghby";
+       editedCabalFile = "9d6a31178b383e430ec161d2329d9b52bcf164266f3064e66da53d865825fc96";
        buildDepends = [ base ];
-       homepage = "https://github.com/philopon/apiary";
+       homepage = "https://github.com/philopon/types-compat";
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120430,8 +120926,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.4.4";
-       sha256 = "1g5n7xa6pxnxjf0x2kfgl05gqygsnrk9x8y80dmb4cg4zga153vf";
+       version = "3.0.4.5";
+       sha256 = "1d139jid65qf64607m79b6z5d8al888krypfpwzc7gbl1mlhyna4";
        buildDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers data-default-class deepseq directory
@@ -120807,6 +121303,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-middleware-preprocessor" = callPackage
+    ({ mkDerivation, base, Cabal, directory, mtl, split, text, wai
+     , wai-middleware-static, warp
+     }:
+     mkDerivation {
+       pname = "wai-middleware-preprocessor";
+       version = "0.2.0.0";
+       sha256 = "1n9z00v5a75pas22cdm26hj888s6kc98bddh2gfs3ffrazdmgbj1";
+       buildDepends = [
+         base directory mtl split text wai wai-middleware-static
+       ];
+       testDepends = [
+         base Cabal directory mtl split text wai wai-middleware-static warp
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/taktoa/wai-middleware-preprocessor";
+       description = "WAI middleware for preprocessing static files";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "wai-middleware-route" = callPackage
     ({ mkDerivation, base, bytestring, http-types, HUnit
      , test-framework, test-framework-hunit, text, wai, wai-test
@@ -121677,8 +122193,8 @@ self: {
      }:
      mkDerivation {
        pname = "web-routing";
-       version = "0.5.0";
-       sha256 = "074yllv21djz9g3qh8wl1dn3riy0ax2i2z4c6wh8732c6pwbxygx";
+       version = "0.6.0";
+       sha256 = "0zs4znmg34d4q14v14h07k48921xan69wrp27xjza5kp6nmqy58w";
        buildDepends = [
          base bytestring primitive text types-compat unordered-containers
        ];
@@ -121899,6 +122415,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websnap" = callPackage
+    ({ mkDerivation, base, filepath, gtk, webkit }:
+     mkDerivation {
+       pname = "websnap";
+       version = "0.1.0.1";
+       sha256 = "05favr2lpc8y3qy7wahcriq8qhvzvr3ngvrgdyjcvf5bvyfwlp84";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base filepath gtk webkit ];
+       homepage = "https://github.com/jrb/websnap";
+       description = "Transforms URLs to PNGs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "websockets" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , blaze-builder, bytestring, case-insensitive, containers, entropy
@@ -123372,6 +123902,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xhb-atom-cache" = callPackage
+    ({ mkDerivation, base, hashable, mtl, transformers
+     , unordered-containers, xhb
+     }:
+     mkDerivation {
+       pname = "xhb-atom-cache";
+       version = "0.1.0.2";
+       sha256 = "113yff75i5pc0kcz4w7npbp34bl92aibpvj2cgg30f66nml61xg9";
+       buildDepends = [
+         base hashable mtl transformers unordered-containers xhb
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/jotrk/xhb-atom-cache/";
+       description = "Atom cache for XHB";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "xhb-ewmh" = callPackage
+    ({ mkDerivation, base, binary, bytestring, dlist, hashable, mtl
+     , transformers, xhb, xhb-atom-cache
+     }:
+     mkDerivation {
+       pname = "xhb-ewmh";
+       version = "0.1.3.1";
+       sha256 = "02qfpwa9558svk0481dxjchr9h0phacsyqzail94kmzkhnnly64l";
+       buildDepends = [
+         base binary bytestring dlist hashable mtl transformers xhb
+         xhb-atom-cache
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/jotrk/xhb-ewmh/";
+       description = "EWMH utilities for XHB";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "xhtml_3000_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -123891,8 +124456,8 @@ self: {
     ({ mkDerivation, base, directory, process, tagsoup, text }:
      mkDerivation {
        pname = "xml-to-json-fast";
-       version = "1.0.0";
-       sha256 = "0kd5civ3rv2b1c1xfb985fri2q5arnj80qydazcp4h3vvf301gmh";
+       version = "1.0.1";
+       sha256 = "1gp32adky7pjspppkzz01rj3lpl2b8fvaqf7fg3j0p3cmlbhap7m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory process tagsoup text ];
@@ -124352,8 +124917,8 @@ self: {
      }:
      mkDerivation {
        pname = "xournal-parser";
-       version = "0.5.0.3";
-       sha256 = "1r99xv7w2gxms1ff5qpj36dcb3gb5lpccr1mjjdnkcij81i748ly";
+       version = "0.5.1";
+       sha256 = "07b1gflqsjsydn304vw6zwgwlc0g7riv0b80lr165mw6c2fkmx78";
        buildDepends = [
          attoparsec attoparsec-conduit base bytestring conduit conduit-extra
          containers exceptions lens mtl strict text transformers xml-conduit
@@ -124389,8 +124954,8 @@ self: {
      }:
      mkDerivation {
        pname = "xournal-types";
-       version = "0.5.0.2";
-       sha256 = "1z1zxgwnd2bpgmiimil2jnz4xdcvvi59y2qdvqgy42b10db8rvkm";
+       version = "0.5.1";
+       sha256 = "1ii4d560wvy6iky09wbz2kdf370y87ldgr0ymsv50d7cqxfgbjap";
        buildDepends = [
          base bytestring cereal containers lens strict TypeCompose
        ];
@@ -124576,8 +125141,8 @@ self: {
      }:
      mkDerivation {
        pname = "yackage";
-       version = "0.7.0.6";
-       sha256 = "0c0wln31415xvnjd4bn9bqxl190a9yc3ifypif4fab2m7dkd27ly";
+       version = "0.7.0.7";
+       sha256 = "168dcl2ham94k0wmf75lgazn6q82yfww5lpl24nhmdr3fwd4p6p1";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -125342,9 +125907,9 @@ self: {
     ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
      , bytestring, Cabal, conduit, conduit-extra, containers
      , data-default-class, directory, file-embed, filepath, fsnotify
-     , ghc, ghc-paths, http-conduit, http-reverse-proxy, http-types
-     , lifted-base, network, optparse-applicative, parsec, process
-     , project-template, resourcet, shakespeare, split
+     , ghc, ghc-paths, http-client, http-conduit, http-reverse-proxy
+     , http-types, lifted-base, network, optparse-applicative, parsec
+     , process, project-template, resourcet, shakespeare, split
      , streaming-commons, system-fileio, system-filepath, tar
      , template-haskell, text, time, transformers, transformers-compat
      , unix-compat, unordered-containers, wai, wai-extra, warp, yaml
@@ -125352,14 +125917,14 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.3.10";
-       sha256 = "0x8bjqvi46fp870cpfdpmy141axyhk3jcsvswza6j4w2mkg7iarf";
+       version = "1.4.3.11";
+       sha256 = "1lj8fr659xnpcg6sipd3d03jpxibskdg9s63m0056173z49y2v7c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          attoparsec base base64-bytestring blaze-builder bytestring Cabal
          conduit conduit-extra containers data-default-class directory
-         file-embed filepath fsnotify ghc ghc-paths http-conduit
+         file-embed filepath fsnotify ghc ghc-paths http-client http-conduit
          http-reverse-proxy http-types lifted-base network
          optparse-applicative parsec process project-template resourcet
          shakespeare split streaming-commons system-fileio system-filepath
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix
index f90e756030f..ea4e141b8fe 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix
@@ -246,67 +246,94 @@ let
       (map mkBuildFlags
         (lib.filter needsBuildFlags (attrValues instantiated)));
 
-in
+  derivation = stdenv.mkDerivation {
+    inherit name;
 
-stdenv.mkDerivation {
-  inherit name;
+    buildInputs = [
+      ruby
+      bundler
+      git
+    ];
 
-  buildInputs = [
-    ruby
-    bundler
-    git
-  ];
+    phases = [ "installPhase" "fixupPhase" ];
 
-  phases = [ "installPhase" "fixupPhase" ];
+    outputs = [
+      "out"    # the installed libs/bins
+      "bundle" # supporting files for bundler
+    ];
 
-  outputs = [
-    "out"    # the installed libs/bins
-    "bundle" # supporting files for bundler
-  ];
+    installPhase = ''
+      mkdir -p $bundle
+      export BUNDLE_GEMFILE=$bundle/Gemfile
+      cp ${gemfile} $BUNDLE_GEMFILE
+      cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock
 
-  installPhase = ''
-    mkdir -p $bundle
-    export BUNDLE_GEMFILE=$bundle/Gemfile
-    cp ${gemfile} $BUNDLE_GEMFILE
-    cp ${purifiedLockfile} $BUNDLE_GEMFILE.lock
+      export NIX_GEM_SOURCES=${sources}
+      export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath}
 
-    export NIX_GEM_SOURCES=${sources}
-    export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath}
+      export GEM_HOME=$out/${ruby.gemPath}
+      export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME
+      mkdir -p $GEM_HOME
 
-    export GEM_HOME=$out/${ruby.gemPath}
-    export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME
-    mkdir -p $GEM_HOME
+      ${allBuildFlags}
 
-    ${allBuildFlags}
+      mkdir gems
+      cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems
+      ${copyGems}
 
-    mkdir gems
-    cp ${bundler}/${bundler.ruby.gemPath}/cache/bundler-*.gem gems
-    ${copyGems}
+      ${lib.optionalString (!documentation) ''
+        mkdir home
+        HOME="$(pwd -P)/home"
+        echo "gem: --no-rdoc --no-ri" > $HOME/.gemrc
+      ''}
 
-    ${lib.optionalString (!documentation) ''
-      mkdir home
-      HOME="$(pwd -P)/home"
-      echo "gem: --no-rdoc --no-ri" > $HOME/.gemrc
-    ''}
+      mkdir env
+      ${runPreInstallers}
 
-    mkdir env
-    ${runPreInstallers}
+      mkdir $out/bin
+      cp ${./monkey_patches.rb} monkey_patches.rb
+      export RUBYOPT="-rmonkey_patches.rb -I $(pwd -P)"
+      bundler install --frozen --binstubs ${lib.optionalString enableParallelBuilding "--jobs $NIX_BUILD_CORES"}
+      RUBYOPT=""
 
-    mkdir $out/bin
-    cp ${./monkey_patches.rb} monkey_patches.rb
-    export RUBYOPT="-rmonkey_patches.rb -I $(pwd -P)"
-    bundler install --frozen --binstubs ${lib.optionalString enableParallelBuilding "--jobs $NIX_BUILD_CORES"}
-    RUBYOPT=""
+      runHook postInstall
+    '';
 
-    runHook postInstall
-  '';
+    inherit postInstall;
 
-  inherit postInstall;
+    passthru = {
+      inherit ruby;
+      inherit bundler;
 
-  passthru = {
-    inherit ruby;
-    inherit bundler;
+      env = let
+        irbrc = builtins.toFile "irbrc" ''
+          if not ENV["OLD_IRBRC"].empty?
+            require ENV["OLD_IRBRC"]
+          end
+          require 'rubygems'
+          require 'bundler/setup'
+        '';
+        in stdenv.mkDerivation {
+          name = "interactive-${name}-environment";
+          nativeBuildInputs = [ ruby derivation ];
+          shellHook = ''
+            export BUNDLE_GEMFILE=${derivation.bundle}/Gemfile
+            export GEM_HOME=${derivation}/${ruby.gemPath}
+            export NIX_BUNDLER_GEMPATH=${bundler}/${ruby.gemPath}
+            export GEM_PATH=$NIX_BUNDLER_GEMPATH:$GEM_HOME
+            export OLD_IRBRC="$IRBRC"
+            export IRBRC=${irbrc}
+          '';
+          buildCommand = ''
+            echo >&2 ""
+            echo >&2 "*** Ruby 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+            echo >&2 ""
+            exit 1
+          '';
+        };
+    };
+
+    inherit meta;
   };
 
-  inherit meta;
-}
+in derivation
diff --git a/pkgs/development/libraries/kdevplatform/default.nix b/pkgs/development/libraries/kdevplatform/default.nix
index 49598cfae68..8b7d73462c2 100644
--- a/pkgs/development/libraries/kdevplatform/default.nix
+++ b/pkgs/development/libraries/kdevplatform/default.nix
@@ -2,11 +2,11 @@
   gettext, pkgconfig, apr, aprutil, boost, qjson, grantlee }:
 
 stdenv.mkDerivation rec {
-  name = "kdevplatform-1.7.0";
+  name = "kdevplatform-1.7.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/4.7.0/src/${name}.tar.xz";
-    sha256 = "bfd765019511c5c9abc19bc412c75d7abd468f1a077ce4bc471cd6704b9f53f7";
+    url = "mirror://kde/stable/kdevelop/4.7.1/src/${name}.tar.xz";
+    sha256 = "dfd8953aec204f04bd949443781aa0f6d9d58c40f73027619a168bb4ffc4b1ac";
   };
 
   propagatedBuildInputs = [ kdelibs qt4 phonon ];
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index c9dd28cd396..aeea290bdb2 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -50,4 +50,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
   };
+
+  passthru.implementation = "heimdal";
 }
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index d4e4a59ec5f..74d26d2fa03 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -34,4 +34,6 @@ stdenv.mkDerivation (rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
+
+  passthru.implementation = "krb5";
 })
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index cdcba4756aa..a1f6716009e 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -21,14 +21,13 @@ stdenv.mkDerivation rec {
 
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 
-  postInstall =
-    # Install headers in the right place.
-    '' ln -s${if stdenv.isBSD then "" else "r"}v "$out/lib/"libffi*/include "$out/include"
-    '';
+  # Install headers in the right place.
+  postInstall = ''
+    ln -s${if (stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) then "" else "r"}v "$out/lib/"libffi*/include "$out/include"
+  '';
 
   meta = {
     description = "A foreign function call interface library";
-
     longDescription = ''
       The libffi library provides a portable, high level programming
       interface to various calling conventions.  This allows a
@@ -43,12 +42,9 @@ stdenv.mkDerivation rec {
       interface.  A layer must exist above libffi that handles type
       conversions for values passed between the two languages.
     '';
-
     homepage = http://sourceware.org/libffi/;
-
     # See http://github.com/atgreen/libffi/blob/master/LICENSE .
     license = stdenv.lib.licenses.free;
-
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/libsoup/bad-symbol.patch b/pkgs/development/libraries/libsoup/bad-symbol.patch
new file mode 100644
index 00000000000..df1b0af0c69
--- /dev/null
+++ b/pkgs/development/libraries/libsoup/bad-symbol.patch
@@ -0,0 +1,10 @@
+--- a/libsoup/libsoup-2.4.sym 2014-10-29 22:37:54 -0700
++++ b/libsoup/libsoup-2.4.sym 2014-06-18 07:42:51 -0700
+@@ -348,7 +348,6 @@
+ soup_server_get_async_context
+ soup_server_get_listener
+ soup_server_get_listeners
+-soup_server_get_gsocket
+ soup_server_get_port
+ soup_server_get_type
+ soup_server_get_uris
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 7f655d27491..82629ca3c6f 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -16,6 +16,7 @@ stdenv.mkDerivation {
 
   patchPhase = ''
     patchShebangs libsoup/
+    patch -p1 < ${./bad-symbol.patch}
   '';
 
   buildInputs = libintlOrEmpty ++ [ intltool python sqlite ];
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
new file mode 100644
index 00000000000..6b4a24d71e5
--- /dev/null
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "nss_wrapper-1.0.3";
+
+  src = fetchgit {
+    url = "git://git.samba.org/nss_wrapper.git";
+    rev = "refs/tags/${name}";
+    sha256 = "1jka6d873vhvfr7k378xvgxmbpka87w33iq6b91ynwg36pz53ifw";
+  };
+
+  buildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "a wrapper for the user, group and hosts NSS API";
+    homepage = https://git.samba.org/?p=nss_wrapper.git;a=summary;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix
index a0f7f88e8dc..aafdd60e415 100644
--- a/pkgs/development/libraries/openct/default.nix
+++ b/pkgs/development/libraries/openct/default.nix
@@ -1,21 +1,41 @@
-{stdenv, fetchurl, libtool, pcsclite, libusb, pkgconfig}:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb
+, doxygen, libxslt
+}:
 
 stdenv.mkDerivation rec {
-  name = "openct-0.6.19";
+  name = "openct-${version}";
+  version = "0.6.20";
   
-  src = fetchurl {
-    url = "http://www.opensc-project.org/files/openct/${name}.tar.gz";
-    sha256 = "1y4jlr877g3lziq7i3p6pdkscqpkn1lld874q6r2hsvc39n7c88z";
+  src = fetchFromGitHub {
+    owner = "OpenSC";
+    repo = "openct";
+    rev = name;
+    sha256 = "09wxq0jxdxhci3zr7jd3zcxjkl3j0r1v00k3q8gqrg9gighh8nk2";
   };
-  
-  configureFlags = [ "--enable-usb" "--enable-pcsc" "--localstatedir=/var" ];
-  buildInputs = [ libtool pcsclite libusb pkgconfig ];
 
-  meta = {
-    homepage = http://www.opensc-project.org/openct/;
-    license = "LGPL";
+  postPatch = ''
+    sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am
+  '';
+  
+  configureFlags = [
+    "--enable-api-doc"
+    "--enable-usb"
+    "--enable-pcsc"
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+  ];
+
+  buildInputs = [ autoreconfHook pkgconfig pcsclite libusb doxygen libxslt ];
+
+  preInstall = ''
+    mkdir -p $out/etc
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/OpenSC/openct/;
+    license = licenses.lgpl21;
     description = "Drivers for several smart card readers";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with maintainers; [ viric wkennington ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
new file mode 100644
index 00000000000..391b3c574eb
--- /dev/null
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "socket_wrapper-1.1.3";
+
+  src = fetchgit {
+    url = "git://git.samba.org/socket_wrapper.git";
+    rev = "refs/tags/${name}";
+    sha256 = "0b3sfjy7418gg52qkdblfi5x57g4m44n7434xhacz9isyl5m52vn";
+  };
+
+  buildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "a library passing all socket communications through unix sockets";
+    homepage = https://git.samba.org/?p=socket_wrapper.git;a=summary;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index 833fd69aa9c..db863d951a6 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.22";
+  name = "tevent-0.9.24";
 
   src = fetchurl {
     url = "mirror://samba/tevent/${name}.tar.gz";
-    sha256 = "0myyi3lwsi6f3f0a5qw8rjpm2d5yf18pw4vljdwyi885l411sksl";
+    sha256 = "0l1zjx2z6nhvn6gwbcvzn8w0cca53j717fwi10s7a5v1jb04rfad";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
new file mode 100644
index 00000000000..fa8e29e4098
--- /dev/null
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, cmake, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "uid_wrapper-1.1.0";
+
+  src = fetchgit {
+    url = "git://git.samba.org/uid_wrapper.git";
+    rev = "refs/tags/${name}";
+    sha256 = "1wb71lliw56pmks3vm9m3ndf8hqnyw9iyppy1nyl80msi4ssq5jj";
+  };
+
+  buildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "a wrapper for the user, group and hosts NSS API";
+    homepage = https://git.samba.org/?p=uid_wrapper.git;a=summary;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ wkennington ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix
index 4f7ed6e9e8e..241aaeb0e81 100644
--- a/pkgs/development/mobile/androidenv/addons.nix
+++ b/pkgs/development/mobile/androidenv/addons.nix
@@ -217,6 +217,30 @@ in
         
       };
     };
-    
+  
+  android_support_extra = buildGoogleApis {
+    name = "android_support_extra";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/support_r20.zip;
+      sha1 = "719c260dc3eb950712988f987daaf91afa9e36af";
+    };
+    meta = {
+      description = "Android Support Library";
+      url = http://developer.android.com/;
+    };
+  };
+  google_play_services = buildGoogleApis {
+    name = "google_play_services";
+    src = fetchurl {
+      url = https://dl-ssl.google.com/android/repository/google_play_services_3265130_r12.zip;
+      sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9";
+    };
+    meta = {
+      description = "Google Play services client library and sample code";
+      url = http://developer.android.com/;
+    };
+  };
+
+  
 }
-  
\ No newline at end of file
+  
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
new file mode 100644
index 00000000000..5e04bbf0116
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -0,0 +1,80 @@
+{ stdenv, fetchurl, zlib, ncurses, lib, makeWrapper
+, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
+, platformTools
+}:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+  name = "android-ndk-r8e";
+
+  src = if stdenv.system == "i686-linux"
+    then fetchurl {
+      url = "http://dl.google.com/android/ndk/${name}-linux-x86.tar.bz2";
+      sha256 = "c2c4e0c8b3037149a0f5dbb08d72f814a52af4da9fff9d80328c675457e95a98";
+    }
+    else if stdenv.system == "x86_64-linux" then fetchurl {
+      url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.tar.bz2";
+      sha256 = "093gf55zbh38p2gk5bdykj1vg9p5l774wjdzw5mhk4144jm1wdq7";
+    }
+    else throw "platform ${stdenv.system} not supported!";
+
+  phases = "buildPhase";
+
+  buildInputs = [ makeWrapper ];
+
+  buildCommand = let
+    bin_path = "$out/bin";
+    pkg_path = "$out/libexec/${name}";
+    sed_script_1 =
+      "'s|^PROGDIR=`dirname $0`" +
+      "|PROGDIR=`dirname $(readlink -f $(which $0))`|'";
+    sed_script_2 =
+      "'s|^MYNDKDIR=`dirname $0`" +
+      "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'";
+    runtime_paths = (lib.makeSearchPath "bin" [
+      coreutils file findutils
+      gawk gnugrep gnused
+      jdk
+      which
+    ]) + ":${platformTools}/platform-tools";
+  in ''
+    set -x
+    mkdir -pv $out/libexec
+    cd $out/libexec
+    tar -xjf $src
+
+    # so that it doesn't fail because of read-only permissions set
+    cd -
+    patch -p1 \
+        --no-backup-if-mismatch \
+        -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
+    cd ${pkg_path}
+
+    find $out \( \
+        \( -type f -a -name "*.so*" \) -o \
+        \( -type f -a -perm /0100 \) \
+        \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \
+                          --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
+    # fix ineffective PROGDIR / MYNDKDIR determination
+    for i in ndk-build ndk-gdb ndk-gdb-py
+    do
+        sed -i -e ${sed_script_1} $i
+    done
+    sed -i -e ${sed_script_2} ndk-which
+    # a bash script
+    patchShebangs ndk-which
+    # make some executables available in PATH
+    mkdir -pv ${bin_path}
+    for i in \
+        ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which
+    do
+        ln -sf ${pkg_path}/$i ${bin_path}/$i
+    done
+    # wrap
+    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
+    do
+        wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}"
+    done
+  '';
+}
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index 7c854d052d6..f4c3448c921 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -5,7 +5,7 @@
 , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib
 , freetype, fontconfig, glib, gtk, atk, file, jdk
 }:
-{platformVersions, abiVersions, useGoogleAPIs}:
+{platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs?false, useGooglePlayServices?false}:
 
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
@@ -134,6 +134,18 @@ stdenv.mkDerivation rec {
 
     ln -s ${supportRepository}/m2repository
 
+    ${if useExtraSupportLibs then
+       "ln -s ${addons.android_support_extra}/support ."
+     else ""}
+
+    cd ..
+    mkdir -p google
+    cd google
+
+    ${if useGooglePlayServices then
+       "ln -s ${addons.google_play_services}/google-play-services google_play_services"
+     else ""}
+      
     cd ../..
 
     # Symlink required platforms
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 513b0763446..e99ab93b7ae 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -134,11 +134,26 @@ rec {
     useGoogleAPIs = true;
   };
 
+  androidsdk_5_0_1_extras = androidsdk {
+    platformVersions = [ "21" ];
+    abiVersions = [ "armeabi-v7a" "x86" ];
+    useGoogleAPIs = true;
+    useExtraSupportLibs = true;
+    useGooglePlayServices = true;
+  };
+
   androidndk = import ./androidndk.nix {
     inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper;
     inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
   };
+
+  androidndk_r8e = import ./androidndk_r8e.nix {
+    inherit (pkgs) stdenv fetchurl zlib ncurses lib makeWrapper;
+    inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which;
+    inherit platformTools;
+  };
+
   
   buildApp = import ./build-app.nix {
     inherit (pkgs) stdenv jdk ant gnumake gawk file which;
diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch
new file mode 100644
index 00000000000..4a9f9a4a9dd
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r8e.patch
@@ -0,0 +1,13 @@
+diff -ru android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh android-ndk-r8e/build/tools/make-standalone-toolchain.sh
+--- android-ndk-r8e.old/build/tools/make-standalone-toolchain.sh	2014-10-16 03:46:32.000000000 +0200
++++ android-ndk-r8e/build/tools/make-standalone-toolchain.sh	2014-10-24 23:46:22.544928306 +0200
+@@ -194,6 +194,9 @@
+ # Now copy the GCC toolchain prebuilt binaries
+ run copy_directory "$TOOLCHAIN_PATH" "$TMPDIR"
+ 
++# Making it writable again
++chmod -R +w "$TMPDIR"
++
+ if [ -n "$LLVM_VERSION" ]; then
+   # Copy the clang/llvm toolchain prebuilt binaries
+   run copy_directory "$LLVM_TOOLCHAIN_PATH" "$TMPDIR"
diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix
new file mode 100644
index 00000000000..f7e4513d826
--- /dev/null
+++ b/pkgs/development/ocaml-modules/base64/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchzip, ocaml, findlib }:
+
+let version = "2.0.0"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-base64-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/ocaml-base64/archive/v${version}.tar.gz";
+    sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/mirage/ocaml-base64;
+    platforms = ocaml.meta.platforms;
+    description = "Base64 encoding and decoding in OCaml";
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix
new file mode 100644
index 00000000000..8c3c4275837
--- /dev/null
+++ b/pkgs/development/ocaml-modules/fileutils/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, ocaml, findlib }:
+
+stdenv.mkDerivation {
+  name = "ocaml-fileutils-0.4.5";
+
+  src = fetchurl {
+    url = https://forge.ocamlcore.org/frs/download.php/1194/ocaml-fileutils-0.4.5.tar.gz;
+    sha256 = "0rlqmcgjrfjihjgw5cfmack169cag8054gh5yrqph15av3lx5cra";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/;
+    platforms = ocaml.meta.platforms;
+    description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+  };
+}
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 2418192e5fb..d8db5b41696 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -11,12 +11,12 @@ ABCoptim = derive { name="ABCoptim"; version="0.13.11"; sha256="1j2pbfl5g9x71gq9
 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.7.0"; sha256="137xp69adhggz1wxzm5r95vcphrlrqpxsrz0gny59isx4xr28aal"; depends=[aroma_affymetrix MASS R_methodsS3 R_oo R_utils matrixStats R_filesets]; };
+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]; };
 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=[]; };
-AER = derive { name="AER"; version="1.2-2"; sha256="0ny9khzqxzx4npaqmknhpi3aldz11ipg71zw4skxphclamlsgp86"; depends=[car lmtest sandwich survival zoo Formula]; };
+AER = derive { name="AER"; version="1.2-3"; sha256="0823zjpl0b7fzhszi28lg1paa41vbxq2xpjil1d4f6dxdysalxlx"; 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]; };
 AGSDest = derive { name="AGSDest"; version="2.2"; sha256="00kf786i72bc4a80qswq1iazwqi709pxvzadgfih511plgir6ik2"; depends=[ldbounds]; };
@@ -74,6 +74,7 @@ ArfimaMLM = derive { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdx
 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]; };
+AsynchLong = derive { name="AsynchLong"; version="1.0"; sha256="097d0zvzjkz3v32qhxdir0xv7kbjkhzy6q5k54w8l4fa2632j3mk"; depends=[]; };
 AtelieR = derive { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[proto cairoDevice gWidgetsRGtk2 partitions]; };
 AtmRay = derive { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; };
 AutoSEARCH = derive { name="AutoSEARCH"; version="1.4"; sha256="1jhw005nm2dmawpdjyh9y55cn9069dcv5dihg70c3x5l65rkrliy"; depends=[zoo gets lgarch]; };
@@ -110,7 +111,7 @@ BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1
 BH = derive { name="BH"; version="1.55.0-3"; sha256="0p3xbbnj4l844sgg59ply5ng8z42lbs6z8cghsr3bxbbv4w9lkbs"; 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.1"; sha256="1iwaw2nvs6qgmgqxlc3a7zvda6r8mkyalb6ianc643i3az8cnnxf"; depends=[Rcpp miceadds Rcpp RcppArmadillo]; };
+BIFIEsurvey = derive { name="BIFIEsurvey"; version="1.2-6"; sha256="1fin5dr1xxr617i4ysfx39gaw6ygbcm4h7j1l38kqnfz18hn6xsq"; depends=[Rcpp miceadds mitools TAM Rcpp RcppArmadillo]; };
 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]; };
@@ -157,6 +158,7 @@ BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2
 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"; sha256="1gm89xk07rnwxiw5cvqqsi1p6c96j9slrp129vpy2pff56gand70"; depends=[mvnfast ff]; };
 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]; };
@@ -197,7 +199,7 @@ Bmix = derive { name="Bmix"; version="0.4"; sha256="0q6bxfdbvd3z3x4ifkmsqpfm8r5f
 BoSSA = derive { name="BoSSA"; version="1.2"; sha256="191hq0np9iadks4sflg360k64xnz8j956y30pqzwciinb4hgq1nr"; depends=[ape SoDA]; };
 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.0.2"; sha256="025bn1s6wskc82z5v7xv5jwiwn1klhbasqp0p960hfcx4v43ms5y"; depends=[igraph XML]; };
+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]; };
 BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
@@ -229,7 +231,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.1"; sha256="1dh18fak4g6ncbnzqmvrdpbx7qzrccjbvkj1pn46vpm69dip6f28"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr Rcpp RcppArmadillo]; };
+CDM = derive { name="CDM"; version="4.2-12"; sha256="18ix2l3mlk9vzv7iks16mdi4h0194bfjcvsxmya5219dfmw5vqfz"; depends=[mvtnorm Rcpp psych MASS polycor sfsmisc plyr WrightMap lattice Rcpp RcppArmadillo]; };
 CDNmoney = derive { name="CDNmoney"; version="2012.4-1"; sha256="1bnfsygbzdd70m5s9qq7524b1fybdws46axxjbw9dhwqpr8w85id"; 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=[]; };
@@ -280,7 +282,7 @@ CVST = derive { name="CVST"; version="0.2-1"; sha256="17xacyi8cf37rr2xswx96qy7pw
 CVThresh = derive { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[wavethresh EbayesThresh]; };
 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.1"; sha256="1l6mqra36syvpg9aqh4p6ndj3yj50rabx8hh788zpy4n57m5lpv7"; 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.0-6"; sha256="07n7qwpq8b70i2f48npy0pd87w0fj5xzjg00xw53m2idikqf82pn"; depends=[optimx BB]; };
@@ -314,7 +316,7 @@ CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87yl
 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]; };
 CombMSC = derive { name="CombMSC"; version="1.4.2"; sha256="1wkawxisn9alpwrymja8dla8n25z2fhai3l2xhin0b914y2kai09"; depends=[]; };
-CombinS = derive { name="CombinS"; version="1.0"; sha256="0gi66hmj3jmr301r2ahrln4zjjjvl6gabdv3y5df7aqidxlbhqbb"; depends=[]; };
+CombinS = derive { name="CombinS"; version="1.1"; sha256="18wanir5vqk5i65hd6gr2za1xd26yfa0c3c029dbxsrsczwmb9xi"; depends=[]; };
 CombinePValue = derive { name="CombinePValue"; version="1.0"; sha256="0mlngyz2nq7s39javnnjbb5db93c5sg9daw2szng83mbyfza4hv2"; depends=[]; };
 CommonJavaJars = derive { name="CommonJavaJars"; version="1.0-5"; sha256="0kwf504g1izyy7hxss21dgz26w0spxibdlacrjdh7q10z799hfhh"; depends=[]; };
 CommonTrend = derive { name="CommonTrend"; version="0.7-1"; sha256="088pg2hy2g2jgs84xawrnsf7gpvrpqjsimkx7g0i5r5fmkx169f9"; depends=[MASS urca]; };
@@ -333,6 +335,7 @@ ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhi
 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]; };
+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]; };
@@ -474,7 +477,7 @@ EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgv
 EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; };
 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]; };
-EMDomics = derive { name="EMDomics"; version="0.99.0"; sha256="0z72dgdlib9w21qhipasni5vymjf7zzq9bnvncz2fs6lpf87rf23"; depends=[emdist matrixStats ggplot2]; };
+EMDomics = derive { name="EMDomics"; version="0.99.1"; sha256="1rmdhdsqal7crhkv4z62gzrn8jf7d1aryf051kyszy7ncldp5njn"; depends=[emdist matrixStats ggplot2]; };
 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=[]; };
@@ -504,7 +507,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 RCurl XML tis jpeg MASS TeachingDemos stringi]; };
-EcoGenetics = derive { name="EcoGenetics"; version="1.0"; sha256="1b8w3ksnvny17gxwigvdifpar6c2m2gh9v73g926can8if09dz4n"; depends=[adegenet ggplot2 gstat gstudio hierfstat party raster rgdal rkt sp spdep vegan]; };
+EcoGenetics = derive { name="EcoGenetics"; version="1.1.0"; sha256="1a7dsjvkxaa37nfha07fgfas9zygsj9hrsllgf4b67rkqihrzz87"; depends=[adegenet ggplot2 gstudio hierfstat party raster rgdal rkt sp vegan]; };
 EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; };
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
 EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; };
@@ -562,10 +565,10 @@ FD = derive { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7m
 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-2"; sha256="0s6j4rq7ryypq63cq1cfa7n993bwx9pxp6pscdhyh79rhk28xxda"; depends=[tkrplot R2HTML]; };
+FFD = derive { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[tkrplot R2HTML]; };
 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"; sha256="01v0jbj09r1c4anbs3xa8y8by9ffwbbc36vsh0bv62blrisp7a03"; depends=[]; };
+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]; };
 FI = derive { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
@@ -584,7 +587,7 @@ FRAPO = derive { name="FRAPO"; version="0.3-8"; sha256="1wqayyai8pdm1vq6qvpd10qp
 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]; };
 FREQ = derive { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
-FRESA_CAD = derive { name="FRESA.CAD"; version="1.0"; sha256="1i7l2rq3p2qwd186ippnxbis8dj2va6n67q61bakd3rflm0k5mn9"; depends=[Hmisc pROC stringr miscTools survival]; };
+FRESA_CAD = derive { name="FRESA.CAD"; version="2.0.2"; sha256="1clnv18d6f747725ayksas3c2hng1bkb4zss44avfqh9q1y0z1iy"; depends=[Rcpp stringr miscTools Hmisc pROC Rcpp RcppArmadillo]; };
 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]; };
@@ -592,6 +595,7 @@ FacPad = derive { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsy
 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]; };
 Fahrmeir = derive { name="Fahrmeir"; version="2012.04-0"; sha256="1axx6r4g6gj1inih41i2az4y0d3jq9x1a6nyj8k7wp51z4z2nbmk"; depends=[]; };
 Familias = derive { name="Familias"; version="2.1"; sha256="1ccm2hm8vlm450yqx3r45qklgwa6wb54i39ybfh9g2fl544spzn8"; depends=[paramlink]; };
 FastHCS = derive { name="FastHCS"; version="0.0.4"; sha256="11ddp1xy1cmnfbsvabyw0y2wdj4z1brqykji75y7wwchf71m2bps"; depends=[matrixStats rrcov Rcpp RcppEigen]; };
@@ -622,7 +626,7 @@ FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphv
 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]; };
-ForeCA = derive { name="ForeCA"; version="0.1"; sha256="1nbflawx8h4lpb9ixbp0zcyl0bqykqlqail31i00ywkak2ic3pm3"; depends=[ifultools splus2R nlme R_utils sapa mgcv astsa]; };
+ForeCA = derive { name="ForeCA"; version="0.2.0"; sha256="06p8rcaswl85658w2insfi3qw3ygqdp13zccxn6c2dgj5qxkydpd"; depends=[ifultools MASS sapa]; };
 FormalSeries = derive { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
 Formula = derive { name="Formula"; version="1.2-0"; sha256="1rf4jkx7546aqwv5dsssi956r6mvr6m90wrx0d5dvy2d0ykhcnw9"; depends=[]; };
 ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
@@ -631,7 +635,7 @@ FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v9
 FrF2_catlg128 = derive { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; };
 Frames2 = derive { name="Frames2"; version="0.1.0"; sha256="06rmpp2ckdy42zi65f0xg9x8hgfh8hdx9an53nq3xgpz3vhaxavg"; depends=[sampling]; };
 FreeSortR = derive { name="FreeSortR"; version="1.1"; sha256="03z5wmr88gr6raa2cg7w4j6y5vgxr3g8b8axzhbd7jipswr5x1jf"; depends=[smacof vegan ellipse]; };
-FunChisq = derive { name="FunChisq"; version="2.0.0"; sha256="0yvac9nnsqdkyyqkd7yk43n66frx1y5394d4ddaxy7vqw4l4maxd"; depends=[Rcpp BH Rcpp RcppClassic]; };
+FunChisq = derive { name="FunChisq"; version="2.0.1"; sha256="0ix3dqxckcn112imnasz8hx5xcshmg304178ickpznl766kmx5gi"; depends=[Rcpp BH Rcpp RcppClassic]; };
 FunCluster = derive { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[Hmisc cluster]; };
 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]; };
@@ -650,6 +654,7 @@ GAIPE = derive { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifz
 GAMBoost = derive { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; };
 GANPA = derive { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; };
 GANPAdata = derive { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; };
+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]; };
 GCAI_bias = derive { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
 GCD = derive { name="GCD"; version="3.0.4"; sha256="1mrgscbrljfyzxprclyw9rcwlkcnifm15kkkapkv56c5ms2ic2i5"; depends=[sp raster ggplot2]; };
@@ -743,7 +748,7 @@ GrammR = derive { name="GrammR"; version="1.0.1"; sha256="1dhq4srzxbdbym89dy4gh0
 GraphPCA = derive { name="GraphPCA"; version="1.0"; sha256="17ipcp7nh47lfs9jy1aybpz4r172zj5yyrdrgmd6wa7hax8yv8gg"; depends=[ggplot2 FactoMineR scatterplot3d scales]; };
 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-4"; sha256="00qnvi5f5mywknir67rbn36hz8s1x71y1jkkj4nrp60d15vh6hk7"; depends=[sp rgeos]; };
+Grid2Polygons = derive { name="Grid2Polygons"; version="0.1-5"; sha256="18hgyx8a75allldsc2ih5i1p7ajkwj2x020cfd2hp18zrc4qyp5n"; depends=[sp rgeos]; };
 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]; };
@@ -801,6 +806,7 @@ HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw
 HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
 HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-1"; sha256="13c5g6wryzry1rvqcfpkjm9vibc6lv864fvcjmr2z8ianiqrrn6p"; depends=[]; };
 HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[rneos RCurl bitops XML tcltk2]; };
+HistDAWass = derive { name="HistDAWass"; version="0.1.1"; sha256="19nc5wggpii6fpzw6ggcq66s84ydvy50aa7dgwgr2p55j2lqig9b"; depends=[FactoMineR class]; };
 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]; };
@@ -924,6 +930,7 @@ LIHNPSD = derive { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh0
 LIM = derive { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[limSolve diagram]; };
 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.9000"; sha256="06n9zhrd4y38azqa4i8plgkzi8y3l7hlhxgqgmdjqck50gvd5s9d"; depends=[rootSolve]; };
 LMERConvenienceFunctions = derive { name="LMERConvenienceFunctions"; version="2.10"; sha256="08jz0i7sv7gn3bqckphbmnx0kc6yjnfvi06iyf7pcdzjaybxhj06"; depends=[Matrix lme4 LCFdata rgl fields mgcv]; };
 LMest = derive { name="LMest"; version="2.0"; sha256="0fv38rb9hwlbay632hhb58vga48sq89chm5qn61l6mf3wfkx2rcg"; depends=[MASS MultiLCIRT]; };
 LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
@@ -982,7 +989,7 @@ MAPA = derive { name="MAPA"; version="1.9"; sha256="1i143x2l6fq4vl8l8cagai580yqv
 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]; };
-MASS = derive { name="MASS"; version="7.3-37"; sha256="0icxsmihsk7xkf2f97asjmrwri04ykr5dq0ap343ngpxddvwjaaf"; depends=[]; };
+MASS = derive { name="MASS"; version="7.3-39"; sha256="08h94j5zcf8sgg2bynnhq2wcysw3rvzdw4hcp1il3y38i6d31zgm"; depends=[]; };
 MASSTIMATE = derive { name="MASSTIMATE"; version="1.2"; sha256="1j9l8b5d518ag9ivzr1z4dd2m23y2ia1wdshx1krmshn8xsd6lwp"; depends=[]; };
 MAT = derive { name="MAT"; version="2.2"; sha256="093axw2zp4i3f6s9621zwibcxrracp77xrc0q5q0m4yv3m35x908"; depends=[Rcpp Rcpp RcppArmadillo]; };
 MATA = derive { name="MATA"; version="0.2"; sha256="0jmsgis1jkyqywa4i5rq5inb72hsgc9s4xwmaqyfdnfa6lw44sfx"; depends=[]; };
@@ -1026,7 +1033,7 @@ MGLM = derive { name="MGLM"; version="0.0.6"; sha256="00kz2l7xn9df8n0035i2rkgj6r
 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="1.1"; sha256="0d697mggax1yp7b4dfxdi25rqmwrq25gmmjqsag6sa5raqr96gc9"; depends=[mstate prodlim cmprsk riskRegression MASS survival]; };
+MIICD = derive { name="MIICD"; version="2.0"; sha256="0q13vlm8xq99y3gixdjxcab65sjw3gjv596rq9zl768p90dgr6cm"; depends=[survival riskRegression MASS]; };
 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=[]; };
@@ -1091,7 +1098,7 @@ Matrix = derive { name="Matrix"; version="1.1-5"; sha256="0kqbabpzin7j33cjx6na3q
 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.1.2"; sha256="0s6nwc7y4zhl72ynmrna7g65rhx9y7jrwcdhwlg30nhvr55ibrgx"; depends=[dplyr rgdal rvest sp stringr]; };
+MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.1"; sha256="02xpngva5y2xk2c6kac80qc3z7s906gs3s22r2p992kyl6v4hms3"; 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]; };
@@ -1139,11 +1146,12 @@ MonetDB_R = derive { name="MonetDB.R"; version="0.9.5"; sha256="0j5b2i1yyk4d6mqm
 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]; };
 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]; };
 MsatAllele = derive { name="MsatAllele"; version="1.05"; sha256="1w489xjc7vxanam6hr4ym692j6a2skkmyzgqsmccy3101pzn522h"; depends=[]; };
 MuFiCokriging = derive { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
-MuMIn = derive { name="MuMIn"; version="1.12.1"; sha256="1l9grnhsw0bw6hh1s4wk9f5ljsy7caa8iagq55n8yzciik4cif9l"; depends=[]; };
+MuMIn = derive { name="MuMIn"; version="1.13.4"; sha256="1zk8glw5laismhhfgkbxk05qjmzv80bkp3ib45x7i05s2mqy1yxn"; depends=[]; };
 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=[]; };
@@ -1228,7 +1236,7 @@ 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.43"; sha256="1ixyws6q9p8kms3smzj8rkmsry2y4s9al4vhxpqfmbgypigq7n9k"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; };
+OUwie = derive { name="OUwie"; version="1.44"; sha256="1flqcbmrzlfdw4ak2q2rjkzxi4bb22kzipcx2w6a5z07b06xhqz9"; depends=[ape nloptr numDeriv corpcor lattice phytools phangorn]; };
 Oarray = derive { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
 OceanView = derive { name="OceanView"; version="1.0.2"; sha256="188hviv2dqvc1d7aki3a80naiy31lq27d8cc755mq4qdqq833l4d"; depends=[plot3D plot3Drgl rgl shape]; };
 Ohmage = derive { name="Ohmage"; version="2.11-4"; sha256="14pga59ikiywyl6xnfd2d8sy323vyn88q9sf101bcwp0s0qczwzg"; depends=[RCurl RJSONIO]; };
@@ -1317,9 +1325,9 @@ PReMiuM = derive { name="PReMiuM"; version="3.0.32"; sha256="03hs56vhl2xxxy2mza6
 PResiduals = derive { name="PResiduals"; version="0.2-0"; sha256="0bjn600wq8h11spi20q3gdv9ajrvagjyw6a8pfmm3pvangasq2nl"; depends=[Formula rms sandwich actuar]; };
 PSAboot = derive { name="PSAboot"; version="1.1"; sha256="176sbjr906xk2ycl8653k7nch2h7ryxfisdy178k51f55qpvv4h9"; depends=[ggplot2 PSAgraphics Matching MatchIt modeltools party psych reshape2 rpart TriMatch]; };
 PSAgraphics = derive { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
-PSCBS = derive { name="PSCBS"; version="0.43.0"; sha256="1pv61ha8c2hx91hik9n6fz2gxdhijgcsdjhznaml5v1d5ba3vzjj"; depends=[R_methodsS3 R_oo R_utils R_cache matrixStats]; };
+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.84.1"; sha256="10cwlj8957sj5dag43v01fbq9lmcasfxp0lgllj0iv0lbfzd4g02"; depends=[TraMineR]; };
+PST = derive { name="PST"; version="0.86"; sha256="0m6v7j36v47zdqqd3lf05w6pk0f3wfs1kix1qfvy2gj8n41jjmxf"; depends=[TraMineR RColorBrewer]; };
 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]; };
@@ -1409,13 +1417,13 @@ QuantifQuantile = derive { name="QuantifQuantile"; version="1.0"; sha256="0r3yz8
 QuasiSeq = derive { name="QuasiSeq"; version="1.0-6"; sha256="0hv6fmw8kqdg82nwdiqb9naryw4x42rv9xw1zmahgqyxr9ffnrgr"; depends=[Matrix mgcv]; };
 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.12.0"; sha256="0as90warygvcsa5cvicjykn7jz2d5cdw68ghqi9cj5lzqq982dkn"; depends=[R_methodsS3 R_oo R_utils base64enc]; };
-R_filesets = derive { name="R.filesets"; version="2.6.0"; sha256="0n99mxdajb6rk7cvgy4gihaifiw31llngrhx22mfn3zs7wbdk9d1"; depends=[R_oo R_methodsS3 R_utils R_cache digest]; };
-R_huge = derive { name="R.huge"; version="0.8.0"; sha256="00iiz1q6a5ywsidiwy6lnxjw0ig75ri914dqr7cbfccdf66fb840"; depends=[R_methodsS3 R_oo R_utils]; };
-R_matlab = derive { name="R.matlab"; version="3.1.1"; sha256="15j1mshzv1lpjlsdcjg45khdvl0w8mqwd387i1lc0zv1r29m6mn9"; depends=[R_methodsS3 R_oo R_utils]; };
-R_methodsS3 = derive { name="R.methodsS3"; version="1.6.1"; sha256="1c3f64bvnpxfb3k2g7z3a6qms36z0n2hflw5w5952c82jx10cl0x"; depends=[]; };
+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.0"; sha256="12aghswi40qr6n6rzyv2bpy1wlp61ij7h1yblbhlmdk3p4rd0bs1"; 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.18.0"; sha256="0difa5258i59vb538xp9p1jkzzrbmm8l35gqhpchfxk5dhn2cq9a"; depends=[R_methodsS3]; };
-R_rsp = derive { name="R.rsp"; version="0.19.0"; sha256="0qh9nd6zpiw4c86qlwys8g7rqvay20m1yfp2zrvah5bz51hixbd1"; depends=[R_methodsS3 R_oo R_utils R_cache]; };
+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="1.34.0"; sha256="1brpj67px14d1y5ax3j49sbf7dnnj1rcbhli5ph44y65snrmdaih"; depends=[R_oo R_methodsS3]; };
 R0 = derive { name="R0"; version="1.2-5"; sha256="13f0dvxf1gz9j8ih1n8giyhb4s7nrh1r7ncc5smvh06kjgr5b341"; depends=[MASS]; };
 R1magic = derive { name="R1magic"; version="0.2"; sha256="07kqpdpf2grmgkv609l79f3w6ljkldfsyrn9l1yg6birzp3p69v1"; depends=[]; };
@@ -1467,7 +1475,7 @@ RDS = derive { name="RDS"; version="0.7"; sha256="0xlz1pkgznk6x3298f6b40l9h26y0a
 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=[]; };
-RDota = derive { name="RDota"; version="1.1"; sha256="157psqwg27y7sq75lcp0grn98f6zriljfaysfxsbqmlhlihhl6rb"; 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]; };
 RECA = derive { name="RECA"; version="1.1"; sha256="1wgcd53yy4xsi7i674n4255qvvv6988r43q7n7pjqrimp04g1qd0"; depends=[]; };
 REDCapR = derive { name="REDCapR"; version="0.7-1"; sha256="1r5vvl52z5gpqhq949fzwmsqvwpr74phcapkckczyznlfql4qdh1"; depends=[httr plyr stringr]; };
@@ -1506,10 +1514,10 @@ RInSp = derive { name="RInSp"; version="1.2"; sha256="0zg46qw44wx17ydcz592gl4k9q
 RInside = derive { name="RInside"; version="0.2.12"; sha256="09dx9md5i4vdgadmqfzcchs5nhkml4nwr8ckgmmqll0y3xph2f3h"; 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.2"; sha256="0b4w2qva19av76gjwbdccf6gwfc2fia31pvbhgv1a48p272kxzni"; depends=[rJava zoo]; };
+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=[]; };
-RKEA = derive { name="RKEA"; version="0.0-4"; sha256="0qkjnyy4b6vzdiapadx9hmw3h4gfgmbi4g5078rr6kq5kmwqlwgh"; depends=[rJava tm]; };
+RKEA = derive { name="RKEA"; version="0.0-5"; sha256="0ni5vdv5pjyl1kshqlp0vh7jfpn098949nwczz2ylk3qqs2hj0vm"; depends=[rJava tm]; };
 RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv Rcpp]; };
 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]; };
@@ -1523,14 +1531,14 @@ RMallow = derive { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw
 RMark = derive { name="RMark"; version="2.1.9"; sha256="1z7hh9fwaaiwa2s27vrc3yckqc0vhimazqj71601ibsqs3pljzh8"; 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.1"; sha256="0aqs2zjhzn4arpbshhssn7y0m2w0ghq91iapbwylab6mp97mxch8"; depends=[DBI]; };
+RMySQL = derive { name="RMySQL"; version="0.10.2"; sha256="1yzlldgnncbd8aqkhphnwb8bk164ds4ql3hq1h2qdlicf6x806kz"; 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.1"; sha256="10p9njlrpkwgnyjkcz7w579dwi0nwdmksyl2gpbq106fzqvh0s47"; depends=[ape XML plyr taxize reshape2 httr uuid]; };
 RNetCDF = derive { name="RNetCDF"; version="1.6.3-1"; sha256="0c112qwxzml3mbdss69607amxvhpkfgs7ihymxidgkv0s3ra7cp5"; depends=[]; };
 RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67m00wnl6v0jrmavmp7n7zygjn7p1xi3w22c"; depends=[rJava igraph]; };
-RNiftyReg = derive { name="RNiftyReg"; version="1.1.2"; sha256="1g74qdx71wzyl0k7liwvl33rzhz7srmn15x55md5gyljxb5rqm6c"; depends=[reportr oro_nifti]; };
+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]; };
 ROCR = derive { name="ROCR"; version="1.0-5"; sha256="0xxhr31l1k9gs99yw1plnp4m5c33mp4dy3sdfhf33i57gi3yww0a"; depends=[gplots]; };
@@ -1561,7 +1569,7 @@ RPushbullet = derive { name="RPushbullet"; version="0.2.0"; sha256="1h9yvw9kw7df
 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]; };
 RRF = derive { name="RRF"; version="1.6"; sha256="1gp224mracrz53vnxwfvd7bln18v8x7w130wslhfgcdl0n4f2d28"; depends=[]; };
-RRreg = derive { name="RRreg"; version="0.2.0"; sha256="0pni738yc236p8aafzjha5589i8bll3b075k0fync2mkc1v4czln"; depends=[doParallel foreach]; };
+RRreg = derive { name="RRreg"; version="0.3.0"; sha256="0pip05wk76h436mvcsddhn2p25ihms3yf1lb23k7ygpx6jx4mdn3"; depends=[doParallel foreach]; };
 RSA = derive { name="RSA"; version="0.9.6"; sha256="1hi3spj0nbl08zszkqp1xxcq2qw3j4zkihrhhn20gacgsqi7k19w"; 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]; };
@@ -1584,7 +1592,7 @@ RSofia = derive { name="RSofia"; version="1.1"; sha256="0q931y9rcf6slb0s2lsxhgqr
 RStars = derive { name="RStars"; version="1.0"; sha256="1siwqm8sp8wqbb56961drkwcnkv3w1xiy81hxy0zcr2z7rscv7mh"; depends=[RJSONIO RCurl]; };
 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-2"; sha256="1fksjbzny0wl0k2sj3bxflzim7i8r5dfwz9ih4ssk5xaxfmjz2f5"; depends=[sp rgeos MBA]; };
+RSurvey = derive { name="RSurvey"; version="0.8-3"; sha256="0dqrajd3m2v5cd3afl9lni9amfqfv4vhz7kakg3a5180j5rcag12"; depends=[sp rgeos MBA]; };
 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=[]; };
@@ -1594,6 +1602,7 @@ RTextureMetrics = derive { name="RTextureMetrics"; version="1.1"; sha256="0d0mvp
 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-41"; sha256="039263c10wlj4xyb696mcidndm1vkxwrghramvvgyivd7ybk3flw"; depends=[ade4 boot car lme4 MASS mixOmics statmod]; };
+RVFam = derive { name="RVFam"; version="1.0"; sha256="1r09k5cdm2ajxdg6p78yl43b9sn2vzsfzkmjn0p3mm6z1s7kpw1k"; 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]; };
@@ -1629,7 +1638,7 @@ Rcell = derive { name="Rcell"; version="1.2-6"; sha256="0wly2wgm7506a9f26jbq2b0v
 Rcgmin = derive { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
 Rchoice = derive { name="Rchoice"; version="0.2"; sha256="06xlz8ii1w42wcvkymxv68dn8pzvnn3xbyarplmdalv4p8c4jchk"; 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-6"; sha256="0mxn0z8nllanhh8q1mnjc0y5kwxzw879k8s6mqz5azm282qk68mj"; depends=[RcmdrMisc car tcltk2 abind]; };
+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]; };
@@ -1643,7 +1652,7 @@ RcmdrPlugin_IPSUR = derive { name="RcmdrPlugin.IPSUR"; version="0.2-1"; sha256="
 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"; sha256="1646xy5q40r9liaqvlwmh9fscm2ggfdfb713gpxqzrv4kwgaddji"; depends=[mixlm MASS pls xtable Rcmdr]; };
+RcmdrPlugin_NMBU = derive { name="RcmdrPlugin.NMBU"; version="1.8.0.1"; sha256="1xc7vfir941v65awq2glawbcwq28s5h73ffh41hb5aaazaism1m5"; 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-17"; sha256="0asqvl99x03irnidjs72m6x4x3v8xlaikhfk0zk85v0l21lgy4iv"; depends=[Rcmdr pROC ROCR ResourceSelection]; };
 RcmdrPlugin_SCDA = derive { name="RcmdrPlugin.SCDA"; version="1.1"; sha256="0pd765ndh8d7hy6spds3r4pi09i0ak4b1ygwczp6yr2zcs1aikbc"; depends=[SCVA SCRT SCMA Rcmdr]; };
@@ -1672,6 +1681,7 @@ Rcolombos = derive { name="Rcolombos"; version="1.5.0"; sha256="139ayyc94m6srbcc
 Rcplex = derive { name="Rcplex"; version="0.3-2"; sha256="1hx9s327af7yawzyq5isvx8n6pvr0481lrfajgh8nihj7g69nmk7"; depends=[slam]; };
 Rcpp = derive { name="Rcpp"; version="0.11.4"; sha256="0ar50r6cbvbd0crc47cm34lnrmzfzzv5fmhd2qa60br55rpxbhf6"; 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.5"; sha256="1acgwwcgb7qqvwg3j0qk7jvk3nb76zw0lqn8bswywvgawalw49ah"; depends=[Rcpp Rcpp BH]; };
 RcppArmadillo = derive { name="RcppArmadillo"; version="0.4.600.4.0"; sha256="0qd20bs0h5kvk0433hhslm4qzddchv8vnaynvnzicjjwq3adgi2g"; depends=[Rcpp Rcpp]; };
 RcppBDT = derive { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[Rcpp Rcpp BH]; };
@@ -1771,7 +1781,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.11"; sha256="06mg1fdviayvhc50p9l5imh431b7cb3f3x3pl513phwhsv0qc0lk"; depends=[svd forecast lattice]; };
 Rsundials = derive { name="Rsundials"; version="1.6"; sha256="0vrvxsznbclgls4jljc59lyli6cw9k1a3wapfrs6xbkqi8865iif"; depends=[]; };
-Rsymphony = derive { name="Rsymphony"; version="0.1-18"; sha256="0421viap2qic53hxvjyxy3npyb4lpf8lw86zwya373w41pkpsd1v"; depends=[]; };
+Rsymphony = derive { name="Rsymphony"; version="0.1-19"; sha256="0m9xbyp4hxz9rbc8nd7q0fwzgl6126iv0sxwifamxkc9z8vr86js"; depends=[]; };
 Rtsne = derive { name="Rtsne"; version="0.9"; sha256="1b3ilfirlhmbv1914rwnj9mamn6clzi86csp3szfwg93gk23yymn"; depends=[Rcpp Rcpp]; };
 Rttf2pt1 = derive { name="Rttf2pt1"; version="1.3.3"; sha256="16bnhrg86rzi4g4zf235m1g8amyhcwxpw0wgcxynfiinm2fl4y1n"; depends=[]; };
 Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp Rcpp]; };
@@ -1807,7 +1817,7 @@ SCORER2 = derive { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2d
 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.1"; sha256="1bl9xlns6np26pgiiza25c54k4989knksdkkk653g8s8gmr4y34x"; depends=[Hmisc sm tseries rpanel rgl]; };
+SDD = derive { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc sm tseries rpanel rgl]; };
 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=[]; };
@@ -1826,7 +1836,7 @@ SGP = derive { name="SGP"; version="1.2-0.0"; sha256="0v4ljhvfrvl6izprcrw8w36474
 SGPdata = derive { name="SGPdata"; version="8.0-0.0"; sha256="0g25s2wcj47394fm16maygafnynizma3mgb3r65b5p9c27swk4v8"; depends=[]; };
 SHIP = derive { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
 SII = derive { name="SII"; version="1.0.3"; sha256="1k9mvz6g25qs351c0vx7n5h77kb6k833jrcww14ni59yc9jgvsyg"; depends=[]; };
-SIMMS = derive { name="SIMMS"; version="1.0.0"; sha256="1vwd06kaicmy4l1pygd58klbbbi4kp0hics0gyz7gfdc4vwpxf96"; depends=[survival MASS glmnet]; };
+SIMMS = derive { name="SIMMS"; version="1.0.1"; sha256="08kl9kzxqmzlacs8jfys0w7rngx93mlj4k1g8wzg4hmnlmic8l3k"; depends=[survival MASS glmnet]; };
 SIN = derive { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; };
 SINGLE = derive { name="SINGLE"; version="1.3"; sha256="0wd7jzys51rnwr5rhf2llpygqxydjrv0dill19v8sz9w0madkil4"; depends=[flsa igraph dse Matrix]; };
 SIS = derive { name="SIS"; version="0.7-4"; sha256="0a8apfjzfwd5a2cvkviwvqlp26hqr34lba65cq5hxf9n05x2s7rx"; depends=[glmnet ncvreg survival]; };
@@ -1889,7 +1899,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.5"; sha256="1p05fb6g0rwkzz0qp8hx88skxvfq265ndv9g694gc2h8vzwpan1y"; depends=[mvtnorm]; };
+SamplerCompare = derive { name="SamplerCompare"; version="1.2.6"; sha256="1n94fp6frawlbxcnvi0v6lhgs3yyc47lj1r46y3jg6zb9z3va3fa"; depends=[mvtnorm]; };
 SamplingStrata = derive { name="SamplingStrata"; version="1.0-3"; sha256="16nrcv5hbbvn4rgckzagi84i7h49bd878mnpknlzmzr5ykzywsay"; depends=[]; };
 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]; };
@@ -1925,7 +1935,7 @@ SimCorMultRes = derive { name="SimCorMultRes"; version="1.3.0"; sha256="0r3d91x9
 SimRAD = derive { name="SimRAD"; version="0.95"; sha256="1l4y39d05h5f2q609i73p07h093r9yca11dqw5iq1d7skwxcvf01"; depends=[]; };
 SimSeq = derive { name="SimSeq"; version="1.2.0"; sha256="0jbi19bdsvyrmr2762p8skw419qx438vgnjb93xdy90lrgyx11wh"; depends=[fdrtool]; };
 SimilarityMeasures = derive { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; };
-Simile = derive { name="Simile"; version="1.3.2"; sha256="0k3jj5vbv7dlsn7lxf5jh2ckxxw9rh4ycrnx3c3w2c6l6fwjlnkb"; depends=[]; };
+Simile = derive { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; };
 SimpleTable = derive { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; };
 SimplicialCubature = derive { name="SimplicialCubature"; version="1.0"; sha256="0da2krxsd3p7v2jm4fp2ksh0ak1y0cjxj7inwkdiwmmmgjyq033f"; depends=[]; };
 Simpsons = derive { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; };
@@ -1980,7 +1990,6 @@ StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fq
 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.3"; sha256="07hpz31npl2xihqb7a3cjscp0ch6hia9p42bx8y2spv1rrcn8vvw"; depends=[bezier rjson shiny Rcpp jpeg Rcpp]; };
-StochKit2R = derive { name="StochKit2R"; version="0.3"; sha256="0d74wfn7mgw71zd5cf6m81382ki2ccl64ss6361mm3837v55bh5f"; depends=[Rcpp reshape ggplot2 XML Rcpp BH]; };
 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]; };
@@ -1993,17 +2002,19 @@ SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3
 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-4"; sha256="0wvicdd7lxczxv4hdbdn8cnv5k36biix65r4byn4cpgqhkyy78k6"; depends=[MASS nlme msm lme4]; };
+SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
 SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; };
 Survgini = derive { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
-SvyNom = derive { name="SvyNom"; version="1.0"; sha256="07cgg97s2kpq7vak9l1a57gwmp1gsm864m4b9q42s2fbiid8jg83"; depends=[]; };
+SvyNom = derive { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[survival rms Hmisc survey]; };
 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]; };
 Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-TAM = derive { name="TAM"; version="1.4-1"; sha256="0qr1wbnlkzbbwa43v2sf1bkigdg5bd7fw5kwzgj1b28gfgakg5r0"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych lattice mvtnorm msm Rcpp RcppArmadillo]; };
+TAM = derive { name="TAM"; version="1.5-2"; sha256="0ik94ipsrcpagv234al8hm2b7122k7iaraxg7gclxiky487igf96"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych mvtnorm msm lattice 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]; };
@@ -2092,6 +2103,7 @@ TunePareto = derive { name="TunePareto"; version="2.4"; sha256="0pljl3q5s9yqc4ph
 TurtleGraphics = derive { name="TurtleGraphics"; version="1.0-5"; sha256="18azwbvs3cv3arp6zhh5bklf7n04p13jpfjh44nxv5159jry7arr"; depends=[]; };
 TwoCop = derive { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
 TwoStepCLogit = derive { name="TwoStepCLogit"; version="1.2.3"; sha256="0arqpfflflsydsgcrpq364vqf4sn019m03ygmpq810wa78v4r9s0"; depends=[survival]; };
+UBCRM = derive { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
 UPMASK = derive { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[MASS RSQLite DBI]; };
 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]; };
@@ -2151,6 +2163,7 @@ WeightedCluster = derive { name="WeightedCluster"; version="1.2"; sha256="1d0df2
 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]; };
+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]; };
 WilcoxCV = derive { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
@@ -2292,7 +2305,7 @@ apsimr = derive { name="apsimr"; version="0.1"; sha256="03j1g16drch5xkxb86czxmih
 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]; };
 aqfig = derive { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
-aqp = derive { name="aqp"; version="1.7-7"; sha256="0gdaxxifcvr40j6y7db24dzla31linhh39w8830sj1k22y9sa4dp"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS]; };
+aqp = derive { name="aqp"; version="1.8"; sha256="12z8lsnjwjrnxj5a79can2r2h9sdmp39jfnx9kxn8zwm9klzl3jg"; depends=[plyr reshape lattice cluster sp Hmisc stringr scales plotrix RColorBrewer MASS]; };
 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]; };
@@ -2306,8 +2319,8 @@ argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v
 arm = derive { name="arm"; version="1.7-07"; sha256="19xshr5r36g9jsyxdm0dihvga89fd080hbhmyhxv1rbv4496jwqa"; 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_apd = derive { name="aroma.apd"; version="0.5.0"; sha256="1pi4k7psrc120r8mn352vg60mjvbnm1f56dm9svfxfyl0qhcfd00"; depends=[R_methodsS3 R_oo R_utils R_huge]; };
-aroma_cn = derive { name="aroma.cn"; version="1.5.0"; sha256="1aih11r3gs969ci5gs7x7z5pia51y75iy559y23cz40q2qsq4ikc"; depends=[R_utils aroma_core R_methodsS3 R_oo R_filesets R_cache matrixStats PSCBS]; };
+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]; };
 arrayhelpers = derive { name="arrayhelpers"; version="0.76-20120816"; sha256="1q80dykcbqbcigv2f9xg1brfm3835i0zvs0810q6kh682a3hpqbi"; depends=[]; };
 ars = derive { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
@@ -2324,6 +2337,7 @@ aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g
 aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; };
 assertive = derive { name="assertive"; version="0.2-1"; sha256="0bzhwdkw3ryaclaw9lni8zw13037gx7kf6wbmjvkwsl9p0lzv7wp"; depends=[]; };
 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=[]; };
 astro = derive { name="astro"; version="1.2"; sha256="1c7zrycgj2n8gz50m94ys1dspilds91s1b2pwaq6df1va17pznby"; depends=[MASS plotrix]; };
@@ -2341,18 +2355,18 @@ audiolyzR = derive { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0
 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]; };
-autopls = derive { name="autopls"; version="1.2-7"; sha256="173i1g11waz72myclfdch9v3wsvdr9mdz2gxdqifq9wj50s4zrg4"; depends=[pls]; };
+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=[]; };
 aylmer = derive { name="aylmer"; version="1.0-11"; sha256="1b6dryvfz9yp00nj8lv8j1isnshcgwn9fx41knah9pw7dn4pxkk2"; depends=[Brobdingnag]; };
 b6e6rl = derive { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
 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=[]; };
 babynames = derive { name="babynames"; version="0.1"; sha256="0qq0303mmcnpfy5630d7rqmb8rl36p7hg2z842rzd4lkhy8c2l07"; depends=[]; };
 backtest = derive { name="backtest"; version="0.3-2"; sha256="06q488pynxgis1m6rxc8hgscpy8vimffpi4aamviwb089sjzilnn"; depends=[lattice]; };
 bagRboostR = derive { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
-bamboo = derive { name="bamboo"; version="0.9.5"; sha256="03aqrwgr77n2kzfnc5scv6n6d4401q9ddnzlki7d6rblilfb2w12"; depends=[rJava jvmr]; };
 bamdit = derive { name="bamdit"; version="1.1-1"; sha256="0f865yfwd2pvbkcx8jm4iyilldmprsgyqnscp1n28rp3sbdii4bl"; depends=[coda rjags]; };
 bams = derive { name="bams"; version="1.6"; sha256="1pplnpilpydxf7gcs87424cajss74q8cr9pyv2biy4pkvfql0nxl"; depends=[]; };
 bandit = derive { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
@@ -2468,6 +2482,7 @@ bioPN = derive { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp
 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]; };
+biomonCore = derive { name="biomonCore"; version="1.3.50"; sha256="14s4lwax27zy989lh3aw7y7gasbvcpsm66m482wlh1r58d9x93rq"; depends=[analyz]; };
 bionetdata = derive { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
 biopara = derive { name="biopara"; version="1.5"; sha256="1fhhs6lkm3iphlkx6wklh9sgr1mkjkka9wv2m8fnk0xw01bdsyl5"; depends=[]; };
 bios2mds = derive { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap e1071 scales cluster rgl]; };
@@ -2522,7 +2537,8 @@ bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag58
 bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
 bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; };
 bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
-bootstrap = derive { name="bootstrap"; version="2014.4"; sha256="1kf5jml03yfqz2868jbnjvy839x09ml0niyq85va503pq8gmj5br"; depends=[]; };
+bootstrap = derive { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; };
+boottol = derive { name="boottol"; version="1.0"; sha256="16nmi1x0057rl9gwx5sz5vk4rzzzh2zfifzs09rl92vcc77c3y2z"; depends=[boot plyr sqldf]; };
 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]; };
 boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
@@ -2543,7 +2559,7 @@ brglm = derive { name="brglm"; version="0.5-9"; sha256="14hxjamxyd0npak8wyfmmb17
 bride = derive { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
 brnn = derive { name="brnn"; version="0.5"; sha256="0kf2fdgshk8i3jlxjfgpdfq08kzlz3k9s7rdp4bg4lg3khmah9d1"; depends=[Formula]; };
 broman = derive { name="broman"; version="0.48-2"; sha256="0w3fxs753ds2d4vzz7mck3cdjh4d1mjbwdbzqkb2rxdx5l4w2jp8"; depends=[assertthat]; };
-broom = derive { name="broom"; version="0.3.5"; sha256="0vzj797nr3ijn4wq8ri6inibdbsp980didk5ywqw2ankzlq3m7f2"; depends=[plyr dplyr tidyr psych]; };
+broom = derive { name="broom"; version="0.3.6"; sha256="0z3np7g9yidsyj58y5mnxqzcn6n841pfmxhwbiy2d6sm5i463lmh"; depends=[plyr dplyr tidyr psych stringr]; };
 bshazard = derive { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[survival Epi]; };
 bspec = derive { name="bspec"; version="1.4"; sha256="1iq66hx4d0f5pvsh6qcsd2kzm913aqil4w66bfshj192fwbfziix"; depends=[]; };
 bspmma = derive { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
@@ -2564,10 +2580,10 @@ ca = derive { name="ca"; version="0.58"; sha256="10dp261sq56ixrrr8qq4filxpzszcin
 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.21"; sha256="1g4glv80zj9mxi9hipkpxxcg3x0g3g7av17bhidb6h0s75v9jcvw"; 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.11.0"; sha256="1zy836nk607ra67q0x7yc4czkcn9ffzlipzhr4mhjk6l5d8sys2q"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; };
+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="2.0.0"; sha256="0p5hxzhql2rlyx334d8km676va50ql73kxsqjr15q80z7zffyq9d"; depends=[LearnBayes]; };
 candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; };
@@ -2609,7 +2625,7 @@ cclust = derive { name="cclust"; version="0.6-19"; sha256="11lzzpr65jw7s0419bdy3
 cda = derive { name="cda"; version="1.5.1"; sha256="09a2jb25219hq6if3bx03lsp94rp2ll9g73dhkdi665y7rlhgqwh"; depends=[dielectric Rcpp statmod randtoolbox reshape2 plyr Rcpp RcppArmadillo]; };
 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"; sha256="0gzvsw4s5pjrdbck4j985sl59pslcmliny9664srrv4iqc6i8z6i"; depends=[MASS limSolve clue colorspace copula]; };
+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=[]; };
@@ -2640,7 +2656,7 @@ chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6
 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.54"; sha256="1qcwspww5nvp6nh26ly6ckqd0jzq4fkq5svjj5a55pvk04xk9frs"; depends=[pls Kendall spam fields]; };
-chipPCR = derive { name="chipPCR"; version="0.0.8-3"; sha256="1qslzbxirpbiqlfcvjrs7z6i4a86a04b9fgfm3ngmkv32ai0zajz"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
+chipPCR = derive { name="chipPCR"; version="0.0.8-6"; sha256="1cn5ky1grdsipgldwxz8b3xcmr9djyx7bk9xnpgm2f3x68vvsr7y"; 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=[]; };
@@ -2652,7 +2668,7 @@ chromer = derive { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yj
 chromoR = derive { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[haarfisz gdata]; };
 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.2"; sha256="001zic779ydc1535fx00lmgk92hv2yn4kq5cangwhrwxj6ycfimy"; depends=[GlobalOptions]; };
+circlize = derive { name="circlize"; version="0.2.3"; sha256="1ypb0bv63n89ydsx44jzjpbb382cy1cvdxfm6arv68san85fd1is"; depends=[GlobalOptions]; };
 circular = derive { name="circular"; version="0.4-7"; sha256="1kgis2515c931ir76kpxnjx0cscw4n09a5qz1rbrhf34gv81pzqw"; depends=[boot]; };
 cit = derive { name="cit"; version="1.3"; sha256="05gr9pb01l4rs79rpgcj8mds61n3kv50fgcw2bcibzs1d1za33ig"; depends=[]; };
 citbcmst = derive { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
@@ -2672,18 +2688,18 @@ clickstream = derive { name="clickstream"; version="1.1.3"; sha256="0vhwhklyxpir
 climdex_pcic = derive { name="climdex.pcic"; version="1.1-5"; sha256="0r6y3ylxdfkbhrx4vbzs1f7y86gdfny3dxzskc48l3qv75q5276m"; depends=[PCICt caTools Rcpp]; };
 clime = derive { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; };
 clinUtiDNA = derive { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
-clinfun = derive { name="clinfun"; version="1.0.6"; sha256="00prrdm6qm5p2sjjlhi99msvqpxcm492z378wgl65iwf0jywdnpw"; depends=[mvtnorm]; };
+clinfun = derive { name="clinfun"; version="1.0.9"; sha256="1igj48kp8898inxp6ynz0sgrc54s6k8whzgf5d349z4dn2jvizsb"; depends=[mvtnorm]; };
 clinsig = derive { name="clinsig"; version="1.0-5"; sha256="1jb2qk6hfvms85whymrfpgvjp8pv33fbllpl8jg80yg1ppmg2jcg"; 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-4"; sha256="0pgd3vjfplvsfn3nw6sqlkfsv6lbpjlcai7z9qp31qcih3g71vgr"; depends=[]; };
+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]; };
 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=[]; };
-clusterGeneration = derive { name="clusterGeneration"; version="1.3.1"; sha256="0lvkqqcshnaqk40s5y736r53y9yss3hlvgs6gs7p8ksk14vj7i2q"; depends=[MASS]; };
+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=[]; };
@@ -2691,7 +2707,6 @@ clusterSim = derive { name="clusterSim"; version="0.44-1"; sha256="18l643w3zps3b
 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]; };
 clusteval = derive { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp Rcpp]; };
-clusthaplo = derive { name="clusthaplo"; version="1.2"; sha256="17vxk61bw99h34n9a6vp40nanigfai34s237ydb56jpamsq8sf2b"; depends=[ggplot2]; };
 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]; };
@@ -2723,6 +2738,7 @@ coin = derive { name="coin"; version="1.0-24"; sha256="1h1d6pi957qkmlk2j8f280sc6
 cold = derive { name="cold"; version="1.0-3"; sha256="17nlqhp5415m8wjkb2ykmk1q3lgw1aycf85b6byl8p06bfrvmw2p"; depends=[]; };
 coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; };
 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-4"; sha256="1ppvkcclqjdj1b9j59sc2gda55kmwq9l00n5643ggjb15m2dm76h"; depends=[]; };
 colortools = derive { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; };
@@ -2799,6 +2815,7 @@ coxme = derive { name="coxme"; version="2.2-3"; sha256="1s9h03crzmvi0szg5rhq0m48
 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=[]; };
 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=[]; };
@@ -2824,7 +2841,7 @@ crossval = derive { name="crossval"; version="1.0.2"; sha256="1imqmrr86yr2ml9x8c
 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]; };
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
-crrstep = derive { name="crrstep"; version="2014-07.16"; sha256="15di36j44wxvwl7zhnz3s16lf65rnpj1bvgxf0glkkm0pw94ibrl"; depends=[cmprsk]; };
+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]; };
 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]; };
@@ -2862,6 +2879,7 @@ cytoDiv = derive { name="cytoDiv"; version="0.5-3"; sha256="00c0gqgypywgbhavb15b
 d3Network = derive { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; };
 dae = derive { name="dae"; version="2.4-0"; sha256="1gf3x751if3g2p7yy8jsvpn612w36mjhkz8qkh0y0kajm0nipzkb"; depends=[ggplot2]; };
 daewr = derive { name="daewr"; version="1.1-4"; sha256="0pmz4721999vf023hpvsf17k5fgqpwnisnwssmav46glhmzl2cyj"; depends=[lattice FrF2 BsMD]; };
+daff = derive { name="daff"; version="0.1.2"; sha256="17ixi2yvh6wxwnhzbg8xsjmxbakh7lyazin5a93q33160vvsiday"; depends=[V8 jsonlite]; };
 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=[]; };
@@ -2871,7 +2889,7 @@ darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf
 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]; };
 dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
-dataRetrieval = derive { name="dataRetrieval"; version="2.1.1"; sha256="0d2m8yv471kcxr855r6s9p2dadmlc8ks16iafsvhcf8a9id7p91x"; depends=[XML RCurl reshape2 lubridate plyr]; };
+dataRetrieval = derive { name="dataRetrieval"; version="2.1.2"; sha256="0869y5xfxphm5xhd7miyjq5xdjb6qhhd5b9mdbkcfs5ss0a6534x"; depends=[XML RCurl reshape2 lubridate plyr]; };
 datacheck = derive { name="datacheck"; version="1.0.4"; sha256="1ns5cmsvmqswzpa33mqcmj92b4j3l32v29ki3crg0kayrpdmyrbw"; 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]; };
@@ -2982,6 +3000,7 @@ diseasemapping = derive { name="diseasemapping"; version="1.1.5"; sha256="1v1pbs
 diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; };
 dismo = derive { name="dismo"; version="1.0-5"; sha256="1zzzj4r96a35ghngszym1dg1wbr8mvinn7cvmqwnnjn3c2zq4w0g"; 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]; };
 displayHTS = derive { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
 dispmod = derive { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
 disposables = derive { name="disposables"; version="1.0.0"; sha256="0xd8war6vav8swpwgmyi9hd6xv0j6j72yrk4sdcwiwzgs4l8cbfj"; depends=[]; };
@@ -3029,7 +3048,7 @@ dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiaz
 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.3.2"; sha256="04njbh1jjhj869wi5c3nr6kffn166libi9wcycf26d7hann8frwz"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; };
+dpcR = derive { name="dpcR"; version="0.1.3.3"; sha256="1j2c3b6727598lmz29vl5f4jkf5v1621g3cli588k10frlq55nip"; 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]; };
 dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; };
@@ -3056,7 +3075,7 @@ dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj
 dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; };
 dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
 dummy = derive { name="dummy"; version="0.1.0"; sha256="004w6ymfah608c4rqjnzjy2kyxmcq6gxbh0zhqd82ljv7cah52my"; depends=[]; };
-dunn_test = derive { name="dunn.test"; version="1.2.2"; sha256="0n7z2nimkpbh7d745yrcq2swrkpccncb5vhprm2isbkwig763a6a"; depends=[]; };
+dunn_test = derive { name="dunn.test"; version="1.2.3"; sha256="1p9bmjq3rj674mss1ml2m94nzfrqpg95cb2l6vfrcldc5zja0z7l"; 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]; };
@@ -3107,7 +3126,7 @@ eegkitdata = derive { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8
 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]; };
 effsize = derive { name="effsize"; version="0.5.2"; sha256="0xhrq1a7vjcbipvmslmkw4widnp0scfcir80sr5npcx5pvxagsq3"; depends=[]; };
-ega = derive { name="ega"; version="1.0.0"; sha256="1825lwr9bii16nbaj1ryh82gwg2p1r5dhn41cp3l728cfpz5gvlz"; depends=[ggplot2]; };
+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]; };
 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]; };
@@ -3201,7 +3220,7 @@ evtree = derive { name="evtree"; version="1.0-0"; sha256="0i37lkdfzvgby98888ndd5
 exCon = derive { name="exCon"; version="0.1-3"; sha256="0z09nwv721ld3dbi7c14rd2pjz96kj9pniljmwy9r41fhz36i4yf"; depends=[jsonlite]; };
 exact2x2 = derive { name="exact2x2"; version="1.4.0"; sha256="1yzigyyvzs3aq3sl3birs9bzir1l8b30qfbhfg5aw80w6a5p0hb1"; depends=[exactci ssanv]; };
 exactLoglinTest = derive { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; };
-exactRankTests = derive { name="exactRankTests"; version="0.8-27"; sha256="0ygy3ygdnrrcggps5zh5r7kqfa9vj6gfgdyli63n8cwdimfyndhn"; depends=[]; };
+exactRankTests = derive { name="exactRankTests"; version="0.8-28"; sha256="1n6rr0wax265y9w341x7m2pqwx3cv8iqx1k5qla29z8lqn4ng1nd"; depends=[]; };
 exactci = derive { name="exactci"; version="1.3-0"; sha256="03mhgpyrgm3cb0hw908wxhi6pxrvcsw4r1lmbx95xn44j1p9zpzk"; depends=[ssanv]; };
 exactmeta = derive { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; };
 exams = derive { name="exams"; version="2.0-2"; sha256="1cv01wa3zs31zdc1qk6rsnimbs6m31r0j56syg6yjicfxiwxxm0v"; depends=[]; };
@@ -3257,6 +3276,7 @@ factorQR = derive { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y
 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]; };
 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"; sha256="16j6j7kf5xlqg6m2sfdfgpcjf9grrcfh9ij0282hnirgl7a4cvjd"; depends=[]; };
 fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; };
@@ -3278,6 +3298,7 @@ fastclime = derive { name="fastclime"; version="1.2.4"; sha256="0z91khjzffwy4mbq
 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]; };
@@ -3306,6 +3327,7 @@ fftw = derive { name="fftw"; version="1.0-3"; sha256="01nncrf2p0yq49lhd5aq4hvhp8
 fftwtools = derive { name="fftwtools"; version="0.9-6"; sha256="00m4yapdkwfi4vrpg0yhakq2chma46mmbwhd9a15y61w97yzz7vb"; depends=[]; };
 fgac = derive { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; };
 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=[]; };
 fields = derive { name="fields"; version="7.1"; sha256="0wxm8pq4j5clz1hcgdlajasg5cbq8x35i82wrw3gsy27kslyadkd"; depends=[spam maps]; };
 fifer = derive { name="fifer"; version="1.0"; sha256="0vbkks6y6pacgpiixm10fbfa34lmk5r9kwd30lfjf0g7r51fhvv9"; depends=[xtable MASS]; };
@@ -3325,7 +3347,7 @@ fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp
 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.1"; sha256="1qmrf4lvvqhjsvnslhycy4wg7irsv7l8hr8g94l9p867cz42h58r"; depends=[httr stringr RJSONIO]; };
-fitdistrplus = derive { name="fitdistrplus"; version="1.0-3"; sha256="11v2qiiyfqrlkmc8y48nfzm6s98xabq3ipgkrzb3n8ylwqakdwdq"; depends=[survival]; };
+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=[]; };
@@ -3349,7 +3371,7 @@ 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]; };
 forecast = derive { name="forecast"; version="5.8"; sha256="1f8qfh9z02fhgarhfjp7j25fvsirly08ln8l91a3cg1y2vzi18sv"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
-foreign = derive { name="foreign"; version="0.8-62"; sha256="0niwi5fvj82l2arsqbpiwhidn3wfxjvciav0il8r118p7ivghvr9"; depends=[]; };
+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]; };
 forestplot = derive { name="forestplot"; version="1.0"; sha256="1sv50zqsszkldwq87c2am4547lqqm8fp29ql1z0bdqi6j6mzjkc6"; depends=[]; };
@@ -3376,8 +3398,8 @@ freestats = derive { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkm
 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]; };
-frm = derive { name="frm"; version="1.2"; sha256="128ya5gx27hywkhf9mivscxsk8rgf07c0y65fh15hp1c8m6dx0nz"; depends=[]; };
-frmhet = derive { name="frmhet"; version="1.0"; sha256="065lmmphz140r5gzspqkn6ch1mrlcwqb7rq7xb6sh0r9cizmqia3"; depends=[]; };
+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]; };
@@ -3439,7 +3461,7 @@ gambin = derive { name="gambin"; version="1.1"; sha256="197k8j6mvf8236gwg8vvfnsk
 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-1"; sha256="05x27vivz2acp7darja0x21l29ddlav6ch6l89a9s60v52zqflik"; depends=[maxLik Formula MASS stringr]; };
+games = derive { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[maxLik Formula MASS stringr]; };
 gamlr = derive { name="gamlr"; version="1.12-1"; sha256="17vfb3kac5y3xfw8s1m8czm5bq5z6x6lc43f2szj5lv84mf2r6y7"; 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]; };
@@ -3518,7 +3540,7 @@ geosphere = derive { name="geosphere"; version="1.3-11"; sha256="0gsbzbx7x4ly7df
 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.1.9"; sha256="1m6cihsm6k9l3kdp8chvsz5cqllbmk0mx08n8wp6zkaa02kl9izn"; depends=[Matrix raster sp abind numDeriv pracma]; };
 geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
-geotopbricks = derive { name="geotopbricks"; version="1.3.5.4"; sha256="065h5dd7qxjydblgkgj2amz8krscgf7ds61b923w3b4biin4s4q4"; depends=[raster stringr zoo]; };
+geotopbricks = derive { name="geotopbricks"; version="1.3.6"; sha256="1c4v590r27lsz2ld2dsi9dv7fsbfklyqgsjvcrbk4di18nc1hygp"; depends=[raster stringr zoo rgdal]; };
 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]; };
@@ -3544,6 +3566,7 @@ giRaph = derive { name="giRaph"; version="0.1.2"; sha256="137c39fz4vz37lpws3nqhr
 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.1.0"; sha256="1izas53whxa4n8gdkifv1a9c8f3fpi21vs81kn2dk51xmhs8qhh2"; depends=[jsonlite httr magrittr knitr]; };
+git2r = derive { name="git2r"; version="0.7"; sha256="02b4p7knrywr1sqijg85mxnm5y4mlp5z3rgylia8vdz473z6prr9"; depends=[]; };
 gitter = derive { name="gitter"; version="1.0.4"; sha256="1pvl8k8mb15mcfz1074y246s9basmi5vbpw2n1ca0d8wm5wdidap"; depends=[jpeg tiff logging PET ggplot2]; };
 glarma = derive { name="glarma"; version="1.3-0"; sha256="0fp354zxkddc4giynhwjlf9mg4sklcmqi0gdn8nxm1pkdpb86rba"; depends=[MASS]; };
 glasso = derive { name="glasso"; version="1.8"; sha256="0gcapw7kyxb19wvdyxq1vsmc5j7yyd0rvqxs2i71k31q352sg6zw"; depends=[]; };
@@ -3579,6 +3602,7 @@ glrt = derive { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n
 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-1"; sha256="14rm73h0kg7kb3dsd08mxbcp41y6a730nmpfnpndh4lsgkk6d5jb"; depends=[sandwich]; };
+gmnl = derive { name="gmnl"; version="1.0"; sha256="1nvk6x5412bfqdg54051hnisbnfm3d4yv9l2568jcz49pa8lay4d"; 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=[]; };
@@ -3709,13 +3733,14 @@ hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6
 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]; };
 highD2pop = derive { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
-highTtest = derive { name="highTtest"; version="1.0"; sha256="0iyr47nid147m9m8bsjjxc9kvjv68rgay4naxldwisyscqp8jl0m"; depends=[colorfulVennPlot]; };
+highTtest = derive { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; };
 highfrequency = derive { name="highfrequency"; version="0.4"; sha256="0kzadnkvmxcrb8flsxlx8vd9c2yad7hh1pij05dhdcpaidrc9acq"; depends=[xts zoo]; };
 highlight = derive { name="highlight"; version="0.4.4"; sha256="03mch5waqkzb9pb4llgalbxdfn3h6adh05f3i43kscssc67bs30l"; depends=[]; };
 highr = derive { name="highr"; version="0.4"; sha256="18qfh6v5h29g6y2fkgd4qnkl1ijzzjh369gvn9pzcgaapm6s2wpf"; 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]; };
 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"; sha256="1f7h963hqyhir3c26dyi0gvv5pf0a7x8sw2km3wh4ncwx2barfzq"; depends=[rcdd]; };
@@ -3771,7 +3796,7 @@ hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386
 hypred = derive { name="hypred"; version="0.5"; sha256="07jxpzh53qmv1vs2yhgnvxwcwkwpp6a12861i4a5n6pvwivw220d"; 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.1"; sha256="0nl5l17pm92ns40qzkmayc48a6i4j8w0562sp5jxyi95y4vb4aiy"; depends=[Rcpp msm Rcpp RcppArmadillo]; };
+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]; };
 iC10TrainingData = derive { name="iC10TrainingData"; version="1.0.1"; sha256="1x1kgxiib9l7whm2kmbv1s912hgpl7rdpqpn67nlkiswnr27hqn4"; depends=[]; };
@@ -3809,6 +3834,7 @@ ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgj
 igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; };
 igraphdata = derive { name="igraphdata"; version="0.2"; sha256="0hm757fc2snqlav3wx1vdmwy2gr5cskig97c2zlvk88sfwgx4i2m"; 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]; };
@@ -3843,7 +3869,6 @@ intRegGOF = derive { name="intRegGOF"; version="0.85-1"; sha256="0fyvhl6jmi6krfb
 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]; };
 intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3nj7wxkvs1s3nvz8cb456fnv72ng8fap"; depends=[survival]; };
-integrOmics = derive { name="integrOmics"; version="2.55"; sha256="1c9vkhvnndhs3h9qzcg3pvizjk9rhgk8gccaxh33spgr4rql8vcw"; depends=[]; };
 interAdapt = derive { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[shiny knitcitations RCurl mvtnorm knitr]; };
 interferenceCI = derive { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; };
 intergraph = derive { name="intergraph"; version="2.0-1"; sha256="03ycay3x4wd3j7r0mad9qgi4h77krapg613ans3jf9qa4ys2njlv"; depends=[network igraph]; };
@@ -3863,9 +3888,9 @@ ipdmeta = derive { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86
 ipdw = derive { name="ipdw"; version="0.2-1"; sha256="18qvw635dy9ddz16nn0j4s0n97nbyw7yb4a8v1m0f5v9prggj7py"; depends=[gdistance raster]; };
 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-3"; sha256="07mw1mdlczlpy232n2sacwncdjcsn6mv7rrzk9xvl2g85pn3bhjl"; depends=[rpart MASS survival nnet class prodlim]; };
+ipred = derive { name="ipred"; version="0.9-4"; sha256="0rig1sj0jqv2rrkgcr6fhr8477wxirxwnwk533l7rn6qr90prjwp"; depends=[rpart MASS survival nnet class prodlim]; };
 ips = derive { name="ips"; version="0.0-7"; sha256="0r4394xbchv6czad9jz4ijnfz8ss3wfdvh7ixrdxic2xrw0ic90v"; depends=[ape colorspace XML]; };
-iqLearn = derive { name="iqLearn"; version="1.2"; sha256="160nl63bxr9ira7v89ags9fm7zd5v09h1820i8bq5wxxfcyjarja"; depends=[]; };
+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]; };
@@ -3910,10 +3935,9 @@ jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jr
 jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
 jomo = derive { name="jomo"; version="0.1-2"; sha256="1d5bqcxbl5zpy3lqmf8k2khbwislf7smw9fknlgb99sf5p3w9ca0"; depends=[]; };
 jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
-js = derive { name="js"; version="0.1"; sha256="0jmfb4dmm0g1g14a9mwiqz3mcb8h46lbp781bjr0knfpzh5b20nc"; depends=[V8]; };
+js = derive { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; };
 jsonlite = derive { name="jsonlite"; version="0.9.14"; sha256="1dshp8c0a6mfn401s20jlab86jd86bb0fcfswcyjdm39y8sd81fz"; depends=[]; };
 jtrans = derive { name="jtrans"; version="0.1"; sha256="1wcrjyifsnpk9jfmwc1cx30qp5vavwl87i0avbbls8cmji7z0nay"; depends=[]; };
-jvmr = derive { name="jvmr"; version="2.11.2.1"; sha256="0h76b1596zil2m6fbhp38gchxwif942sldbfc6sgbn3ig9mz8zw5"; depends=[rJava]; };
 jwutil = derive { name="jwutil"; version="1.0.2"; sha256="01c2mjg719bqjzca1a0ac6q0af2jc95jb292smvrq4bx1bd5nwpi"; depends=[]; };
 kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; };
 kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
@@ -3994,7 +4018,7 @@ lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47r
 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.6.0"; sha256="0aw184r1w28d4lmznnx4hp8kwws0r13fmbx1wlsbg3zagmwwjn8d"; depends=[statnet_common network ergm sna mvtnorm abind coda]; };
-lattice = derive { name="lattice"; version="0.20-29"; sha256="0ip6qw1kry68dqj97bh8ddpq6gfsxf3n3axc6pn3zv2n1mfv6s9s"; depends=[]; };
+lattice = derive { name="lattice"; version="0.20-30"; sha256="10985l95p7mx403kz3pc8j5iqfsb1zz7w6hsw53xwd436ykf132j"; 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]; };
 lava = derive { name="lava"; version="1.4.0"; sha256="0zf62xk2j1gbwxqglq6lsxs3f7fb0hynnlfh1w870xz8imgf20yp"; depends=[numDeriv]; };
@@ -4008,6 +4032,7 @@ lazyWeave = derive { name="lazyWeave"; version="2.2.5"; sha256="18j31lbbplxvrz4w
 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]; };
+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]; };
 lcda = derive { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; };
@@ -4024,7 +4049,7 @@ leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j6
 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
 lefse = derive { name="lefse"; version="0.1"; sha256="1zdmjxr5xa5p3miw79mhsswsh289hgzfmn3mpj1lyzal1qgw1h5m"; depends=[ape picante geiger fBasics SDMTools vegan]; };
 leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
-lessR = derive { name="lessR"; version="3.1.1"; sha256="0cx5bvwfkrfy5im7x718ixf45aw22561b9w0vv0qp97y7xyjqja5"; depends=[car leaps MBESS foreign gdata triangle]; };
+lessR = derive { name="lessR"; version="3.2"; sha256="05d8xsf9n52l0hsvww4yk8wl14sw02yc0w4ajrzrjwb68sp75qf8"; depends=[car leaps MBESS foreign gdata triangle]; };
 lestat = derive { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
 letsR = derive { name="letsR"; version="2.0"; sha256="0z695c2mcswhw064cfq9nj7ai2mfxd9hjy764wgjdnwp4x1bnjh8"; depends=[raster maps XML geosphere fields maptools sp rgdal]; };
 lfe = derive { name="lfe"; version="2.0-1570"; sha256="0j3xbch6xk8zm4wbhs9lr60893r0dsqfvlvd8l13bqa3sq9xfhp6"; depends=[Matrix Formula xtable]; };
@@ -4032,13 +4057,13 @@ lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d
 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-8"; sha256="1ijv7k8y489zjsrms2laqr60r1ggx5v8d5kb16c6h6nkh8zrnw40"; depends=[spatstat sp raster RandomFields iterators ncdf rpanel fields maptools Matrix rgeos]; };
+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=[]; };
 lifecontingencies = derive { name="lifecontingencies"; version="1.1.5"; sha256="0v4rdq4ajd12ri1agn9i57nigxpgvg67clpskks761b7n1b6l77v"; depends=[markovchain]; };
 likeLTD = derive { name="likeLTD"; version="5.4.0"; sha256="09h1a4pn1i3vm3116yxvx07b62cbqmq84svpkbxykl4jmlqmwg8x"; depends=[DEoptim ggplot2 gtools rtf gdata]; };
-likelihood = derive { name="likelihood"; version="1.6"; sha256="11p7k6wpr7ypas414qir0hracy0960j8g3nwlhjbmynwmfzpkq1r"; depends=[nlme]; };
+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]; };
 limitplot = derive { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; };
@@ -4063,7 +4088,7 @@ lm_br = derive { name="lm.br"; version="2.6"; sha256="1f7cxd6ksspgpz2lnppyb466lg
 lmSupport = derive { name="lmSupport"; version="2.9.1"; sha256="11c86ji7srv80zlrp6c8ark312xzvajig8flc5qm77dgacik8daq"; 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"; sha256="0zvbliryh821hxxzr2d5irbjp50vkhdmrkzgphv9jnzqh7rr3hvm"; depends=[]; };
+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]; };
@@ -4087,6 +4112,7 @@ localsolver = derive { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j
 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]; };
 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]; };
 log4r = derive { name="log4r"; version="0.2"; sha256="07q8m7z2sxm6n25a62invf76qakxdsijfh3272spc8xrmdmyw6rj"; depends=[]; };
 logbin = derive { name="logbin"; version="1.0"; sha256="17vabb348kczn839mhwshn20qgrdnpd0ll81hb8bcsricm6dqhna"; depends=[glm2]; };
@@ -4167,9 +4193,10 @@ makeProject = derive { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spg
 mallet = derive { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
 managelocalrepo = derive { name="managelocalrepo"; version="0.1.4"; sha256="060r9wkrn2v6wij926l7qlxlw8k2zbgrmwf2awf1x6llfs4vaiby"; depends=[stringr assertthat]; };
 manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
-mapStats = derive { name="mapStats"; version="1.17"; sha256="1jnqchrrn2v1smzk1c3laycr2fs8x59c9mb8lhs4bxqbhhwgmi8p"; depends=[survey lattice maptools RColorBrewer Hmisc quantreg classInt sp colorspace reshape2]; };
+mapDK = derive { name="mapDK"; version="0.3.0"; sha256="03ksg47caxx3y97p3nsflwpc7i788jw874cixr9gjz756avwkmwp"; depends=[ggplot2 stringi]; };
+mapStats = derive { name="mapStats"; version="2.3"; sha256="0kws795f8s6rgbwyzjz90vzlh2ipp0c0mwdbsry5aasg4qj97ns0"; depends=[survey lattice maptools RColorBrewer Hmisc classInt sp colorspace reshape2]; };
 mapdata = derive { name="mapdata"; version="2.2-3"; sha256="1fhj34cgq6rniy0339qv2ghbs0aiq38h9jfwx7szb83yj37v7wm6"; depends=[maps]; };
-mapmisc = derive { name="mapmisc"; version="1.1.1"; sha256="0q30y243dava7zq2gz2dn5kbxc5m55cylhyzcwchrv2ax677x8yz"; depends=[sp raster]; };
+mapmisc = derive { name="mapmisc"; version="1.1.3"; sha256="10i99rd6ds1dr0b741sin43kkj6v7d4mky653kcz3mqq5904wnns"; 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=[]; };
@@ -4181,7 +4208,7 @@ 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.4"; sha256="09bqwv75mvfnjwbsz4v0zr9mmjdccwwgayiv7f6db48lngijng4f"; depends=[mime]; };
 marked = derive { name="marked"; version="1.1.6"; sha256="0f9sa4mdkiq1fn99sczb0glf5xfm17a3x8dq9ycf0l39fyg582d0"; depends=[lme4 R2admb truncnorm coda optimx ggplot2 Matrix numDeriv Rcpp plyr Rcpp]; };
-markovchain = derive { name="markovchain"; version="0.1.0"; sha256="1x299ila4s5bg9a2a87j4d8bpfajgxad5x9l3hjlghciki69080x"; depends=[igraph Matrix matlab expm]; };
+markovchain = derive { name="markovchain"; version="0.1.1"; sha256="1y4f4xf8557jq20yd8n2sl4sjhx2pkdjyr6fqikrfh1m4cydrz73"; depends=[igraph Matrix matlab expm]; };
 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]; };
@@ -4196,7 +4223,7 @@ matrixpls = derive { name="matrixpls"; version="0.5.0"; sha256="0r1qpfbvaq24d30c
 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]; };
 maxlike = derive { name="maxlike"; version="0.1-5"; sha256="0h544wr7qsyb70vmbk648hfyb6arrsb41gw39svcin412rhw9k9j"; depends=[raster]; };
-maxstat = derive { name="maxstat"; version="0.7-21"; sha256="0c83ykazj7np35sln8i87z29hg6dx1vsayfirc2pj533dzhhh9a8"; depends=[exactRankTests mvtnorm]; };
+maxstat = derive { name="maxstat"; version="0.7-22"; sha256="0fgpc5y3c5cidy7hxil10hxzdjxfmag2pp2ksh02z9smb8m0sdqb"; depends=[exactRankTests mvtnorm]; };
 mbbefd = derive { name="mbbefd"; version="0.6"; sha256="0lmidvganblkd1lxq4fy1rapzzdn89w3277nblw6nxjp33yx4nzm"; depends=[Rcpp Rcpp]; };
 mbest = derive { name="mbest"; version="0.1"; sha256="0dz54rgbl40cbrv6670qd441ymz43lj16dvd9fnq3znfafc1790n"; depends=[lme4]; };
 mblm = derive { name="mblm"; version="0.12"; sha256="17h65bapvz89g5in3gkxq541bxgpj9pciz6i5hzhqn0bdbsb3k6r"; depends=[]; };
@@ -4282,7 +4309,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.0"; sha256="15kz3n7gx40il4sagnp5qc7c31dk1phdb932289lc0xknrb8k00a"; depends=[MASS mice mvtnorm pan sirt lme4 MBESS pls mitools bayesm Rcpp inline car foreign Rcpp RcppArmadillo]; };
+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]; };
 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]; };
@@ -4324,7 +4351,7 @@ mixcat = derive { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb
 mixdist = derive { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
 mixer = derive { name="mixer"; version="1.8"; sha256="1r831jha7qrxibw5m3nc3l6r887ihzxzsj65yjnbl5cf5b8y19bb"; depends=[]; };
 mixexp = derive { name="mixexp"; version="1.1.9"; sha256="1qr6gad3fjwxjngjb7iqhspkkwzj1c77v140ap2vdrcygsd6ncd1"; depends=[gdata lattice daewr]; };
-mixlm = derive { name="mixlm"; version="1.0.8.1"; sha256="0ygfi6sw3yl4fpx27kvb8hqspj4ndylm9135avvcjqj9b5jlvb68"; depends=[multcomp pls pracma leaps lme4 car]; };
+mixlm = derive { name="mixlm"; version="1.0.8.3"; sha256="0959mqxiakjpl0yniq2nd5jj6bfm1prslpnv6kijg0lwx7w7x4hf"; depends=[multcomp pls pracma leaps lme4 car]; };
 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=[]; };
@@ -4361,10 +4388,12 @@ mmeta = derive { name="mmeta"; version="2.2"; sha256="06zkazi97f3il2vlx4f8c7zz4k
 mmm = derive { name="mmm"; version="1.4"; sha256="1nydian004nldqhyw3x15w6qfml2gkjc0x8ii54faz563byjv3d8"; depends=[gee]; };
 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]; };
 mnormpow = derive { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; };
 mnormt = derive { name="mnormt"; version="1.5-1"; sha256="1msxbdlg4wb45lsg0m4hqf41qglnmbqw55815v8qvyfjkwrgns8b"; depends=[]; };
 mobForest = derive { name="mobForest"; version="1.2"; sha256="198air7fplgiw86vs7m4dn4kai0gpnnmv14bykbw3lnaxk4fk8fd"; depends=[party lattice modeltools]; };
+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=[]; };
@@ -4374,6 +4403,7 @@ modiscloud = derive { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xka
 moduleColor = derive { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut]; };
 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]; };
+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=[]; };
 monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbca9ahdra9cid1piidwhjc4f6vqsbkp479"; depends=[tuneR]; };
@@ -4413,7 +4443,7 @@ msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0n
 msSurv = derive { name="msSurv"; version="1.1-2"; sha256="1nyadgzwdyf48qhqdx8sszvgkhxafacnccacg39ghm6gqv8b5j60"; depends=[class 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.1"; sha256="0bd9am0dyrs9x8xj6rccgqcx15ddag1fakjzpyw43n3zi0h24fa6"; depends=[Matrix MASS]; };
+msda = derive { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[Matrix MASS]; };
 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]; };
 msgpackR = derive { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
@@ -4428,12 +4458,12 @@ mtk = derive { name="mtk"; version="1.0"; sha256="0vq2xlxf86l92fl91qm8m4yfjyz1h8
 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]; };
-multcomp = derive { name="multcomp"; version="1.3-8"; sha256="0bywqyv9fvl08bggz36x24p9qqbwzvqmcik901x5yi99062xg7dl"; depends=[mvtnorm survival TH_data sandwich]; };
+multcomp = derive { name="multcomp"; version="1.3-9"; sha256="1makqj75d7nfklxmbmxrgr9285ssjviy6nybsbm0ygx43l1r05xj"; depends=[mvtnorm survival TH_data sandwich]; };
 multcompView = derive { name="multcompView"; version="0.1-5"; sha256="0vfgvqxqgxyifkqs3r5xxj7rfn8lfmby6wyyiqa5jv01073xchib"; depends=[]; };
 multgee = derive { name="multgee"; version="1.5.0"; sha256="1wa4pfvn4q77j4h6drvzysr3syni92z2yp2nppvzfpd29aib1fyd"; 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]; };
-multiPIM = derive { name="multiPIM"; version="1.4-1"; sha256="0r69gkl8k6dd2rafrwvrdkpz4jlffz1g6czspsi908jf9dyw8y72"; depends=[lars penalized polspline rpart]; };
+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]; };
 multic = derive { name="multic"; version="0.3.8.1"; sha256="06lc9kn0z3s7x00hz8vj903q0c6cncnj4v3ygvd2yvkgcbhfvjd0"; depends=[]; };
@@ -4451,7 +4481,7 @@ multirich = derive { name="multirich"; version="2.0.2"; sha256="1lqc4np45p9ar9l8
 multisensi = derive { name="multisensi"; version="1.0-8"; sha256="168g6hym5chz69wa3vfprg1m1c935wh7bi3gfz5calxiqf89mncz"; depends=[]; };
 multispatialCCM = derive { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
 multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; depends=[]; };
-multitaper = derive { name="multitaper"; version="1.0-10"; sha256="07basffympz859srjbgk524h081mibz6czrpiv06g44idwyi1bz3"; depends=[]; };
+multitaper = derive { name="multitaper"; version="1.0-11"; sha256="1s0lmjzpyd7zmc2p1ywv5fm7qkq357p70b76gw9wjlms6d81j1n4"; depends=[]; };
 multivator = derive { name="multivator"; version="1.1-4"; sha256="125ifkpm1pny4rjpzirnwpmpjfg0y8w0rygj0way0p1qwm0l207n"; depends=[emulator mvtnorm]; };
 multiwayvcov = derive { name="multiwayvcov"; version="1.2.1"; sha256="15gxcrg2i1aqbxkif5dmdz81yzqj7a4hq0dcd0narzsvm5b4w9py"; depends=[sandwich boot]; };
 multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
@@ -4487,7 +4517,7 @@ mvsf = derive { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld7
 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"; sha256="0ig8p34d1v7jzdjp7yy5f6jv6najlnj5xk198fy6dcwmzgm4pjl5"; depends=[cem rJava MASS]; };
+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]; };
@@ -4525,7 +4555,7 @@ 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]; };
-nephro = derive { name="nephro"; version="1.0"; sha256="0dv6gj1q6qrg9y6cpf230q1mksqk3nvzj3afavhrwz1fcz2w22f4"; depends=[]; };
+nephro = derive { name="nephro"; version="1.1"; sha256="06lxkk67n5whgc78vrr7gxvnrz38pxlsj4plj02zv9fwlzbb9h6p"; depends=[]; };
 nestedRanksTest = derive { name="nestedRanksTest"; version="0.1"; sha256="12pqxldyzy2i2gc575rx67zdfb8c9j0fv400nw509cwx5w6ya35x"; depends=[]; };
 netClass = derive { name="netClass"; version="1.2.1"; sha256="04yrj71l5p83rpwd0iaxdkhm49z9qp3h6b7rp9cgav244q060m9y"; depends=[kernlab Matrix ROCR igraph samr]; };
 netassoc = derive { name="netassoc"; version="0.4.1"; sha256="1rwswa70n6j3s779cq3ddg8kgj17bx5iqya1rrspqd7rjj95k1bk"; depends=[igraph]; };
@@ -4556,7 +4586,7 @@ nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz4
 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.5"; sha256="1p9m9ryp58xca9arl798cmslfjvxb3w5hdg3bs62yham1q951a48"; depends=[]; };
-nlme = derive { name="nlme"; version="3.1-119"; sha256="0p8f45d857k8zpapp15diqnhkwlrkg01akm9iwzyqqwc58kjd4a8"; depends=[lattice]; };
+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]; };
 nlmrt = derive { name="nlmrt"; version="2013-9.25"; sha256="0z2ih61rpqzk64qagiwbx396vwb28jhqk8b4kxchca0il3fzqqav"; depends=[]; };
@@ -4593,6 +4623,7 @@ nose = derive { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp
 notifyR = derive { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; };
 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]; };
 npRmpi = derive { name="npRmpi"; version="0.60-2"; sha256="10gify91m9jsbghdgkwjz57qn6ybj4i239caflm9vkrfxsg6yx2d"; depends=[boot cubature]; };
 nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
 nparcomp = derive { name="nparcomp"; version="2.5"; sha256="0s865cqy29m5wiwndbmw3sl6m86f3zjbjr41924zd4alxkhm1wbi"; depends=[multcomp mvtnorm]; };
@@ -4602,7 +4633,7 @@ npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2
 nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
 nplr = derive { name="nplr"; version="0.1-1"; sha256="0br7flriqbig8frq0j4lxiv6i8bwgsj422faln85ga93hnlky0a1"; depends=[]; };
 npmlreg = derive { name="npmlreg"; version="0.46-1"; sha256="1gddl6diw8ix8vz7n1r4ps9cjx3q00mafpapskjk7pcz69m6hfv1"; depends=[statmod]; };
-npmv = derive { name="npmv"; version="2.1"; sha256="0ivd3wm1fmmaq8i2h0kdd11z9k1czb61ms8fj0xb5xmfy0g1rphy"; depends=[Formula ggplot2]; };
+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]; };
 npsp = derive { name="npsp"; version="0.3-6"; sha256="1wiv4gp3y1c26xaq8zssias3j3h8mpb6izcmcarghvnfhj32l8jb"; depends=[quadprog]; };
@@ -4621,7 +4652,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=[]; };
-oaxaca = derive { name="oaxaca"; version="0.1"; sha256="1nhdxivmxacywxl7bjxfbs5p6lsvk55l5d5c4mvbpq3bw125a29c"; depends=[Formula ggplot2 reshape2]; };
+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]; };
 objectSignals = derive { name="objectSignals"; version="0.10.2"; sha256="1rcgfq1i3nz2q93vv4l069f3mli1c6fd5dhhhw1p7cc4sy81008w"; depends=[]; };
 obliclus = derive { name="obliclus"; version="0.9"; sha256="000r1dx4zbgjxrfs66c1yazm0w6q2z0z1scf45g2qj5ykcm9ylma"; depends=[]; };
@@ -4694,7 +4725,7 @@ orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh
 osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
 osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; };
 ouch = derive { name="ouch"; version="2.8-4"; sha256="1kx6qjvc8zlcxihqfxs288hwwh9m05s5544w4c6m1wc02083b735"; depends=[subplex]; };
-outbreaker = derive { name="outbreaker"; version="1.1-4"; sha256="1vvgkvrijrzabj50w36pgqd90krnp18grml5m3gvhnnm0y1ghry5"; depends=[ape igraph adegenet]; };
+outbreaker = derive { name="outbreaker"; version="1.1-5"; sha256="1k39pzqbjah4dwwjyaccb13c1aww8i4kdfjanxc4hzkl8av7s8db"; depends=[ape igraph adegenet]; };
 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=[]; };
@@ -4713,7 +4744,7 @@ packHV = derive { name="packHV"; version="1.8"; sha256="0dr2picjd7mm633vw29524f3
 packS4 = derive { name="packS4"; version="0.9.1"; sha256="01kkw5g3xcn9hhfglmfvwsryid0w4vw9azh6as8l8d5i1xjyp9k7"; depends=[]; };
 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.2.0"; sha256="04kqa34qz1bvx3rbq50f0djmmxgm40cip28fb7mj4icm1l9z2x8m"; depends=[devtools]; };
+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=[]; };
@@ -4747,14 +4778,15 @@ parfossil = derive { name="parfossil"; version="0.2.0"; sha256="12gsc5n4ycvhzxvq
 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=[]; };
 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]; };
 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]; };
 partsm = derive { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; };
-party = derive { name="party"; version="1.0-19"; sha256="1k5416xz7r1m34gd80d69p1b08j7ncmyxv83kgn7isnj97r2dybh"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; };
-partykit = derive { name="partykit"; version="0.8-4"; sha256="18xpffvf5a44gkfqdjapw2l5c9xrr7z3dkmhd7fl69gz27mnqmwy"; depends=[survival]; };
+party = derive { name="party"; version="1.0-20"; sha256="10d4hyzc8icgb51k4dkc1bwprky7sg35vpa9s3jcl9ifw6na0bgm"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; };
+partykit = derive { name="partykit"; version="1.0-0"; sha256="1kd7hrcivvl638l7frgjz8qp8nz52h0yz5kypgqfma84jqfvd6ca"; 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]; };
@@ -4840,7 +4872,7 @@ phangorn = derive { name="phangorn"; version="1.99-12"; sha256="0yp2ih3f15xx1vd4
 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="0.7.7"; sha256="0zj6n6cjkim20apihl943rhzxlmkmpqwh00l6h2c8z04m3pv186v"; depends=[RColorBrewer]; };
-phenability = derive { name="phenability"; version="1.0"; sha256="19vxknc0v8vz5cd748fhsndsrpggzlsiims9j7p2s6jlankkgsz9"; depends=[calibrate]; };
+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]; };
@@ -4905,7 +4937,7 @@ plsRglm = derive { name="plsRglm"; version="1.1.1"; sha256="1bx1pl1pv47z3yj3ngkd
 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.2-6"; sha256="1yif4h556xjadlfp31nm6aqhd3md983sppwmbh7mg95dffxnd3im"; depends=[MASS]; };
-plspm = derive { name="plspm"; version="0.4.1"; sha256="00ibz69vhf0x3c73khkg57mzw49c3vq20yiqdqm9cpkdr9fczn2n"; depends=[amap diagram tester turner]; };
+plspm = derive { name="plspm"; version="0.4.2"; sha256="0q7mx5ydw61z1qcs0flpwpnnrcwsfsh3razc8jnd4z1xn96i3x85"; depends=[amap diagram 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=[]; };
@@ -4960,11 +4992,11 @@ portes = derive { name="portes"; version="2.1-3"; sha256="0nqh6aync5igmvg7nr5ink
 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=[]; };
-poweRlaw = derive { name="poweRlaw"; version="0.20.5"; sha256="03s4kn01q4v2wx2y5pglqycjr37076g9alp9kz915h0ckfv1i42f"; depends=[VGAM]; };
+poweRlaw = derive { name="poweRlaw"; version="0.30.0"; sha256="087817n01x0rlvm6hizmlm74hd0vkw0zy57i9n9yjkb9zlnsz7lm"; 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]; };
-powerMediation = derive { name="powerMediation"; version="0.1.7"; sha256="1nysqyz5rbpn25k1pi9g7gwiarm8ncyw5xxal972wv8c70lsn4ir"; depends=[]; };
+powerMediation = derive { name="powerMediation"; version="0.2.3"; sha256="0i4qyjcmw2zvpdgq520kjzf38hddsrjwf0vlg4ylv1kaav7jzgsr"; depends=[]; };
 powerSurvEpi = derive { name="powerSurvEpi"; version="0.0.6"; sha256="1jsbrj35m296mkk47zcpb2haain6bf23k0xzphnb4sq8f06cmq1p"; depends=[survival]; };
 powerpkg = derive { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
 powerr = derive { name="powerr"; version="0.1-3"; sha256="0scarwipq8095hvj7ij849l10q2g7g5z66ws7r72apdvxs5nvxnj"; depends=[Matrix Rcpp Rcpp RcppEigen]; };
@@ -4980,6 +5012,7 @@ pracma = derive { name="pracma"; version="1.8.3"; sha256="06711w5451gb22667i5dx2
 pragma = derive { name="pragma"; version="0.1.3"; sha256="1n30a346pph4d8cj4p4qx2l6fnwhkxa8yxdisx47pix376ljpjfx"; depends=[]; };
 praktikum = derive { name="praktikum"; version="0.1"; sha256="0kkydgglvqw371fxh46fi86fmdndhwq1n8qj0ynbh2gz1cn86aw1"; depends=[]; };
 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]; };
 predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
@@ -5016,7 +5049,7 @@ proteomics = derive { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbz
 protiq = derive { name="protiq"; version="1.2"; sha256="1d5wr9w540a79i57nr0arn5xg7s6jhhy5nrgsk8r3ljidld2s2sa"; depends=[mvtnorm]; };
 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.4"; sha256="00rqwh2zhdaf1m3gb1skczpck9svfgjyayx6f71i9fbqilmhqaz1"; depends=[]; };
+protoclust = derive { name="protoclust"; version="1.5"; sha256="03qhqfqdz45s8c1p8c6sqs10i6c2ilx4fz8wkpwas3j78lgylskg"; depends=[]; };
 protr = derive { name="protr"; version="0.5-1"; sha256="1ji0vpy9rrrvbsfwi4823ywi5zbwl57zw1glxllxgwyv9l6v4bpb"; depends=[]; };
 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]; };
@@ -5043,11 +5076,13 @@ pt = derive { name="pt"; version="1.0"; sha256="0hjijfmc9dip3ys8xg44w0fwvyzyjyjl
 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]; };
+pullword = derive { name="pullword"; version="0.1"; sha256="1mxv63q2nfnhxcn8m17d40w792l1i7diykg6h0i42pj0rsa4ww36"; depends=[RCurl]; };
 pumilioR = derive { name="pumilioR"; version="1.3"; sha256="1zmcdp978p73bh9fdshxlrzgfg18j007xgxgr439rq90bwiwva6j"; depends=[XML RCurl]; };
 pushoverr = derive { name="pushoverr"; version="0.1.4"; sha256="1qa7cajgri3dwlvbpwn244m92n3q3apl4m5420mzsa9ngnmm8hj1"; depends=[httr]; };
 pvar = derive { name="pvar"; version="2.2"; sha256="1f58czx14shd02ijyxhn46yrvfh44wrpifja8cjv522gbkrcr7yf"; depends=[Rcpp 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]; };
 pwr = derive { name="pwr"; version="1.1.1"; sha256="1is6kqqjf3bzsddj4advj8qcp30rz2zlqc0g98072m96nmq5ywgn"; depends=[]; };
 pwt = derive { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
@@ -5187,7 +5222,7 @@ rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0
 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]; };
 raster = derive { name="raster"; version="2.3-24"; sha256="0397brw7fmfzc55p3v8isc22hksh2bzq64a2iwac52hf0bvl0fzn"; depends=[sp]; };
-rasterVis = derive { name="rasterVis"; version="0.32"; sha256="040cg1v30ixkjkibqjpvz94wz486ffsrsnpfgzlp302xvvsmb3dk"; depends=[raster lattice latticeExtra hexbin sp zoo RColorBrewer]; };
+rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24zzj5m5srcka1wr26dpxfjxxsyilg6frp83r"; depends=[raster lattice latticeExtra sp zoo hexbin RColorBrewer]; };
 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]; };
@@ -5295,8 +5330,8 @@ revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkj
 reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
 rex = derive { name="rex"; version="0.2.0"; sha256="1q9dkk94w152naw1lpd2l2v08ikrfgilqx9v5z14dyqaascqbmva"; depends=[magrittr lazyeval]; };
 rexpokit = derive { name="rexpokit"; version="0.24.1"; sha256="143zi6qb0l8vbx87jf58v1zfxqmvv6x4im1knd6q4dpp9gffqs22"; depends=[SparseM Rcpp Rcpp]; };
-rfPermute = derive { name="rfPermute"; version="1.6.1"; sha256="1fpj0wjaxfqcp6z0azkmgqjsysgpm0vgg81pi6w9xs6a5nwa6wd1"; depends=[randomForest ggplot2 gridExtra]; };
-rfUtilities = derive { name="rfUtilities"; version="1.0"; sha256="020wwrbpfzi7pl6vf80gsi8qc4fqr9hsxnyj5qzab1axzdqq9hjq"; depends=[randomForest e1071]; };
+rfPermute = derive { name="rfPermute"; version="1.6.2"; sha256="069dhv41bwyp2nywkrr2hihyz8zialhxlyzpfpq4r9lyjnamg2k9"; depends=[ggplot2 randomForest gridExtra]; };
+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]; };
@@ -5313,7 +5348,7 @@ rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w
 rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; };
 rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
 rgl = derive { name="rgl"; version="0.95.1201"; sha256="0vd2zww17p2lcdipv7ijclbisy6ms6d1a4qnwpj1y1kbkhcplw1j"; depends=[]; };
-rglobi = derive { name="rglobi"; version="0.2.4"; sha256="1rz2dn0llx8jjd1ah9ajw9hv63rjbvkhihp81af48s4kr2g8bmim"; depends=[rjson RCurl]; };
+rglobi = derive { name="rglobi"; version="0.2.5"; sha256="1dym9h5lcmzz3378cxy5yq8ps8fygmz614hw4bpfmjpx6whscada"; 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.10"; sha256="1gmr4px70dwz45zb4w1vqddqpw1idln2rids9cdh2fxppdf9m9x8"; depends=[MASS fastICA]; };
@@ -5337,6 +5372,8 @@ riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww9
 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.39.4"; sha256="1al0ylmpvkxfhkv9i4j6pvrlqn13pdwmzs7s6vazmgmkl3iggav4"; depends=[]; };
+rivr = derive { name="rivr"; version="0.9.1"; sha256="0rdrgsvxmkqwx65w7pz1sg5mkbqbi7c52cfyk7qzpvfgi5glp9zn"; depends=[Rcpp reshape2 Rcpp]; };
+rjade = derive { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
 rjags = derive { name="rjags"; version="3-14"; sha256="1hfsa8jl5imk2j2qnafa5q95zn69bhvijdpvfs64vsiqsalsg7yk"; depends=[coda]; };
 rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
 rjson = derive { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
@@ -5345,7 +5382,7 @@ rkt = derive { name="rkt"; version="1.3"; sha256="0d82id22xac84l5iqls0mlg1g9yn4h
 rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; };
 rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
 rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[yaml jsonlite]; };
-rlm = derive { name="rlm"; version="1.0"; sha256="0dcbrdk4yjcv96rjnqc8sq821kwk7bsg66pn2hsblcpb14l23hhf"; depends=[]; };
+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]; };
 rmaf = derive { name="rmaf"; version="2.0"; sha256="00qhdfzbjvmz83nicl73yhx7w8sv6j7x928j4vd6ll79098x4y84"; depends=[]; };
 rmarkdown = derive { name="rmarkdown"; version="0.5.1"; sha256="08v16n4a9rdr0fh54hlmfxifbpl40nfr24g3wrjxxacml16smcsd"; depends=[knitr yaml htmltools caTools]; };
@@ -5399,13 +5436,13 @@ rowr = derive { name="rowr"; version="1.1.1"; sha256="1bpx9vd6i2ljwww3gp4c1fxbv9
 roxygen2 = derive { name="roxygen2"; version="4.1.0"; sha256="0jpaqrnkb6qfs6jly637j8sbng6r1gzw15phwkifsh0fgqbi61ap"; depends=[stringr brew digest Rcpp Rcpp]; };
 royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[nortest moments]; };
 rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
-rpart = derive { name="rpart"; version="4.1-9"; sha256="11v8hrk8pz66naadsa1sk7bwij30rzm3m315y3q9i6gl4rlr8qca"; 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]; };
 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]; };
-rpg = derive { name="rpg"; version="1.2"; sha256="13vvym3xf70fmm57nl56dc5wvvv9va9id2agxlzxd9yrhlxbcnhm"; depends=[Rcpp uuid RApiSerialize Rcpp RApiSerialize]; };
+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="0.12.1"; sha256="13n5xysa1pi5pcbq80w268ybqc414i56d4hpln0yl6zva6dgpsqd"; depends=[dplyr RSQLite Rcpp DBI data_table lubridate reshape2 stringi assertthat Rcpp]; };
 rplos = derive { name="rplos"; version="0.4.6"; sha256="01vfb07fc5z0pm6d5wvcpfwjx5fha9par3fpra9v6snaqm74l3w5"; depends=[ggplot2 httr jsonlite XML dplyr plyr lubridate reshape2 whisker solr]; };
@@ -5416,7 +5453,7 @@ rpsychi = derive { name="rpsychi"; version="0.8"; sha256="1h40kbqvvwwjkz5hrclj6j
 rpubchem = derive { name="rpubchem"; version="1.5.0.2"; sha256="0lvi7m8jb2izsfia3c0qigsd1k1x9r02gymlwfg29pb8k10lwcjf"; depends=[XML car RCurl RJSONIO]; };
 rpud = derive { name="rpud"; version="0.0.2"; sha256="03xddc6kh39wlcv8dvpnv4h0f5qx5cv327xip26zk7gg7pgrn05x"; depends=[]; };
 rqPen = derive { name="rqPen"; version="1.0"; sha256="1vd2kjbqb5jqvbciagw03fp28ljswifznkdqj34q753kzvryblri"; depends=[quantreg]; };
-rr = derive { name="rr"; version="1.0"; sha256="18h35whflnqzr7fkaqlwq73w9s1vbpk8nm5i5ww4wgz20wxm8l87"; depends=[MASS arm coda]; };
+rr = derive { name="rr"; version="1.1"; sha256="1xdr0440gzv3xpllqxk6g9hny5njrbn4fdcg1hr4fqhagp18ziac"; depends=[MASS arm coda]; };
 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]; };
@@ -5562,7 +5599,7 @@ seem = derive { name="seem"; version="1.0"; sha256="0cjdi9c89bqvrx9gzxph958cfqic
 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]; };
-segmented = derive { name="segmented"; version="0.5-1.0"; sha256="15bxn998n38hja7hbjfc8yjfbmqxsgh9xsp2l19b1w35r72hc3sd"; depends=[]; };
+segmented = derive { name="segmented"; version="0.5-1.1"; sha256="0rkbhg8wwqk08jfd29sh4ifx427kmd4mfqrssllckha9hcglqhz7"; depends=[]; };
 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]; };
@@ -5615,11 +5652,11 @@ sglasso = derive { name="sglasso"; version="1.1-0"; sha256="1iyj8clk2ibj94nxh1xi
 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.0"; sha256="1dg5ki1qgghzwl49vsjpvl47s8kh46iag5krknczfcahk4fq0knp"; depends=[maxLik]; };
+sgt = derive { name="sgt"; version="1.1"; sha256="0j4xxh5lypcl0hyfx7gzrhb40z36ygn97hf1nl6m8wj4dncg39jf"; depends=[maxLik]; };
 shape = derive { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; };
 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.6-3"; sha256="1dpcyd1wi022zcs9s48xg3wzy17dqcd0622ak0phvbwxgpwmz9j2"; depends=[aqp ape igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; };
+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]; };
 shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
@@ -5727,7 +5764,7 @@ soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn
 softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; };
 softclassval = derive { name="softclassval"; version="1.0-20130317"; sha256="1ifqm4a3xxi9wd4l1q4l5h4q5f8hp0k28mqpszzj8k1czbph88ql"; depends=[arrayhelpers]; };
 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.3-2"; sha256="0rpkj9rjk75nz4dp0hkp4xjmd5s4lwppabbdqppwc5xs0565rdb6"; depends=[RODBC aqp plyr Hmisc]; };
+soilDB = derive { name="soilDB"; version="1.5-2"; sha256="1xiiprshh40qkx23wxd20rd7bsbwgw03pa0hv8m6q64pri7v8xq0"; depends=[aqp plyr Hmisc RCurl XML sp]; };
 soilphysics = derive { name="soilphysics"; version="2.0"; sha256="0gsxpndin79n8ygwjzdaf8njkqrf6y805m3gd19cyyz9iz6g9yfb"; 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]; };
@@ -5757,7 +5794,7 @@ spMC = derive { name="spMC"; version="0.3.6"; sha256="0h71m55jmv80kx5ccsrpsakrh4
 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]; };
 spa = derive { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
-spaMM = derive { name="spaMM"; version="1.4.1"; sha256="1dz6kx64g69i8fv87ws74a3j33hssshii15qf99brrs5dsd16jfz"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp nlme Rcpp RcppEigen]; };
+spaMM = derive { name="spaMM"; version="1.5.1"; sha256="1sv5ndg7jmyivwkj7y7i4da862qb8p3z7m83vmbphwbykpl7jfs5"; depends=[Matrix MASS lpSolveAPI proxy geometry Rcpp nlme 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]; };
@@ -5790,7 +5827,7 @@ spatial = derive { name="spatial"; version="7.3-9"; sha256="12qhfqmznij1jddjklhl
 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]; };
 spatialCovariance = derive { name="spatialCovariance"; version="0.6-8"; sha256="06z6jz9sadqc382w07ysnnlhqc96hxaasz9wncbhipd4cd1y4daa"; depends=[]; };
-spatialEco = derive { name="spatialEco"; version="0.1-0"; sha256="1ks44g6np9q1yf4mr0wgijjvf8lvjpgkyfwjcj2d9938fng6p74x"; depends=[RANN rms sp raster spatstat cluster spdep SDMTools RCurl rgeos]; };
+spatialEco = derive { name="spatialEco"; version="0.1-1"; sha256="1k7xdgg541mwr9rk3h8pi7hgb61wza14azvmbxqd92m29p2yqn00"; depends=[RANN rms sp raster spatstat cluster spdep SDMTools RCurl rgeos]; };
 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]; };
@@ -5808,7 +5845,7 @@ spd = derive { name="spd"; version="2.0-0"; sha256="0aznzj68gynhx295gdb4sb7xxjiy
 spdep = derive { name="spdep"; version="0.5-83"; sha256="14j2sr6c225pmfclq2v8d3dfkib0vy3y8cawdilybd8s96zlbd8f"; depends=[sp Matrix LearnBayes deldir boot coda nlme MASS]; };
 spdynmod = derive { name="spdynmod"; version="1.0"; sha256="05gaaln14lrrds43l2f9hw43c86gswyzymz97hc3mci1cgiwfwbz"; depends=[deSolve raster animation]; };
 spe = derive { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
-speaq = derive { name="speaq"; version="1.2.0"; sha256="1af5ivics0sc69s11fabjs93g2yfjxcls4j2hnb9abksih9hvd2n"; depends=[]; };
+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.125"; sha256="06d7l3hv1yi887yd3ig63n2ajyxa7a0cpjaza8spif9yj5jia35d"; depends=[Rssa raster nnet abind RNetCDF ncdf_tools foreach JBTools DistributionUtils RColorBrewer]; };
@@ -5837,6 +5874,7 @@ splusTimeSeries = derive { name="splusTimeSeries"; version="1.5.0-73"; sha256="1
 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]; };
 sporm = derive { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
+sprex = derive { name="sprex"; version="1.0"; sha256="0m0v0db01a3zd934ini60hqnkc6cfyj8hbsxp2xvw06lblg46dzh"; 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]; };
@@ -5859,6 +5897,7 @@ ssd = derive { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13
 sse = derive { name="sse"; version="0.5-1"; sha256="0g0bwmgc585haqbb13366s3pv1vdh793hwwibz7im0avjs2ldsjq"; depends=[lattice]; };
 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=[]; };
 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=[]; };
 sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
@@ -5895,12 +5934,13 @@ stocc = derive { name="stocc"; version="1.23"; sha256="183rv1l1hpa691f3xf455bv8d
 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]; };
 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=[]; };
 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]; };
 strap = derive { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
-strataG = derive { name="strataG"; version="0.9.2"; sha256="1yrq12aq3sb27pz8hxz48klp2rvnnz96b8yaaa3a65m3g5vcjrmd"; depends=[swfscMisc pegas ape MASS reshape2 Rcpp]; };
+strataG = derive { name="strataG"; version="0.9.4"; sha256="0lxp6s0gfqxyla7mx19fbx6w8am3islv02iyyixi94xbwphpcqf3"; depends=[swfscMisc pegas ape MASS reshape2 Rcpp]; };
 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=[]; };
@@ -5942,7 +5982,7 @@ survAUC = derive { name="survAUC"; version="1.0-5"; sha256="0bcj982ib1h0sjql09zb
 survAccuracyMeasures = derive { name="survAccuracyMeasures"; version="1.2"; sha256="1i41xkvqpxpq9spryh1syp57ymlzw71ygdjqn41rv8jjc9q52x9g"; depends=[survival Rcpp Rcpp RcppArmadillo]; };
 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]; };
-survMisc = derive { name="survMisc"; version="0.4.4"; sha256="0ir84sb2gj1aqglifrxx66sjirxgz3bkgyh1l2vcmyndnad871jr"; depends=[survival ggplot2 KMsurv combinat Hmisc zoo data_table km_ci gridExtra rpart gam]; };
+survMisc = derive { name="survMisc"; version="0.4.5"; sha256="137k453v6jsl07s0qks0wf452lxx3klbqqic52jj9yzgr6ic3xig"; depends=[survival ggplot2 KMsurv combinat Hmisc zoo data_table km_ci gridExtra rpart gam]; };
 survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; };
 survRM2 = derive { name="survRM2"; version="1.0"; sha256="19lfs66x2zh7cd4s04ry3sd75q4fm8a3xmpl1b0jzvldhnq2yrgz"; depends=[survival]; };
 survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[survival Rcpp lattice foreach xtable Rcpp]; };
@@ -5950,7 +5990,7 @@ surveillance = derive { name="surveillance"; version="1.8-3"; sha256="10d170l0ah
 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]; };
-survival = derive { name="survival"; version="2.37-7"; sha256="1ihs42gjbw06aj5hz128964lshpi934cyc8npv9c8ann4mc2r3b5"; 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=[]; };
 survrec = derive { name="survrec"; version="1.2-2"; sha256="0b77ncr1wg2xqqg1bv1bvb48kmd9h3ja2dysiggvprzjrj7hdlmx"; depends=[boot]; };
@@ -5993,9 +6033,11 @@ synbreedData = derive { name="synbreedData"; version="1.4"; sha256="0pfpvg4wvxfw
 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.0-0"; sha256="1ifdzfql2a9gn021l5f93qrx30db48hpq43c5zanmb2zdqb8zc16"; depends=[lattice MASS nnet rpart party]; };
+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.4"; sha256="0y33ykcxynm90inq8s5phdg3mfkx30szqld75h0b2faykpv6q3r4"; depends=[]; };
 systemfit = derive { name="systemfit"; version="1.1-14"; sha256="0f33v96awyhxw3i6zr6whdz91hbfi7vwnfs0bz7xsrjcinqhm6h5"; depends=[Matrix car lmtest sandwich]; };
+syuzhet = derive { name="syuzhet"; version="0.2.0"; sha256="1l83wjiv1xsxw4wrcgcj3ryisi7zn4sbdl0sail0rhw0g9y9cz76"; depends=[openNLP NLP]; };
+tRakt = derive { name="tRakt"; version="0.9.0"; sha256="16ikqzqz78f6bw00ir465d30qzqq0znl9ynh49wmz6cmyr7s8i66"; depends=[httr jsonlite lubridate plyr stringr]; };
 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="2.1.3"; sha256="0ypb11gvasx7mdkpysfjvxb61660sdaggp6l43iyp2grfrilkm7y"; depends=[survey survival gee]; };
@@ -6112,6 +6154,7 @@ transport = derive { name="transport"; version="0.6-3"; sha256="1sldlccsprzan1li
 trapezoid = derive { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
 treatSens = derive { name="treatSens"; version="1.0"; sha256="0g3v9b1kdndqls9h1ijp5v17ybb1710bdclid745y6lfkia1b71w"; depends=[]; };
 tree = derive { name="tree"; version="1.0-35"; sha256="1cxn73rlr8s3qbq3icdh1v3jbbz913ns6xk6yzgk30ncifw4iq6g"; depends=[]; };
+treeClust = derive { name="treeClust"; version="0.2-2"; sha256="18i9n5zg1468y42pnn35h3gdqhv65lrlsgc8h1vp221blkv2i1dc"; 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]; };
 treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04nw8dj9c5r7km6q5k3v3jdkfal6cm6k"; depends=[plyr]; };
@@ -6141,7 +6184,7 @@ tsbridge = derive { name="tsbridge"; version="1.1"; sha256="0mry3ia54cdfydpzm8as
 tsbugs = derive { name="tsbugs"; version="1.2"; sha256="130v4x6cfy7ddvhijsnvipm4ycrispkj1j0z5f326yb4v5lrk91x"; depends=[]; };
 tsc = derive { name="tsc"; version="1.0-3"; sha256="1acsdkxizlkix1sskwqv2a80rshw6f14zvcsjhrmmdfd4bmwh36y"; depends=[]; };
 tscount = derive { name="tscount"; version="1.0.0"; sha256="0n01biifzjfvnj3zhrn87qigf4l1kij2zfqf6876qz8rps1jz626"; depends=[ltsa]; };
-tseries = derive { name="tseries"; version="0.10-33"; sha256="1ckncvzm5ili9ggzx09nx9hq1n2yz0kl3vxk1hmnxlklqm12fym3"; depends=[quadprog zoo]; };
+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.2-2"; sha256="07g9qfdrhccl5dlsbpxn1ihavxljd9nq21hzbyn225cfi4bkx42h"; depends=[GPArotation dse EvalEst setRNG tframe tfplot]; };
 tsintermittent = derive { name="tsintermittent"; version="1.5"; sha256="1qziwdpxfc2v010bk2cnhkrajza0z7lrrsjg06m49msyk5bk62z1"; depends=[MAPA]; };
@@ -6225,7 +6268,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.0"; sha256="1qg5106ja17nsqzjnyswjf438f55195l197pizkybb2ilg4fw0x1"; depends=[raster ade4 dismo rworldmap]; };
-visreg = derive { name="visreg"; version="2.1-0"; sha256="1l8az4ykfr3rfgxx7wj9qvma77lcgr3pa60cxzqabm9cg6622fsf"; depends=[lattice]; };
+visreg = derive { name="visreg"; version="2.1-1"; sha256="16ghi7p809mcb3jfw1c9ibdd1mhq54m7x0qbcbiwxpnnd7grqy4w"; 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=[]; };
 vitality = derive { name="vitality"; version="1.1"; sha256="048i6ralh3gbh3hqkdxj3sdkxp1nrjbp3jpwrva4sa8d69vwxla5"; depends=[IMIS]; };
@@ -6238,6 +6281,7 @@ vudc = derive { name="vudc"; version="1.0"; sha256="1xjbjfya4zn94arc76pcfflc2dcn
 vwr = derive { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[stringdist lattice latticeExtra]; };
 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]; };
+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]; };
 waterData = derive { name="waterData"; version="1.0.4"; sha256="0wk49f079jfbjncyirdvq50wswf9g361iivshjfhyndv83gbqrzk"; depends=[lattice latticeExtra XML]; };
@@ -6269,6 +6313,7 @@ wildlifeDI = derive { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32
 windex = derive { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[geiger ape scatterplot3d]; };
 witness = derive { name="witness"; version="1.2"; sha256="1pccn7czm1q0w31zpmky5arkcbnfl94gh1nnkf8kmcccdrr3lxph"; depends=[]; };
 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]; };
 wnominate = derive { name="wnominate"; version="0.99"; sha256="19pis0p4kkwyddn8f93p4ff7l1hvcdr7m3hrv4bzmm9nd8iy8mk1"; depends=[pscl]; };
 wombsoft = derive { name="wombsoft"; version="2.0"; sha256="11ri29vj1yg2lpr6vf1i45w20hqh8dswj04ylbq0vy27cwmxqljd"; depends=[]; };
@@ -6318,10 +6363,10 @@ zic = derive { name="zic"; version="0.8.1"; sha256="05mn894qdx6k7158dbsjy2b49n0g
 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-4"; sha256="0mjg55jc5b8h2jj6cy8b34a4q7jhhx73xns0v2dpfkq4kmilsv5p"; depends=[]; };
-zoib = derive { name="zoib"; version="1.1"; sha256="1w63wqzmf7977hk0nalgayar75ijaqjl3rgfmn90sa4fs1nqnxg7"; depends=[rjags coda matrixcalc Formula]; };
+zoib = derive { name="zoib"; version="1.2"; sha256="15rki5w21r7q0af9w5pyzq9x55gwmgs35pqgdqxmjnpsp8v135k7"; depends=[rjags coda matrixcalc Formula]; };
 zoo = derive { name="zoo"; version="1.7-11"; sha256="0fp726rp9mqsfmm391bmckk76lqsvzwd39ffvb355wf2spl8nzvf"; depends=[lattice]; };
 zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; };
 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 c1100c79fac..0e92dcb6202 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -663,7 +663,6 @@ let
     "ArrayBin" # requires SAGx
     "babel" # requires edgeR
     "BACA" # requires RDAVIDWebService
-    "bamboo" # depends on broken jvmr
     "BcDiag" # requires fabia
     "bdvis" # requres taxize
     "beadarrayFilter" # requires beadarray
@@ -694,6 +693,7 @@ let
     "curvHDR" # requires flowCore
     "D2C" # requires gRbase
     "DAAGbio" # requires limma
+    "daff" # requires V8 to build
     "dagbag" # requires Rlapack
     "DBKGrad" # requires SDD
     "dbmss" # requires spatstat
@@ -761,7 +761,6 @@ let
     "isva" # requires qvalue
     "jomo" # linking errors
     "js" # requires broken V8
-    "jvmr" # tries to download files during its build
     "KANT" # requires affy, and Biobase
     "ktspair" # requires Biobase
     "latticeDensity" # requires spatstat
@@ -860,6 +859,7 @@ let
     "retistruct" # depends on broken RImageJROI
     "rggobi" # requires GGobi
     "RImageJROI" # requires spatstat
+    "rjade" # requires V8 to build
     "rJPSGCS" # requires chopsticks
     "rLindo" # requires LINDO API
     "Rmosek" # requires mosek
@@ -909,7 +909,6 @@ let
     "spocc" # requires leafletR
     "SQDA" # requires limma
     "Statomica" # requires Biobase, multtest
-    "StochKit2R" # tarball is invalid on server
     "stpp" # requires spatstat
     "structSSI" # requires multtest
     "strum" # requires Rgraphviz
diff --git a/pkgs/development/r-modules/generate-cran-packages.R b/pkgs/development/r-modules/generate-cran-packages.R
index 3dea348f330..3510a2fa92c 100644
--- a/pkgs/development/r-modules/generate-cran-packages.R
+++ b/pkgs/development/r-modules/generate-cran-packages.R
@@ -3,7 +3,12 @@ library(parallel)
 cl <- makeCluster(10)
 options(repos=structure(c(CRAN="http://cran.rstudio.com/")))
 
+
+readFormatted <- as.data.table(read.table(skip=6, sep='"', text=head(readLines('cran-packages.nix'), -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)
 }
@@ -21,7 +26,7 @@ formatPackage <- function(name, version, sha256, depends, imports, linkingTo, kn
     paste0(attr, " = derive { name=\"", name, "\"; version=\"", version, "\"; sha256=\"", sha256, "\"; depends=[", depends, "]; };")
 }
 
-clusterExport(cl, c("nixPrefetch"))
+clusterExport(cl, c("nixPrefetch","readFormatted"))
 
 pkgs <- as.data.table(available.packages(filters=c("R_version", "OS_type", "CRAN", "duplicates")))
 pkgs <- subset(pkgs, Repository=="http://cran.rstudio.com/src/contrib")
diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 1904ccc20bb..89acb751604 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.4";
+  version = "6.4.1";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz";
-    sha256 = "0qk653i8973ygz630siava3fm54vxmahbw6rikdi9lzjlpvvn74f";
+    sha256 = "0w41h5m51mfswdrqpgyjs73x4qr73scswv34f5zwckcih4dvsdzz";
   };
 
   installPhase = ''
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index f962eaef770..f20f6d94f6f 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-01-24";
+let snapshotDate = "2015-02-26";
 in
 
 with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
 
 let snapshotHash = if stdenv.system == "i686-linux"
-      then "96213038f850569f1c4fa6a0d146c6155c0d566b"
+      then "2a28b604d09b4a76a54a05d91f7f158692427b3a"
       else if stdenv.system == "x86_64-linux"
-      then "4d87486493c2881edced7b1d2f8beaac32aaa5b5"
+      then "7367f4aca86d38e209ef7236b00175df036c03e2"
       else if stdenv.system == "i686-darwin"
-      then "17b9fc782e86bffe170abb83a01e0cb7c90a0daa"
+      then "e5cabb0a4a2b4e47f7b1ae9b802e2b5d0b14eac5"
       else if stdenv.system == "x86_64-darwin"
-      then "18887bdbd3e6d2a127aa34216fa06e9877b0fbc6"
+      then "3026c60ddd46d2bcf1cb178fc801095dbfba5286"
       else throw "no snapshot for platform ${stdenv.system}";
     snapshotName = "cargo-nightly-${platform}.tar.gz";
 in
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p "$out"
-    cp -r bin "$out/bin"
+    ./install.sh "--prefix=$out"
   '' + (if stdenv.isLinux then ''
     patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
              --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix
index 2425e346121..c308c5c7019 100644
--- a/pkgs/development/tools/misc/cflow/default.nix
+++ b/pkgs/development/tools/misc/cflow/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     substituteInPlace "src/cflow.h"					\
       --replace "/usr/bin/cpp"						\
-                "$(cat ${stdenv.cc}/nix-support/orig-gcc)/bin/cpp"
+                "$(cat ${stdenv.cc}/nix-support/orig-cc)/bin/cpp"
   '';
 
   buildInputs = [ gettext ] ++
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index d07f7fd28e9..75c09987761 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   #TODO add emacs support
-  name = "racer-git-2015-01-20";
+  name = "racer-git-2015-02-28";
   src = fetchgit {
     url = https://github.com/phildawes/racer;
-    rev = "599aa524ea949ec5f9f0be0375dbb1df9cb852ae";
-    sha256 = "1kasm7vffn176wr072m1dmqg1rb3wqai9yisxf8mia62548pdx88";
+    rev = "2e1d718fae21431de4493c238196466e9d4996bc";
+    sha256 = "0lvp494kg2hlbbdrwxmmxkyhjw53y9wjdml9z817pwj3fwmrjsx0";
   };
 
   buildInputs = [ rustc cargo makeWrapper ];
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 37ceeba7725..ca5cfb3e12c 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     mv chromedriver $out/bin
     patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
     wrapProgram "$out/bin/chromedriver" \
-      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"
+      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 663864109e8..042e29f2970 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -67,9 +67,9 @@ let
           if filterPlatforms == [] then platforms
           else
             if hasPrefix "!" entry then
-              substract (intersect filterPlatforms nodejs.meta.platforms) platforms
+              subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms
             else
-              platforms ++ (intersect filterPlatforms nodejs.meta.platforms)
+              platforms ++ (intersectLists filterPlatforms nodejs.meta.platforms)
       ) [] os;
 
     mapDependencies = deps: f: rec {
diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix
index 94ddcc1b056..789b043e18f 100644
--- a/pkgs/games/castle-combat/default.nix
+++ b/pkgs/games/castle-combat/default.nix
@@ -39,8 +39,8 @@ buildPythonPackage rec {
   fixLoaderPath =
     let dollar = "\$"; in
     '' sed -i "$out/bin/castle-combat" \
-           -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\
-export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\""
+           -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\
+export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\""
     '';
       # ^
       # `--- The run-time says: "libgcc_s.so.1 must be installed for
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 9e180e7df25..3aa23ffd0e8 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.75";
+  name = "tibia-10.76";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1075.tgz;
-    sha256 = "16g4spc8lh7sq3lbnjiprj8d2xd9r9mxy4yz2fnfzj6pa4bx3182";
+    url = http://static.tibia.com/download/tibia1076.tgz;
+    sha256 = "1kzsbrravk8lmpirghhsynnygmcig8jkbw6qfzk1fkabi1d02yrv";
   };
 
   shell = stdenv.shell;
diff --git a/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix
new file mode 100644
index 00000000000..de0060032f7
--- /dev/null
+++ b/pkgs/misc/themes/gtk3/numix-gtk-theme/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "2.2.3";
+  name = "numix-gtk-theme-${version}";
+  
+  src = fetchurl {
+    url = "https://github.com/shimmerproject/Numix/archive/v${version}.tar.gz";
+    sha256 = "b0acc2d81300b898403766456d3406304553cc7016677381f3179dbeb1192a2d";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    install -dm 755 $out/share/themes/Numix
+    cp -dr --no-preserve='ownership' {LICENSE,CREDITS,index.theme,gtk-2.0,gtk-3.0,metacity-1,openbox-3,unity,xfce-notify-4.0,xfwm4} $out/share/themes/Numix/
+  '';
+  
+  meta = {
+    description = "Numix GTK theme";
+    homepage = https://numixproject.org;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
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 e175fa423a1..06670b61b4b 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "firmware-linux-nonfree-2015-02-24";
+  name = "firmware-linux-nonfree-2015-02-27";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";
-    rev = "4517261caab34742afdeaf0c36128b9579675717";
-    sha256 = "0w386nfwlqhk1wn7zzhfxkxx06nzqasc4dr0qq61wc29s9qlgi3c";
+    rev = "cef33368c4d3425f11306496f0250f8ef1cf3c1f";
+    sha256 = "0az6b7fbhanqdc9v9dl651yqqnfbm1npdibip196vnmd5qlv2iw4";
   };
 
   preInstall = ''
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index fedfb707f32..77045a0440c 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -3,31 +3,35 @@
 with stdenv.lib;
 
 ''
-  # Power management and debugging.
+  # Debugging.
   DEBUG_KERNEL y
-  PM_ADVANCED_DEBUG y
-  ${optionalString (versionOlder version "3.19") ''
-    PM_RUNTIME y
-  ''}
-  ${optionalString (versionAtLeast version "3.10") ''
-    X86_INTEL_PSTATE y
-  ''}
   TIMER_STATS y
-  ${optionalString (versionOlder version "3.10") ''
-    USB_SUSPEND y
-  ''}
   BACKTRACE_SELF_TEST n
   CPU_NOTIFIER_ERROR_INJECT? n
   DEBUG_DEVRES n
   DEBUG_NX_TEST n
   DEBUG_STACK_USAGE n
-  ${optionalString (!(features.grsecurity or true)) ''
+  ${optionalString (!(features.grsecurity or false)) ''
     DEBUG_STACKOVERFLOW n
   ''}
   RCU_TORTURE_TEST n
   SCHEDSTATS n
   DETECT_HUNG_TASK y
 
+  # Power management.
+  ${optionalString (versionOlder version "3.19") ''
+    PM_RUNTIME y
+  ''}
+  PM_ADVANCED_DEBUG y
+  ${optionalString (versionAtLeast version "3.10") ''
+    X86_INTEL_PSTATE y
+  ''}
+  INTEL_IDLE y
+  CPU_FREQ_DEFAULT_GOV_PERFORMANCE y
+  ${optionalString (versionOlder version "3.10") ''
+    USB_SUSPEND y
+  ''}
+
   # Support drivers that need external firmware.
   STANDALONE n
 
@@ -151,7 +155,9 @@ with stdenv.lib;
   EXT2_FS_XATTR y
   EXT2_FS_POSIX_ACL y
   EXT2_FS_SECURITY y
-  EXT2_FS_XIP y # Ext2 execute in place support
+  ${optionalString (versionOlder version "4.0") ''
+    EXT2_FS_XIP y # Ext2 execute in place support
+  ''}
   EXT3_FS_POSIX_ACL y
   EXT3_FS_SECURITY y
   EXT4_FS_POSIX_ACL y
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 87ac82a4194..7c3857c40ae 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.69";
+  version = "3.10.70";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "14m4npds1f0whsd1nhnpl3bsscck9kg0r8bvrha4bdlhc8fjzrrc";
+    sha256 = "0x7v5gy0wr6g8697slhr57zdpv0i6lwa1yrzzrxizvsgvh4y9mpz";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index acfe74828e7..e8c383b857e 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.37";
+  version = "3.12.38";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0p7d6qdk7327yzfxzlxbxizrf7dm8vxbc3spm2ai4q278wxbi8jx";
+    sha256 = "0vwvvjzl6qx4nd4577lawmmb8lj3z0zfghm345dh20plhblcl3ck";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 156c5cced8f..5587725d991 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.33";
+  version = "3.14.34";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "07wqh93z5hix5aga2ns8fnkz350i2sx2l7gzr7n6136gbcb5lxb6";
+    sha256 = "18hdmshrmvp99zq8f8mclaq5f4517inwa8j4ysskpjaxarjjl7h4";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 2dcde824aa6..0b9e5fa2e70 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.7";
+  version = "3.18.8";
   # Remember to update grsecurity!
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "08gl48x9fim8b8icsardp18vckzmi411kwkaswlznmr67gfz89yz";
+    sha256 = "1nxa0iq3v2jrjk9jy2pjcff40ragd4zxfpizi58pkcpj0gadkyww";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 994d14ecae5..6814d3e3045 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.2.66";
+  version = "3.2.67";
   extraMeta.branch = "3.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "09l0rfv10c5kzlgfhi339ly496f6j9ichq3arpvkb3fivjkxcm45";
+    sha256 = "18pfw17gpvswcs8as2a9d53cpcaj5fq6aricgzh0n34ivyqv6msg";
   };
 
   # We don't provide these patches if grsecurity is enabled, because
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index d9d16f9ac77..73280d1dd30 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 = "3.19-rc7";
-  modDirVersion = "3.19.0-rc7";
-  extraMeta.branch = "3.19";
+  version = "4.0-rc2";
+  modDirVersion = "4.0.0-rc2";
+  extraMeta.branch = "4.0";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz";
-    sha256 = "007xjngbyvdx127rkrzxs23kxcw2z54gzad9954iwhphqw0kpq9x";
+    url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
+    sha256 = "1njjl31g27ddjdp5z14fhx4mpm69jqkxy43k7liisvxdc9j75jj9";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 76918d0c488..a7f9f16d171 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.33";
-      revision  = "201502222137";
+    { kversion  = "3.14.34";
+      revision  = "201502271838";
       branch    = "stable";
-      sha256    = "1mzw5g4m5yxs0qzrx2am5s19zggn4n9pws8vsqq82dhawmwcbbq2";
+      sha256    = "01wi0gidshipjd7f1z5m616saywwq3ghh42ncczi0bbpcmy52x7k";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.18.7";
-      revision  = "201502222138";
+    { kversion  = "3.18.8";
+      revision  = "201502271843";
       branch    = "test";
-      sha256    = "0dnnwky9s8qhfm2b5zhl41m8br4qdxwmwwv8rbp11srydcz1pzib";
+      sha256    = "0kj05imdll2j4lncdwc9r6fljad6aqa4s5k5dkh26gdcncjslkch";
     };
 
   grsec_fix_path =
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index 5646ba89f66..d0a81069dfb 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pax-utils-${version}";
-  version = "0.9.2";
+  version = "1.0";
 
   src = fetchurl {
     url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz";
-    sha256 = "1pmlpjhr2475h5v90abmsfgr37r3b6c4mknhzswbgcb10vgh322p";
+    sha256 = "04p356j46symayh2d14i51xv9qic3iz9gnc7fr906skw3hccr7y3";
   };
 
   makeFlags = [
diff --git a/pkgs/os-specific/linux/spl/git.nix b/pkgs/os-specific/linux/spl/git.nix
index 061d85dec6a..7894190269c 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-02-04";
+  version = "2015-02-27";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/spl.git;
-    rev = "086476f92005506cb07e75f889e8ddb69026e842";
-    sha256 = "1n3cjdwxccvcns7jydgznkb6jy0p59qx1yg512jjf4m9hf5p2pwm";
+    rev = "c1bc8e610be8bf1cc8170f788a89a9ee257eb51f";
+    sha256 = "1rpq7rxqmqmlaqv9aj7n2bmlw3ls55iyhcsk8kp4g9kf20f0pgym";
   };
 
   patches = [ ./const.patch ./install_prefix-git.patch ];
diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix
index 43accf6a1fe..4b4773db7e1 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-02-24";
+  version = "2015-03-02";
 
   src = fetchgit {
     url = git://github.com/zfsonlinux/zfs.git;
-    rev = "8bdcfb53966313e9ff747e3028390c207cfdbe9a";
-    sha256 = "0xcikjb57fz173sjh2wvv96ybvrsx9d24krq09wy9a4psxp7vr8f";
+    rev = "d14cfd83dae0b1a261667acd416dba17a98d15fa";
+    sha256 = "0dbvsw3v26l15h1nmdkr6jhijq87gryyvzbnxqdc823x4m9qfvrw";
   };
 
   patches = [
diff --git a/pkgs/servers/samba/4.x-heimdal-compat.patch b/pkgs/servers/samba/4.x-heimdal-compat.patch
new file mode 100644
index 00000000000..35f01e4001e
--- /dev/null
+++ b/pkgs/servers/samba/4.x-heimdal-compat.patch
@@ -0,0 +1,16 @@
+diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
+index bb476e1..0a407a4 100644
+--- a/source4/kdc/kdc.c
++++ b/source4/kdc/kdc.c
+@@ -967,9 +967,9 @@ static void kdc_task_init(struct task_server *task)
+ 	 * The old behavior in the _kdc_get_preferred_key()
+ 	 * function is use_strongest_server_key=TRUE.
+ 	 */
+-	kdc->config->as_use_strongest_session_key = false;
++	kdc->config->tgt_use_strongest_session_key = false;
++	kdc->config->svc_use_strongest_session_key = false;
+ 	kdc->config->preauth_use_strongest_session_key = false;
+-	kdc->config->tgs_use_strongest_session_key = false;
+ 	kdc->config->use_strongest_server_key = true;
+ 
+ 	/* Register hdb-samba4 hooks for use as a keytab */
diff --git a/pkgs/servers/samba/4.x-no-persistent-install.patch b/pkgs/servers/samba/4.x-no-persistent-install.patch
index 68d0cf76aa5..c3e013f7862 100644
--- a/pkgs/servers/samba/4.x-no-persistent-install.patch
+++ b/pkgs/servers/samba/4.x-no-persistent-install.patch
@@ -16,3 +16,45 @@ index aa4e66e..d53f433 100755
      # these might be on non persistent storage
 -    bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
 +    #bld.INSTALL_DIRS("", "${LOCKDIR} ${PIDDIR} ${SOCKET_DIR}")
+diff --git a/ctdb/wscript b/ctdb/wscript
+index 3e2a992..1b93a4d 100755
+--- a/ctdb/wscript
++++ b/ctdb/wscript
+@@ -473,10 +473,10 @@ def build(bld):
+     for t in etc_subdirs:
+         files = SUBDIR_MODE('%s/%s' % (configdir, t), trim_path=configdir)
+         for fmode in files:
+-            bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % fmode[0],
++            bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % fmode[0],
+                               destname=fmode[0], chmod=fmode[1])
+ 
+-    bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/functions',
++    bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/functions',
+                       destname='functions')
+ 
+     etc_scripts = [
+@@ -489,18 +489,18 @@ def build(bld):
+     ]
+ 
+     for t in etc_scripts:
+-        bld.INSTALL_FILES(bld.env.CTDB_ETCDIR, 'config/%s' % t,
++        bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}', 'config/%s' % t,
+                           destname=t, chmod=0755)
+ 
+-    bld.INSTALL_FILES('${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
++    bld.INSTALL_FILES('${EXEC_PREFIX}${SYSCONFDIR}/sudoers.d', 'config/ctdb.sudoers',
+                       destname='ctdb')
+ 
+-    bld.INSTALL_FILES('${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
++    bld.INSTALL_FILES('${EXEC_PREFIX}${CTDB_ETCDIR}/notify.d', 'config/notify.d.README',
+                       destname='README')
+ 
+-    bld.install_dir(bld.env.CTDB_LOGDIR)
+-    bld.install_dir(bld.env.CTDB_RUNDIR)
+-    bld.install_dir(bld.env.CTDB_VARDIR)
++    #bld.install_dir(bld.env.CTDB_LOGDIR)
++    #bld.install_dir(bld.env.CTDB_RUNDIR)
++    #bld.install_dir(bld.env.CTDB_VARDIR)
+ 
+     sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
+     t = bld.SAMBA_GENERATOR('ctdb-pc',
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index eca6c31478f..610ca73cc1c 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl_ns
 , docbook_xml_dtd_42, readline, talloc, ntdb, tdb, tevent, ldb, popt, iniparser
-, pythonPackages, libbsd
+, pythonPackages, libbsd, nss_wrapper, socket_wrapper, uid_wrapper, libarchive
 
 # source3/wscript optionals
-, heimdal ? null # Samba only supports heimdal for kerberos although mit-krb5 is being worked on
+, kerberos ? null
 , openldap ? null
 , cups ? null
 , pam ? null
@@ -11,7 +11,6 @@
 , acl ? null
 , libaio ? null
 , fam ? null
-, ctdb ? null
 , ceph ? null
 , glusterfs ? null
 
@@ -31,21 +30,24 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "samba-4.1.17";
+  name = "samba-4.2.0";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "07fban97xmf4r5y48jp6ajfdki6vx4239lwq9gmvwjy8x44mvsvs";
+    sha256 = "03s9pjdgq6nlv2lcnlmxlhhj8m5drgv6z4xy9zkgwwd92mw0b9k6";
   };
 
-  patches = [ ./4.x-no-persistent-install.patch ];
+  patches = [
+    ./4.x-no-persistent-install.patch
+    ./4.x-heimdal-compat.patch
+  ];
 
   buildInputs = [
     python pkgconfig perl libxslt docbook_xsl_ns docbook_xml_dtd_42
     readline talloc ntdb tdb tevent ldb popt iniparser pythonPackages.subunit
-    libbsd
+    libbsd nss_wrapper socket_wrapper uid_wrapper libarchive
 
-    heimdal openldap cups pam avahi acl libaio fam ctdb ceph glusterfs
+    kerberos openldap cups pam avahi acl libaio fam ceph glusterfs
 
     libiconv gettext
 
@@ -61,7 +63,7 @@ stdenv.mkDerivation rec {
     "--with-static-modules=NONE"
     "--with-shared-modules=ALL"
     "--with-winbind"
-  ] ++ (if heimdal != null then [ "--with-ads" ] else [ "--without-ads" ])
+  ] ++ (if kerberos != null then [ "--with-ads" ] else [ "--without-ads" ])
     ++ (if openldap != null then [ "--with-ldap" ] else [ "--without-ldap" ])
     ++ (if cups != null then [ "--enable-cups" ] else [ "--disable-cups" ])
     ++ (if pam != null then [ "--with-pam" "--with-pam_smbpass" ]
@@ -77,27 +79,35 @@ stdenv.mkDerivation rec {
     "--with-syslog"
     "--with-automount"
   ] ++ (if libaio != null then [ "--with-aio-support" ] else [ "--without-aio-support" ])
-    ++ (if fam != null then [ "--with-fam" ] else [ "--without-fam" ])
-    ++ (if ctdb != null then [ "--with-cluster-support" "--with-ctdb-dir=${ctdb}" ]
-        else [ "--without-cluster-support" ])
-    ++ (if ceph != null then [ "--with-libcephfs=${ceph}" ] else [ ])
+    ++ (if fam != null then [ "--with-fam" ] else [ "--without-fam" ]) ++ [
+    "--with-cluster-support"
+  ] ++ (if ceph != null then [ "--with-libcephfs=${ceph}" ] else [ ])
     ++ (if glusterfs != null then [ "--enable-glusterfs" ] else [ "--disable-glusterfs" ]) ++ [
+
     # dynconfig/wscript options
     "--enable-fhs"
     "--sysconfdir=/etc"
     "--localstatedir=/var"
 
     # buildtools/wafsamba/wscript options
-    "--bundled-libraries=${if heimdal != null then "NONE" else "com_err"}"
+    "--bundled-libraries=${if kerberos.implementation == "heimdal" then "NONE" else "com_err"}"
     "--private-libraries=NONE"
     "--builtin-libraries=replace"
   ] ++ (if libiconv != null then [ "--with-libiconv=${libiconv}" ] else [ ])
     ++ (if gettext != null then [ "--with-gettext=${gettext}" ] else [ "--without-gettext" ]) ++ [
+
     # source4/lib/tls/wscript options
   ] ++ (if gnutls != null && libgcrypt != null && libgpgerror != null
         then [ "--enable-gnutls" ] else [ "--disable-gnutls" ]) ++ [
+
     # wscript options
-  ] ++ stdenv.lib.optional (heimdal == null) "--without-ad-dc";
+  ] ++ stdenv.lib.optional (kerberos.implementation == "krb5") "--with-system-mitkrb5"
+    ++ stdenv.lib.optional (kerberos == null) "--without-ad-dc" ++ [
+
+    # ctdb/wscript
+    "--enable-infiniband"
+    "--enable-pmda"
+  ];
 
   stripAllList = [ "bin" "sbin" ];
 
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 2502882123e..c415a297d84 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -50,10 +50,9 @@ rec {
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
     xargsFlags=" "
     export MACOSX_DEPLOYMENT_TARGET=10.7
-    export SDKROOT=
-    export SDKROOT_X=/ # FIXME: impure!
-    export NIX_CFLAGS_COMPILE+=" --sysroot=/var/empty -idirafter $SDKROOT_X/usr/include -F$SDKROOT_X/System/Library/Frameworks -Wno-multichar -Wno-deprecated-declarations"
-    export NIX_LDFLAGS_AFTER+=" -L$SDKROOT_X/usr/lib"
+    export SDKROOT=$(/usr/bin/xcrun --sdk macosx$(/usr/bin/xcrun --show-sdk-version) --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
   '';
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 086c0b45706..751366e38d2 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -200,14 +200,9 @@ let
       isCygwin = system == "i686-cygwin"
               || system == "x86_64-cygwin";
       isFreeBSD = system == "i686-freebsd"
-              || system == "x86_64-freebsd";
+               || system == "x86_64-freebsd";
       isOpenBSD = system == "i686-openbsd"
-              || system == "x86_64-openbsd";
-      isBSD = system == "i686-freebsd"
-           || system == "x86_64-freebsd"
-           || system == "i686-openbsd"
-           || system == "x86_64-openbsd"
-           || system == "x86_64-darwin";
+               || system == "x86_64-openbsd";
       isi686 = system == "i686-linux"
             || system == "i686-gnu"
             || system == "i686-freebsd"
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 0d56e79d024..146f9bea87a 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.isBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
+       sed -i ${stdenv.lib.optionalString ((stdenv.isFreeBSD || stdenv.isOpenBSD || stdenv.isDarwin) && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h
     '';
 
   # GNU Gettext is needed on non-GNU platforms.
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tools for remote synchronization and `shell archives'";
-
     longDescription =
       '' GNU shar makes so-called shell archives out of many files, preparing
          them for transmission by electronic mail services.  A shell archive
@@ -43,11 +42,8 @@ stdenv.mkDerivation rec {
          by a copy of the shell. unshar may also process files containing
          concatenated shell archives.
       '';
-
     homepage = http://www.gnu.org/software/sharutils/;
-
     license = stdenv.lib.licenses.gpl3Plus;
-
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 405264c6f66..6812859072d 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, unzip }:
 let
   s = # Generated upstream information
   rec {
@@ -12,7 +12,7 @@ let
   buildInputs = [
     unzip
   ];
-  isUnix = stdenv.isLinux || stdenv.isGNU || stdenv.isDarwin || stdenv.isBSD;
+  isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
   compileFlags = ""
     + (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix
index cfb76d2ff9b..65f40f68f55 100644
--- a/pkgs/tools/archivers/zpaq/zpaqd.nix
+++ b/pkgs/tools/archivers/zpaq/zpaqd.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl, unzip }:
 let
   s = # Generated upstream information
   rec {
@@ -12,7 +12,7 @@ let
   buildInputs = [
     unzip
   ];
-  isUnix = stdenv.isLinux || stdenv.isGNU || stdenv.isDarwin || stdenv.isBSD;
+  isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
   isx86 = stdenv.isi686 || stdenv.isx86_64;
   compileFlags = ""
     + (stdenv.lib.optionalString isUnix " -Dunix -pthread ")
diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix
index 92091c18df3..ea74d83ed9e 100644
--- a/pkgs/tools/audio/volumeicon/default.nix
+++ b/pkgs/tools/audio/volumeicon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "volumeicon-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchurl {
-    url = "http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.0.tar.gz";
-    sha256 = "10np3fvfzyxkjw0kfzg81a7kcxda1fz6nkqffkijbay5ksgigwg5";
+    url = "http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.1.tar.gz";
+    sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14";
   };
 
   buildInputs = [ gtk3 pkgconfig intltool alsaLib ];
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index c701e35c683..89aca9c06c2 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -14,12 +14,12 @@ let
 in
 stdenv.mkDerivation rec {
   name="ceph-${version}";
-  version="0.92";
+  version="0.93";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "0w5gkl2p4gdq5xppmrx0lnpfbhkird8v2wjx8grw8aja23lw7zcc";
+    sha256 = "0fk6svs1c4ng3gwgj0albzz2hxny74ld44gq16cpgkgrdk4bsyi5";
   };
 
   patches = [
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index ea96001a421..2906e365cb6 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -1,19 +1,30 @@
-{ stdenv, fetchurl, openssl, fuse, boost, rlog }:
+{ stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl
+, pkgconfig, rlog }:
 
-stdenv.mkDerivation {
-  name = "encfs-1.7.4";
+let version = "1.8-rc1"; in
+stdenv.mkDerivation rec {
+  name = "encfs-${version}";
 
-  src = fetchurl {
-    url = "http://encfs.googlecode.com/files/encfs-1.7.4.tgz";
-    sha256 = "1a3h47f4h0qdc0bf3vic1i8wrdw5nkx22mml4wsvmmrd9zqg0bi8";
+  src = fetchFromGitHub {
+    sha256 = "17a09pg7752nlbgm2nmrwhm90kv2z3dj20xs79qvvr6x7rdgzck8";
+    rev = "v${version}";
+    repo = "encfs";
+    owner = "vgough";
   };
 
-  buildInputs = [ boost fuse openssl rlog ];
+  buildInputs = [ autoreconfHook boost fuse openssl perl pkgconfig rlog ];
 
-  configureFlags = "--with-boost-serialization=boost_wserialization --with-boost-filesystem=boost_filesystem";
+  configureFlags = [
+    "--with-boost-serialization=boost_wserialization"
+    "--with-boost-filesystem=boost_filesystem"
+  ];
 
-  meta = {
-    homepage = http://www.arg0.net/encfs;
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://vgough.github.io/encfs;
     description = "Provides an encrypted filesystem in user-space via FUSE";
+    license = with licenses; lgpl2;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index a94ad14ca22..b0b82f3cc76 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, python, bash }:
 
 let 
-  version = "21.6.9";
+  version = "22.2.4";
 in
   stdenv.mkDerivation rec {
     name = "autojump-${version}";
@@ -9,21 +9,18 @@ in
     src = fetchurl {
       url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz";
       name = "autojump-${version}.tar.gz";
-      sha256 = "0js6jp9l83zxhd9bn8hjn4yf8gydnldrlmafgvlg3rd4i1v82649";
+      sha256 = "816badb0721f735e2b86bdfa8b333112f3867343c7c2263c569f75b4ec91f475";
     };
 
     buildInputs = [ python bash ];
     dontBuild = true;
 
     installPhase = ''
-      # don't check shell support (we're running with bash anyway)
-      sed -i -e 150,153d install.sh
-
-      bash ./install.sh -d $out -p ""
+      python ./install.py -d $out -p ""
       chmod +x $out/etc/profile.d/*
 
       mkdir -p "$out/etc/bash_completion.d"
-      cp -v $out/etc/profile.d/autojump.bash "$out/etc/bash_completion.d"
+      cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d"
 
       # FIXME: What's the right place for `autojump.zsh'?
     '';
diff --git a/pkgs/tools/misc/mssys/default.nix b/pkgs/tools/misc/mssys/default.nix
index 3e37009c723..d1f76a10130 100644
--- a/pkgs/tools/misc/mssys/default.nix
+++ b/pkgs/tools/misc/mssys/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, gettext}:
 
-stdenv.mkDerivation {
-  name = "ms-sys-2.1.3";
+stdenv.mkDerivation rec {
+  name = "ms-sys-${version}";
+  version = "2.4.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/ms-sys/ms-sys-2.1.3.tgz;
-    sha256 = "05djdqp7gqfrfb4czrmbgxgd8qr0h3781gzqvsp3qhfx6ay37z0p";
+    url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
+    sha256 = "0qccv67fc2q97218b9wm6qpmx0nc0ssca391i0q15351y1na78nc";
   };
 
   buildInputs = [gettext];
diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix
index f2821135cf6..1f6db50a2df 100644
--- a/pkgs/tools/misc/yubico-piv-tool/default.nix
+++ b/pkgs/tools/misc/yubico-piv-tool/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, openssl, pcsclite }:
 
 stdenv.mkDerivation rec {
-  name = "yubico-piv-tool-0.1.2";
+  name = "yubico-piv-tool-0.1.5";
 
   src = fetchurl {
     url = "https://developers.yubico.com/yubico-piv-tool/Releases/${name}.tar.gz";
-    sha256 = "0sqakrlw4j60xhlmp2fq6ccj3lqf13kwvmahsrj3xr5qdi7h0fza";
+    sha256 = "1zii90f0d1j9cinvxqlzs9h8w7a856ksd8ghgqz12jywmjz0blxq";
   };
 
   buildInputs = [ pkgconfig openssl pcsclite ];
diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index 31ad1108dda..917c70f29a0 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -1,36 +1,47 @@
-{ stdenv, fetchurl, libtool, readline, zlib, openssl, libiconv, pcsclite
-, libassuan1, pkgconfig, libXt, docbook_xsl, libxslt, docbook_xml_dtd_412
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, zlib, readline, openssl
+, libiconv, pcsclite, libassuan1, libXt
+, docbook_xsl, libxslt, docbook_xml_dtd_412
 }:
 
 stdenv.mkDerivation rec {
-  name = "opensc-0.13.0";
+  name = "opensc-${version}";
+  version = "0.14.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/opensc/${name}.tar.gz";
-    sha256 = "054v11yc2lqlfqs556liw18klhkx9zyjylqcwirk4axiafp4dpmb";
+  src = fetchFromGitHub {
+    owner = "OpenSC";
+    repo = "OpenSC";
+    rev = version;
+    sha256 = "02q3rndcfd7lga1ph0xcl556rgigzpp9bpwqyn42rfbx8lll7gzv";
   };
 
-  buildInputs = [ libtool readline zlib openssl pcsclite libassuan1 pkgconfig
+  postPatch = ''
+    sed -i 's,$(DESTDIR),$(out),g' etc/Makefile.am
+  '';
+
+  buildInputs = [
+    autoreconfHook pkgconfig zlib readline openssl pcsclite libassuan1
     libXt libxslt libiconv docbook_xml_dtd_412
   ];
 
   configureFlags = [
-    "--enable-doc"
-    "--enable-man"
+    "--enable-zlib"
+    "--enable-readline"
     "--enable-openssl"
     "--enable-pcsc"
-    "--enable-readline"
     "--enable-sm"
-    "--enable-zlib"
-    "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so.1"
+    "--enable-man"
+    "--enable-doc"
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
     "--with-xsl-stylesheetsdir=${docbook_xsl}/xml/xsl/docbook"
+    "--with-pcsc-provider=${pcsclite}/lib/libpcsclite.so"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Set of libraries and utilities to access smart cards";
-    homepage = "https://github.com/OpenSC/OpenSC/wiki";
-    license = stdenv.lib.licenses.lgpl21Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
+    homepage = https://github.com/OpenSC/OpenSC/wiki;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ viric wkennington ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix
index 165eb316a92..02834b70d62 100644
--- a/pkgs/tools/system/tree/default.nix
+++ b/pkgs/tools/system/tree/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 let
   version = "1.7.0";
@@ -6,17 +6,17 @@ let
   # These settings are found in the Makefile, but there seems to be no
   # way to select one ore the other setting other than editing the file
   # manually, so we have to duplicate the know how here.
-  systemFlags =
-    if stdenv.isDarwin then ''
+  systemFlags = with stdenv;
+    if isDarwin then ''
       CFLAGS="-O2 -Wall -fomit-frame-pointer"
       LDFLAGS=
       EXTRA_OBJS=strverscmp.o
-    '' else if stdenv.isCygwin then ''
+    '' else if isCygwin then ''
       CFLAGS="-O2 -Wall -fomit-frame-pointer -DCYGWIN"
       LDFLAGS=-s
       TREE_DEST=tree.exe
       EXTRA_OBJS=strverscmp.o
-    '' else if stdenv.isBSD then ''
+    '' else if (isFreeBSD || isOpenBSD) then ''
       CFLAGS="-O2 -Wall -fomit-frame-pointer"
       LDFLAGS=-s
       EXTRA_OBJS=strverscmp.o
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d30cd98cb87..41011317367 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2714,9 +2714,8 @@ let
 
   tcpflow = callPackage ../tools/networking/tcpflow { };
 
-  teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer { };
+  teamviewer = callPackage_i686 ../applications/networking/remote/teamviewer/10.nix { };
 
-  # Work In Progress: it doesn't start unless running a daemon as root
   teamviewer8 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/8.nix { });
 
   teamviewer9 = lowPrio (callPackage_i686 ../applications/networking/remote/teamviewer/9.nix { });
@@ -3597,7 +3596,7 @@ let
 
   go_1_3 = callPackage ../development/compilers/go/1.3.nix { };
 
-  go_1_4 = callPackage ../development/compilers/go/1.4.nix { };
+  go_1_4 = callPackage ../development/compilers/go/1.4.nix { inherit (darwin) Security; };
 
   go = go_1_4;
 
@@ -3816,6 +3815,8 @@ let
 
     asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { };
 
+    base64 = callPackage ../development/ocaml-modules/base64 { };
+
     bolt = callPackage ../development/ocaml-modules/bolt { };
 
     camlidl = callPackage ../development/tools/ocaml/camlidl { };
@@ -3909,6 +3910,8 @@ let
 
     fieldslib = callPackage ../development/ocaml-modules/fieldslib { };
 
+    fileutils = callPackage ../development/ocaml-modules/fileutils { };
+
     findlib = callPackage ../development/tools/ocaml/findlib { };
 
     fix = callPackage ../development/ocaml-modules/fix { };
@@ -4154,8 +4157,10 @@ let
     ocaml = ocaml_3_08_0;
   };
 
-  rustc       = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {};
+  rustcAlpha  = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {};
+  rustcAlpha2 = callPackage ../development/compilers/rustc/1.0.0-alpha2.nix {};
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
+  rustc = rustcAlpha2;
 
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
@@ -6908,6 +6913,8 @@ let
 
   nss = lowPrio (callPackage ../development/libraries/nss { });
 
+  nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
+
   nssTools = callPackage ../development/libraries/nss {
     includeTools = true;
   };
@@ -7305,6 +7312,8 @@ let
 
   snappy = callPackage ../development/libraries/snappy { };
 
+  socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
+
   sodium = callPackage ../development/libraries/sodium {};
 
   sofia_sip = callPackage ../development/libraries/sofia-sip { };
@@ -7440,6 +7449,8 @@ let
 
   tremor = callPackage ../development/libraries/tremor { };
 
+  uid_wrapper = callPackage ../development/libraries/uid_wrapper { };
+
   unicap = callPackage ../development/libraries/unicap {};
 
   tsocks = callPackage ../development/libraries/tsocks { };
@@ -8299,11 +8310,10 @@ let
   samba3 = callPackage ../servers/samba/3.x.nix { };
 
   samba4 = callPackage ../servers/samba/4.x.nix {
+    libgcrypt = libgcrypt_1_6;
+    libiconv = if stdenv.isLinux then null else libiconv;
     python = python2;
     pythonPackages = python2Packages;
-    libiconv = if stdenv.isLinux then null else libiconv;
-    libgcrypt = libgcrypt_1_6;
-    glusterfs = null; # Broken in the current build
   };
 
   samba = samba4;
@@ -8323,7 +8333,7 @@ let
 
   samba4_light = lowPrio (samba4.override {
     # source3/wscript optionals
-    heimdal = null;
+    kerberos = null;
     openldap = null;
     cups = null;
     pam = null;
@@ -8331,7 +8341,6 @@ let
     acl = null;
     libaio = null;
     fam = null;
-    ctdb = null;
     ceph = null;
     glusterfs = null;
 
@@ -9527,6 +9536,10 @@ let
 
   nafees = callPackage ../data/fonts/nafees { };
 
+  numix-icon-theme = callPackage ../data/icons/numix-icon-theme { };
+
+  numix-icon-theme-circle = callPackage ../data/icons/numix-icon-theme-circle { };
+
   oldstandard = callPackage ../data/fonts/oldstandard { };
 
   open-dyslexic = callPackage ../data/fonts/open-dyslexic { };
@@ -12837,6 +12850,8 @@ let
 
   mate-themes = callPackage ../misc/themes/mate-themes { };
 
+  numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
+
   plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
     qt5 = qt54;
     kf5 = kf57;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 538506a5c1e..94ef8a4ae07 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1,7 +1,7 @@
 /* This file defines the composition for Go packages. */
 
 { overrides, stdenv, go, buildGoPackage, git, pkgconfig, libusb
-, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr }:
+, fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchbzr, pkgs }:
 
 let self = _self // overrides; _self = with self; {
 
@@ -10,13 +10,14 @@ let self = _self // overrides; _self = with self; {
   ## OFFICIAL GO PACKAGES
 
   crypto = buildGoPackage rec {
-    rev = "31393df5baea";
+    rev = "1351f936d976c60a0a48d728281922cf63eafb8d";
     name = "go-crypto-${rev}";
-    goPackagePath = "code.google.com/p/go.crypto";
-    src = fetchhg {
+    goPackagePath = "golang.org/x/crypto";
+    src = fetchFromGitHub {
       inherit rev;
-      url = "https://${goPackagePath}";
-      sha256 = "0b95dpsvxxapcjjvhj05fdmyn0mzffamc25hvxy7xgsl2l9yy3nw";
+      owner  = "golang";
+      repo   = "crypto";
+      sha256 = "1vf4z97y7xnhzjizik0lghr7ip77hhdj9kbb35rr4c9sn108f20j";
     };
   };
 
@@ -81,6 +82,18 @@ let self = _self // overrides; _self = with self; {
 
   ## THIRD PARTY
 
+  asn1-ber = buildGoPackage rec {
+    rev = "ec51d5ed21377b4023ca7b1e70ae4cb296ee6047";
+    name = "asn1-ber-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/nmcclain/asn1-ber";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "nmcclain";
+      repo   = "asn1-ber";
+      sha256 = "0a2d38k7zpcnf148zlxq2rm7s1s1hzybb3w5ygxilipz0m7qkdsb";
+    };
+  };
+
   binarydist = buildGoPackage rec {
     rev = "9955b0ab8708602d411341e55fffd7e0700f86bd";
     name = "binarydist-${stdenv.lib.strings.substring 0 7 rev}";
@@ -189,6 +202,34 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  g2s = buildGoPackage rec {
+    rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc";
+    name = "g2s-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/peterbourgon/g2s";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "peterbourgon";
+      repo   = "g2s";
+      sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj";
+    };
+  };
+
+  goamz = buildGoPackage rec {
+    rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7";
+    name = "goamz-${rev}";
+    goPackagePath = "github.com/goamz/goamz";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "goamz";
+      repo   = "goamz";
+      sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b";
+    };
+    propagatedBuildInputs = [ go-ini ];
+
+    # These might need propagating too, but I haven't tested the entire library
+    buildInputs = [ sets go-simplejson check-v1 ];
+  };
+
   gocheck = buildGoPackage rec {
     rev = "87";
     name = "gocheck-${rev}";
@@ -213,6 +254,19 @@ let self = _self // overrides; _self = with self; {
     doCheck = false; # please check again
   };
 
+  gox = buildGoPackage rec {
+    rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549";
+    name = "gox-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/mitchellh/gox";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "mitchellh";
+      repo   = "gox";
+      sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1";
+    };
+    buildInputs = [ iochan ];
+  };
+
   go-assert = buildGoPackage rec {
     rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3";
     name = "assert-${stdenv.lib.strings.substring 0 7 rev}";
@@ -284,6 +338,18 @@ let self = _self // overrides; _self = with self; {
     subPackages = [ "fuse" "fuse/nodefs" "fuse/pathfs" ];
   };
 
+  go-homedir = buildGoPackage rec {
+    rev = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52";
+    name = "go-homedir-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/mitchellh/go-homedir";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "mitchellh";
+      repo   = "go-homedir";
+      sha256 = "1ixhwxnvq1qx53asq47yhg3l88ndwrnyw4fkkidcjg759dc86d0i";
+    };
+  };
+
   go-hostpool = buildGoPackage rec {
     rev = "fed86fae5cacdc77e7399937e2f8836563620a2e";
     name = "go-hostpool-${stdenv.lib.strings.substring 0 7 rev}";
@@ -296,6 +362,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  go-ini = buildGoPackage rec {
+    rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
+    name = "go-ini-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/vaughan0/go-ini";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "vaughan0";
+      repo   = "go-ini";
+      sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
+    };
+  };
+
   rcrowley.go-metrics = buildGoPackage rec {
     rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
     name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
@@ -423,6 +501,31 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  hologram = buildGoPackage rec {
+    rev  = "6e81a11091f59a9392e424d8f1c42b4b813c4bff";
+    name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/AdRoll/hologram";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "copumpkin";
+      repo   = "hologram";
+      sha256 = "1rpnc8sv9mwm9r9yfh8h2zxczznmvlhasrz55bcifmk4sym4ywq7";
+    };
+    preBuild = ''
+      cd "go/src/$goPackagePath"
+      # Work around `go install` assuming containing directory is the executable name we want
+      for i in */bin; do
+        mv "$i" "$(dirname "$i")/$(dirname "$i")"
+      done
+
+      # Generate protobuf definitions and static assets
+      make protocol/hologram.pb.go
+      make transport/remote/bindata.go
+    '';
+
+    buildInputs = [ pkgs.protobuf crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox ];
+  };
+
   influxdb-go = buildGoPackage rec {
     rev = "63c9a5f67dcb633d05164bf8442160c9e2e402f7";
     name = "influxdb-go-${stdenv.lib.strings.substring 0 7 rev}";
@@ -458,6 +561,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ldap = buildGoPackage rec {
+    rev = "469fe5a802d61523b40dbb29bb8012a6b99b06b5";
+    name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/nmcclain/ldap";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "nmcclain";
+      repo   = "ldap";
+      sha256 = "0xq5dc03ym0wlg9mvf4gbrmj74l4c8bgkls8fd7c98a128qw2srk";
+    };
+    propagatedBuildInputs = [ asn1-ber ];
+    subPackages = [ "./" ];
+  };
+
   log4go = buildGoPackage rec {
     rev = "48";
     name = "log4go-${rev}";
@@ -660,6 +777,56 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  raw = buildGoPackage rec {
+    rev = "724aedf6e1a5d8971aafec384b6bde3d5608fba4";
+    name = "raw-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/feyeleanor/raw";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "feyeleanor";
+      repo   = "raw";
+      sha256 = "0z4dcnadgk0fbxxd14dqa1wzzr0v3ksqlzd0swzs2mipim5wjgsz";
+    };
+  };
+
+  rgbterm = buildGoPackage rec {
+    rev = "9e3d038e1b8341ed7416c841a884cab4a3487941";
+    name = "rgbterm-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/aybabtme/rgbterm";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "aybabtme";
+      repo   = "rgbterm";
+      sha256 = "1pfg56pkm9clzd3c1s0czvydw1k35jggz9ydv8x2dbns3f7qn2ph";
+    };
+  };
+
+  sets = buildGoPackage rec {
+    rev = "6c54cb57ea406ff6354256a4847e37298194478f";
+    name = "sets-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/feyeleanor/sets";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "feyeleanor";
+      repo   = "sets";
+      sha256 = "1l3hyl8kmwb9k6qi8x4w54g2cmydap0g3cqvs47bhvm47rg1j1zc";
+    };
+    propagatedBuildInputs = [ slices ];
+  };
+
+  slices = buildGoPackage rec {
+    rev = "bb44bb2e4817fe71ba7082d351fd582e7d40e3ea";
+    name = "slices-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/feyeleanor/slices";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner  = "feyeleanor";
+      repo   = "slices";
+      sha256 = "1miqhzqgww41d8xbvmxfzx9rsfxgw742nqz96mhjkxpadrxg870v";
+    };
+    propagatedBuildInputs = [ raw ];
+  };
+
   snappy-go = buildGoPackage rec {
     rev = "14";
     name = "snappy-go-${rev}";