Merge staging into closure-size

869 files changed, 36089 insertions, 30192 deletions

diff --git a/doc/language-support.xml b/doc/language-support.xml
index f2b64c93d22..4fd70431950 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -670,7 +670,12 @@ net = buildGoPackage rec {
     url = "https://${goPackagePath}";
     sha256 = "1lkz4c9pyz3yz2yz18hiycvlfhgy3jxp68bs7mv7bcfpaj729qav";
   };
-  propagatedBuildInputs = [ goPackages.text ]; <co xml:id='ex-buildGoPackage-3' />
+  renameImports = [ <co xml:id='ex-buildGoPackage-3' />
+    "code.google.com/p/go.crypto golang.org/x/crypto"
+    "code.google.com/p/goprotobuf github.com/golang/protobuf"
+  ];
+  propagatedBuildInputs = [ goPackages.text ]; <co xml:id='ex-buildGoPackage-4' />
+  buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-5' />
 };
 </programlisting>
 </example>
@@ -698,7 +703,21 @@ the following arguments are of special significance to the function:
     </para>
   </callout>
 
-  <callout arearefs='ex-buildGoPackage-3'>
+  <callout arearefs='ex-buildGoPackage-4'>
+    <para>
+      <varname>renameImports</varname> is a list of import paths to be renamed before
+      building the package. The path to be renamed can be a regular expression.
+    </para>
+    <para>
+      In this example imports will be renamed from
+      <literal>code.google.com/p/go.crypto</literal> to
+      <literal>golang.org/x/crypto</literal> and from
+      <literal>code.google.com/p/goprotobuf</literal> to
+      <literal>github.com/golang/protobuf</literal>.
+    </para>
+  </callout>
+
+  <callout arearefs='ex-buildGoPackage-4'>
     <para>
       <varname>propagatedBuildInputs</varname> is where the dependencies of a Go library are
       listed. Only libraries should list <varname>propagatedBuildInputs</varname>. If a standalone
@@ -707,6 +726,12 @@ the following arguments are of special significance to the function:
     </para>
   </callout>
 
+  <callout arearefs='ex-buildGoPackage-5'>
+    <para>
+      <varname>buildFlags</varname> is a list of flags passed to the go build command.
+    </para>
+  </callout>
+
 </calloutlist>
 
 </para>
diff --git a/doc/packageconfig.xml b/doc/packageconfig.xml
index b5e57df71ff..44ce1974c6c 100644
--- a/doc/packageconfig.xml
+++ b/doc/packageconfig.xml
@@ -1,6 +1,6 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-packageconfig">
+	 xmlns:xlink="http://www.w3.org/1999/xlink"
+	 xml:id="chap-packageconfig">
 
 <title><filename>~/.nixpkgs/config.nix</filename>: global configuration</title>
 
@@ -9,62 +9,79 @@
     </para>
 
     <para>
-        To apply the configuration edit <filename>~/.nixpkgs/config.nix</filename>
-        and set it like
+	To apply the configuration edit <filename>~/.nixpkgs/config.nix</filename>
+	and set it like
 <programlisting>{
   allowUnfree = true;
 }</programlisting>
-        and will allow the Nix package manager to install unfree licensed packages.
+	and will allow the Nix package manager to install unfree licensed packages.
 
-        The configuration as listed also applies to NixOS under <option>nixpkgs.config</option> set.
+	The configuration as listed also applies to NixOS under <option>nixpkgs.config</option> set.
     </para>
 
     <itemizedlist>
-        <listitem>
-            <para>
-                Allow installing of packages that are distributed under unfree license by setting
-                <programlisting>allowUnfree = true;</programlisting>
-                or deny them by setting it to <literal>false</literal>.
-            </para>
-            <para>
-                Same can be achieved by setting the environment variable:
-                <programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
-            </para>
-        </listitem>
+	<listitem>
+	    <para>
+		Allow installing of packages that are distributed under unfree license by setting
+		<programlisting>allowUnfree = true;</programlisting>
+		or deny them by setting it to <literal>false</literal>.
+	    </para>
+	    <para>
+		Same can be achieved by setting the environment variable:
+		<programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
+	    </para>
+	</listitem>
 
-        <listitem>
-            <para>
-                Whenever unfree packages are not allowed, single packages can
-                still be allowed by a predicate function that accepts package
-                as an argument and should return a boolean:
-                <programlisting>allowUnfreePredicate = (pkg: ...);</programlisting>
+	<listitem>
+	    <para>
+		Whenever unfree packages are not allowed, single packages can
+		still be allowed by a predicate function that accepts package
+		as an argument and should return a boolean:
+		<programlisting>allowUnfreePredicate = (pkg: ...);</programlisting>
 
-                Example to allow flash player only:
-                <programlisting>allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name);</programlisting>
-            </para>
-        </listitem>
+		Example to allow flash player only:
+		<programlisting>allowUnfreePredicate = (pkg: pkgs.lib.hasPrefix "flashplayer-" pkg.name);</programlisting>
+	    </para>
+	</listitem>
 
-        <listitem>
-            <para>
-                Whenever unfree packages are not allowed, packages can still be
-                whitelisted by their license:
-                <programlisting>whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];</programlisting>
-            </para>
-        </listitem>
+	<listitem>
+	    <para>
+		Whenever unfree packages are not allowed, packages can still be
+		whitelisted by their license:
+		<programlisting>whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];</programlisting>
+	    </para>
+	</listitem>
 
-        <listitem>
-            <para>
-                In addition to whitelisting licenses which are denied by the
-                <literal>allowUnfree</literal> setting, you can also explicitely
-                deny installation of packages which have a certain license:
-                <programlisting>blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];</programlisting>
-            </para>
-        </listitem>
+	<listitem>
+	    <para>
+		In addition to whitelisting licenses which are denied by the
+		<literal>allowUnfree</literal> setting, you can also explicitely
+		deny installation of packages which have a certain license:
+		<programlisting>blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];</programlisting>
+	    </para>
+	</listitem>
     </itemizedlist>
 
     <para>
-        A complete list of licenses can be found in the file
-        <filename>lib/licenses.nix</filename> of the nix package tree.
+	A complete list of licenses can be found in the file
+	<filename>lib/licenses.nix</filename> of the nix package tree.
     </para>
 
-</chapter>
\ No newline at end of file
+<section><title>Modify packages via <literal>packageOverrides</literal></title>
+
+<para>
+
+  You can define a function called <varname>packageOverrides</varname>
+  in your local <filename>~/.nixpkgs/config</filename> to overide nix
+  packages.  It must be a function that takes pkgs as an argument and
+  return modified set of packages.
+
+  <programlisting>{
+  packageOverrides = pkgs: rec {
+    foo = pkgs.foo.override { ... };
+  };
+}</programlisting>
+</para>
+</section>
+
+</chapter>
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 57afda9f93e..f0e87507ceb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -49,7 +49,6 @@
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
-  cocreature = "Moritz Kiefer <moritz.kiefer@purelyfunctional.org>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
   copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
@@ -60,6 +59,7 @@
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
   DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
   devhell = "devhell <\"^\"@regexmail.net>";
+  dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   doublec = "Chris Double <chris.double@double.co.nz>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
@@ -74,6 +74,7 @@
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
+  forkk = "Andrew Okin <forkk@forkk.net>";
   fpletz = "Franz Pletz <fpletz@fnordicwalking.de>";
   ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>";
   funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
@@ -88,6 +89,7 @@
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
+  hbunke = "Hendrik Bunke <bunke.hendrik@gmail.com>";
   henrytill = "Henry Till <henrytill@gmail.com>";
   hinton = "Tom Hinton <t@larkery.com>";
   hrdinka = "Christoph Hrdinka <c.nix@hrdinka.at>";
@@ -116,6 +118,7 @@
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
   linquize = "Linquize <linquize@yahoo.com.hk>";
+  linus = "Linus Arver <linusarver@gmail.com>";
   lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
@@ -190,6 +193,7 @@
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   sztupi = "Attila Sztupak <attila.sztupak@gmail.com>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
+  taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
   the-kenny = "Moritz Ulrich <moritz@tarn-vedra.de>";
   theuni = "Christian Theune <ct@flyingcircus.io>";
diff --git a/lib/platforms.nix b/lib/platforms.nix
index 93ede5cef08..825cc4136a1 100644
--- a/lib/platforms.nix
+++ b/lib/platforms.nix
@@ -13,4 +13,8 @@ rec {
   none = [];
   allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
   mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"];
+  x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"];
+  i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"];
+  arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
+  mips = [ "mips64el-linux" ];
 }
diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml
index 747159c4427..2983c76c770 100644
--- a/nixos/doc/manual/development/development.xml
+++ b/nixos/doc/manual/development/development.xml
@@ -15,6 +15,7 @@ NixOS.</para>
 <xi:include href="writing-modules.xml" />
 <xi:include href="building-parts.xml" />
 <xi:include href="building-nixos.xml" />
+<xi:include href="nixos-tests.xml" />
 <xi:include href="testing-installer.xml" />
 
 </part>
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
index a98da993330..c09c41ea3bd 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -15,5 +15,6 @@ required for the test.</para>
 
 <xi:include href="writing-nixos-tests.xml" />
 <xi:include href="running-nixos-tests.xml" />
+<xi:include href="running-nixos-tests-interactively.xml" />
 
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
new file mode 100644
index 00000000000..e4749077781
--- /dev/null
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -0,0 +1,43 @@
+<section xmlns="http://docbook.org/ns/docbook"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        version="5.0"
+        xml:id="sec-running-nixos-tests">
+<title>Running Tests interactively</title>
+
+<para>The test itself can be run interactively.  This is
+particularly useful when developing or debugging a test:
+
+<screen>
+$ nix-build nixos/tests/login.nix -A driver
+$ ./result/bin/nixos-test-driver
+starting VDE switch for network 1
+&gt;
+</screen>
+
+You can then take any Perl statement, e.g.
+
+<screen>
+&gt; startAll
+&gt; testScript
+&gt; $machine->succeed("touch /tmp/foo")
+</screen>
+
+The function <command>testScript</command> executes the entire test
+script and drops you back into the test driver command line upon its
+completion.  This allows you to inspect the state of the VMs after the
+test (e.g. to debug the test script).</para>
+
+<para>To just start and experiment with the VMs, run:
+
+<screen>
+$ nix-build nixos/tests/login.nix -A driver
+$ ./result/bin/nixos-run-vms
+</screen>
+
+The script <command>nixos-run-vms</command> starts the virtual
+machines defined by test.  The root file system of the VMs is created
+on the fly and kept across VM restarts in
+<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para>
+
+</section>
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml
index 156dcd205a5..908c0a66a32 100644
--- a/nixos/doc/manual/development/running-nixos-tests.xml
+++ b/nixos/doc/manual/development/running-nixos-tests.xml
@@ -2,7 +2,7 @@
         xmlns:xlink="http://www.w3.org/1999/xlink"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
-        xml:id="sec-running-nixos-tests">
+        xml:id="sec-running-nixos-tests-interactively">
 
 <title>Running Tests</title>
 
@@ -38,42 +38,4 @@ $ firefox result/log.html
 </screen>
 
 </para>
-
-<title>Running Tests interactively</title>
-
-<para>The test itself can be run interactively.  This is
-particularly useful when developing or debugging a test:
-
-<screen>
-$ nix-build nixos/tests/login.nix -A driver
-$ ./result/bin/nixos-test-driver
-starting VDE switch for network 1
-&gt;
-</screen>
-
-You can then take any Perl statement, e.g.
-
-<screen>
-&gt; startAll
-&gt; testScript
-&gt; $machine->succeed("touch /tmp/foo")
-</screen>
-
-The function <command>testScript</command> executes the entire test
-script and drops you back into the test driver command line upon its
-completion.  This allows you to inspect the state of the VMs after the
-test (e.g. to debug the test script).</para>
-
-<para>To just start and experiment with the VMs, run:
-
-<screen>
-$ nix-build nixos/tests/login.nix -A driver
-$ ./result/bin/nixos-run-vms
-</screen>
-
-The script <command>nixos-run-vms</command> starts the virtual
-machines defined by test.  The root file system of the VMs is created
-on the fly and kept across VM restarts in
-<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para>
-
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 34ffe1d6d32..cdbd074e782 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -35,6 +35,20 @@ and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
 was accordingly renamed to <literal>bomi</literal>
 </para></listitem>
 
+<listitem>
+    <para>
+        The default <literal>NIX_PATH</literal> for NixOS now includes
+        <literal>/nix/var/nix/profiles/per-user/root/channels</literal>, so it's
+        easy to add custom channels.
+    </para>
+    <para>
+        Moreover, whenever a <command>nixos-rebuild &lt;action&gt;
+        --upgrade</command> is issued, every channel that includes a file
+        called <filename>.update-on-nixos-rebuild</filename> will be upgraded
+        alongside of the <literal>nixos</literal> channel.
+    </para>
+</listitem>
+
 </itemizedlist>
 </para>
 
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index d3f24e280c7..f2aacf9b292 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -74,14 +74,17 @@ in
 
   config = {
 
-    environment.systemPackages = [ glibcLocales ];
+    environment.systemPackages =
+      optional (config.i18n.supportedLocales != []) glibcLocales;
 
     environment.sessionVariables =
       { LANG = config.i18n.defaultLocale;
         LOCALE_ARCHIVE = "/run/current-system/sw/lib/locale/locale-archive";
       };
 
-    systemd.globalEnvironment.LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+    systemd.globalEnvironment = mkIf (config.i18n.supportedLocales != []) {
+      LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+    };
 
     # ‘/etc/locale.conf’ is used by systemd.
     environment.etc = singleton
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index f3e86bfd201..d22f9ebd1df 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -23,7 +23,6 @@ let
       pkgs.cpio
       pkgs.curl
       pkgs.diffutils
-      pkgs.eject # HAL depends on it anyway
       pkgs.findutils
       pkgs.gawk
       pkgs.glibc # for ldd, getent
@@ -40,15 +39,12 @@ let
       pkgs.ncurses
       pkgs.netcat
       pkgs.openssh
-      pkgs.pciutils
       pkgs.perl
       pkgs.procps
       pkgs.rsync
       pkgs.strace
-      pkgs.sysvtools
       pkgs.su
       pkgs.time
-      pkgs.usbutils
       pkgs.utillinux
       extraManpages
     ];
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 4896eee2908..446d79ce220 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -45,12 +45,6 @@ with lib;
   # Get a console as soon as the initrd loads fbcon on EFI boot.
   boot.initrd.kernelModules = [ "fbcon" ];
 
-  # Add support for cow filesystems and their utilities
-  boot.supportedFilesystems = [ "zfs" "btrfs" ];
-
-  # Configure host id for ZFS to work
-  networking.hostId = "8425e349";
-
   # Allow the user to log in as root without a password.
   users.extraUsers.root.initialHashedPassword = "";
 }
diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 14ae3daace0..097631eda9c 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -45,7 +45,9 @@ while [ "$#" -gt 0 ]; do
             ;;
         --chroot)
             runChroot=1
-            chrootCommand=("$@")
+            if [[ "$@" != "" ]]; then
+                chrootCommand=("$@")
+            fi
             break
             ;;
         --help)
@@ -254,8 +256,14 @@ NIXOS_INSTALL_GRUB=1 chroot $mountPoint \
 chroot $mountPoint /nix/var/nix/profiles/system/activate
 
 
+# Some systems may not be prepared to use NixOS' paths.
+export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH
+export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs
+export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
+
+
 # Ask the user to set a root password.
-if [ "$(chroot $mountPoint nix-instantiate --eval '<nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then
+if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 1 ] ; then
     echo "setting root password..."
     chroot $mountPoint /var/setuid-wrappers/passwd
 fi
diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 1d6df8cb3f7..ccafa30856c 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -96,6 +96,14 @@ fi
 # If ‘--upgrade’ is given, run ‘nix-channel --update nixos’.
 if [ -n "$upgrade" -a -z "$_NIXOS_REBUILD_REEXEC" ]; then
     nix-channel --update nixos
+
+    # If there are other channels that contain a file called
+    # ".update-on-nixos-rebuild", update them as well.
+    for channelpath in /nix/var/nix/profiles/per-user/root/channels/*; do
+        if [ -e "$channelpath/.update-on-nixos-rebuild" ]; then
+            nix-channel --update "$(basename "$channelpath")"
+        fi
+    done
 fi
 
 # Make sure that we use the Nix package we depend on, not something
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index c2523a3cc32..0319c5688fb 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -203,17 +203,20 @@
       sddm = 175;
       tss = 176;
       memcached = 177;
-      nscd = 178;
       ntp = 179;
       zabbix = 180;
       redis = 181;
-      sshd = 182;
       unifi = 183;
       uptimed = 184;
       zope2 = 185;
       ripple-data-api = 186;
       mediatomb = 187;
       rdnssd = 188;
+      ihaskell = 189;
+      i2p = 190;
+      lambdabot = 191;
+      asterisk = 192;
+      plex = 193;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -394,17 +397,20 @@
       sddm = 175;
       tss = 176;
       #memcached = 177; # unused
-      #nscd = 178; # unused
       #ntp = 179; # unused
       #zabbix = 180; # unused
       #redis = 181; # unused
-      #sshd = 182; # unused
       #unifi = 183; # unused
       #uptimed = 184; # unused
       #zope2 = 185; # unused
       #ripple-data-api = 186; #unused
       mediatomb = 187;
       #rdnssd = 188; # unused
+      ihaskell = 189;
+      i2p = 190;
+      lambdabot = 191;
+      #asterisk = 192; # unused
+      plex = 193;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 17717c5988d..61cc551f435 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -149,6 +149,7 @@
   ./services/games/minecraft-server.nix
   ./services/games/minetest-server.nix
   ./services/hardware/acpid.nix
+  ./services/hardware/actkbd.nix
   ./services/hardware/amd-hybrid-graphics.nix
   ./services/hardware/bluetooth.nix
   ./services/hardware/freefall.nix
@@ -193,6 +194,7 @@
   ./services/misc/gitlab.nix
   ./services/misc/gitolite.nix
   ./services/misc/gpsd.nix
+  ./services/misc/ihaskell.nix
   ./services/misc/mediatomb.nix
   ./services/misc/mesos-master.nix
   ./services/misc/mesos-slave.nix
@@ -202,6 +204,7 @@
   ./services/misc/nix-ssh-serve.nix
   ./services/misc/parsoid.nix
   ./services/misc/phd.nix
+  ./services/misc/plex.nix
   ./services/misc/redmine.nix
   ./services/misc/rippled.nix
   ./services/misc/ripple-data-api.nix
@@ -241,6 +244,7 @@
   ./services/network-filesystems/yandex-disk.nix
   ./services/networking/aiccu.nix
   ./services/networking/amuled.nix
+  ./services/networking/asterisk.nix
   ./services/networking/atftpd.nix
   ./services/networking/avahi-daemon.nix
   ./services/networking/bind.nix
@@ -268,10 +272,12 @@
   ./services/networking/haproxy.nix
   ./services/networking/hostapd.nix
   ./services/networking/i2pd.nix
+  ./services/networking/i2p.nix
   ./services/networking/ifplugd.nix
   ./services/networking/iodined.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/kippo.nix
+  ./services/networking/lambdabot.nix
   ./services/networking/mailpile.nix
   ./services/networking/minidlna.nix
   ./services/networking/mstpd.nix
@@ -336,6 +342,7 @@
   ./services/security/fprot.nix
   ./services/security/frandom.nix
   ./services/security/haveged.nix
+  ./services/security/hologram.nix
   ./services/security/munge.nix
   ./services/security/torify.nix
   ./services/security/tor.nix
@@ -410,6 +417,9 @@
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/boot/systemd.nix
+  ./system/boot/networkd.nix
+  ./system/boot/resolved.nix
+  ./system/boot/timesyncd.nix
   ./system/boot/tmp.nix
   ./system/etc/etc.nix
   ./system/upstart/upstart.nix
@@ -423,6 +433,7 @@
   ./tasks/filesystems/f2fs.nix
   ./tasks/filesystems/jfs.nix
   ./tasks/filesystems/nfs.nix
+  ./tasks/filesystems/ntfs.nix
   ./tasks/filesystems/reiserfs.nix
   ./tasks/filesystems/unionfs-fuse.nix
   ./tasks/filesystems/vfat.nix
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 5211b905002..f6676fc3793 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -29,6 +29,8 @@
     pkgs.hdparm
     pkgs.dmraid
     pkgs.smartmontools # for diagnosing hard disks
+    pkgs.pciutils
+    pkgs.usbutils
 
     # Tools to create / manipulate filesystems.
     pkgs.ntfsprogs # for resizing NTFS partitions
@@ -50,6 +52,8 @@
   ];
 
   # Include support for various filesystems.
-  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" ];
+  boot.supportedFilesystems = [ "btrfs" "reiserfs" "vfat" "f2fs" "zfs" "ntfs" "cifs" ];
 
+  # Configure host id for ZFS to work
+  networking.hostId = "8425e349";
 }
diff --git a/nixos/modules/profiles/container.nix b/nixos/modules/profiles/docker-container.nix
index dd2e6579a93..df762b7ac58 100644
--- a/nixos/modules/profiles/container.nix
+++ b/nixos/modules/profiles/docker-container.nix
@@ -45,10 +45,6 @@ in {
       ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system
     '';
 
-  # Disable some features that are not useful in a container.
-  sound.enable = mkDefault false;
-  services.udisks2.enable = mkDefault false;
-
   # Install new init script
   system.activationScripts.installInitScript = ''
     ln -fs $systemConfig/init /init
diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix
index 5aab2a2954e..a41d17e5182 100644
--- a/nixos/modules/profiles/installation-device.nix
+++ b/nixos/modules/profiles/installation-device.nix
@@ -26,15 +26,14 @@ with lib;
     # Disable some other stuff we don't need.
     security.sudo.enable = false;
 
-    # Include only the en_US locale.  This saves 75 MiB or so compared to
-    # the full glibcLocales package.
-    i18n.supportedLocales = ["en_US.UTF-8/UTF-8" "en_US/ISO-8859-1"];
+    # Automatically log in at the virtual consoles.
+    services.mingetty.autologinUser = "root";
 
     # Some more help text.
     services.mingetty.helpLine =
       ''
 
-        Log in as "root" with an empty password.  ${
+        The "root" account has an empty password.  ${
           optionalString config.services.xserver.enable
             "Type `start display-manager' to\nstart the graphical user interface."}
       '';
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index 5067622aaf1..69729923e03 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -3,6 +3,9 @@
 
 { config, lib, pkgs, ... }:
 
+with lib;
+
 {
-  environment.noXlibs = true;
+  environment.noXlibs = mkDefault true;
+  i18n.supportedLocales = [ config.i18n.defaultLocale ];
 }
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index e0379a2c02a..dce757ceb62 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -28,6 +28,7 @@ in
           [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixpkgs=/etc/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
+            "/nix/var/nix/profiles/per-user/root/channels"
           ];
       };
 
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 895ecb122cb..566398d839f 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -100,8 +100,10 @@ in
         chgpasswd = { rootOK = true; };
       };
 
-    security.setuidPrograms = [ "passwd" "chfn" "su" "sg" "newgrp"
-      "newuidmap" "newgidmap"  # new in shadow 4.2.x
+    security.setuidPrograms = [ "su" "chfn" ]
+      ++ lib.optionals config.users.mutableUsers
+      [ "passwd" "sg" "newgrp"
+        "newuidmap" "newgidmap" # new in shadow 4.2.x
       ];
 
   };
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 80d40a7c708..d8845fd8f44 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -53,7 +53,7 @@ in
           # Set up a default Nix expression from which to install stuff.
           if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
               rm -f $HOME/.nix-defexpr
-              mkdir $HOME/.nix-defexpr
+              mkdir -p $HOME/.nix-defexpr
               if [ "$USER" != root ]; then
                   ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
               fi
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index d90cffbd967..fc83e7ed590 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -135,7 +135,7 @@ in zipModules ([]
 
 ++ obsolete [ "services" "mysql55" ] [ "services" "mysql" ]
 
-++ obsolete [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]
+++ alias    [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ]
 
 # XBMC
 ++ obsolete [ "services" "xserver" "windowManager" "xbmc" ] [ "services" "xserver" "desktopManager" "kodi" ]
diff --git a/nixos/modules/security/grsecurity.nix b/nixos/modules/security/grsecurity.nix
index 35974f6890e..b116d8bfef2 100644
--- a/nixos/modules/security/grsecurity.nix
+++ b/nixos/modules/security/grsecurity.nix
@@ -112,9 +112,6 @@ in
             <literal>kernel.grsecurity.grsec_lock</literal> to
             non-zero as soon as all sysctl options are set. *THIS IS
             EXTREMELY IMPORTANT*!
-
-            If disabled, this also turns off the
-            <literal>systemd-sysctl</literal> service.
           '';
         };
 
@@ -229,11 +226,8 @@ in
             kernel 3.19) to continue.
           '';
         }
-        { assertion = (cfg.stable -> !cfg.testing) || (cfg.testing -> !cfg.stable);
-          message   = ''
-            You must select either the stable or testing patch, not
-            both.
-          '';
+        { assertion = !(cfg.stable && cfg.testing);
+          message   = "Select either one of the stable or testing patch";
         }
         { assertion = (cfg.config.restrictProc -> !cfg.config.restrictProcWithGroup) ||
                       (cfg.config.restrictProcWithGroup -> !cfg.config.restrictProc);
@@ -282,22 +276,21 @@ in
 #     };
 #   };
 
-    system.activationScripts.grsec =
-      ''
-        mkdir -p /etc/grsec
-        if [ ! -f /etc/grsec/learn_config ]; then
-          cp ${pkgs.gradm}/etc/grsec/learn_config /etc/grsec
-        fi
-        if [ ! -f /etc/grsec/policy ]; then
-          cp ${pkgs.gradm}/etc/grsec/policy /etc/grsec
-        fi
-        chmod -R 0600 /etc/grsec
-      '';
+    system.activationScripts = lib.optionalAttrs (!cfg.config.disableRBAC) { grsec = ''
+      mkdir -p /etc/grsec
+      if [ ! -f /etc/grsec/learn_config ]; then
+        cp ${pkgs.gradm}/etc/grsec/learn_config /etc/grsec
+      fi
+      if [ ! -f /etc/grsec/policy ]; then
+        cp ${pkgs.gradm}/etc/grsec/policy /etc/grsec
+      fi
+      chmod -R 0600 /etc/grsec
+    ''; };
 
     # Enable AppArmor, gradm udev rules, and utilities
     security.apparmor.enable   = true;
     boot.kernelPackages        = customGrsecPkg;
-    services.udev.packages     = [ pkgs.gradm ];
-    environment.systemPackages = [ pkgs.gradm pkgs.paxctl pkgs.pax-utils ];
+    services.udev.packages     = lib.optional (!cfg.config.disableRBAC) pkgs.gradm;
+    environment.systemPackages = [ pkgs.paxctl pkgs.pax-utils ] ++ lib.optional (!cfg.config.disableRBAC) pkgs.gradm;
   };
 }
diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index 653c0ed5d70..c63f4dc8d7f 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -33,6 +33,16 @@ in
         '';
       };
 
+      enableMediaKeys = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable volume and capture control with keyboard media keys.
+
+          Enabling this will turn on <option>services.actkbd</option>.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -80,6 +90,23 @@ in
         };
       };
 
+    services.actkbd = mkIf config.sound.enableMediaKeys {
+      enable = true;
+      bindings = [
+        # "Mute" media key
+        { keys = [ 113 ]; events = [ "key" ];       command = "${alsaUtils}/bin/amixer -q set Master toggle"; }
+
+        # "Lower Volume" media key
+        { keys = [ 114 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1- unmute"; }
+
+        # "Raise Volume" media key
+        { keys = [ 115 ]; events = [ "key" "rep" ]; command = "${alsaUtils}/bin/amixer -q set Master 1+ unmute"; }
+
+        # "Mic Mute" media key
+        { keys = [ 190 ]; events = [ "key" ];       command = "${alsaUtils}/bin/amixer -q set Capture toggle"; }
+      ];
+    };
+
   };
 
 }
diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index d9b5bf7b5e6..06ba4b9b5ac 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -11,7 +11,7 @@ let
   mpdConf = pkgs.writeText "mpd.conf" ''
     music_directory     "${cfg.musicDirectory}"
     playlist_directory  "${cfg.dataDir}/playlists"
-    db_file             "${cfg.dataDir}/tag_cache"
+    db_file             "${cfg.dbFile}"
     state_file          "${cfg.dataDir}/state"
     sticker_file        "${cfg.dataDir}/sticker.sql"
     log_file            "syslog"
@@ -93,6 +93,14 @@ in {
         };
 
       };
+
+      dbFile = mkOption {
+        type = types.str;
+        default = "${cfg.dataDir}/tag_cache";
+        description = ''
+          The path to MPD's database.
+        '';
+      };
     };
 
   };
diff --git a/nixos/modules/services/backup/tarsnap.nix b/nixos/modules/services/backup/tarsnap.nix
index 155161945cd..f8eeb437844 100644
--- a/nixos/modules/services/backup/tarsnap.nix
+++ b/nixos/modules/services/backup/tarsnap.nix
@@ -5,20 +5,21 @@ with lib;
 let
   cfg = config.services.tarsnap;
 
-  optionalNullStr = e: v: if e == null then "" else v;
-
   configFile = cfg: ''
     cachedir ${config.services.tarsnap.cachedir}
     keyfile  ${config.services.tarsnap.keyfile}
     ${optionalString cfg.nodump "nodump"}
     ${optionalString cfg.printStats "print-stats"}
     ${optionalString cfg.printStats "humanize-numbers"}
-    ${optionalNullStr cfg.checkpointBytes "checkpoint-bytes "+cfg.checkpointBytes}
+    ${optionalString (cfg.checkpointBytes != null) ("checkpoint-bytes "+cfg.checkpointBytes)}
     ${optionalString cfg.aggressiveNetworking "aggressive-networking"}
     ${concatStringsSep "\n" (map (v: "exclude "+v) cfg.excludes)}
     ${concatStringsSep "\n" (map (v: "include "+v) cfg.includes)}
     ${optionalString cfg.lowmem "lowmem"}
     ${optionalString cfg.verylowmem "verylowmem"}
+    ${optionalString (cfg.maxbw != null) ("maxbw "+toString cfg.maxbw)}
+    ${optionalString (cfg.maxbwRateUp != null) ("maxbw-rate-up "+toString cfg.maxbwRateUp)}
+    ${optionalString (cfg.maxbwRateDown != null) ("maxbw-rate-down "+toString cfg.maxbwRateDown)}
   '';
 in
 {
@@ -166,6 +167,33 @@ in
                   slowing down the archiving process.
                 '';
               };
+
+              maxbw = mkOption {
+                type = types.nullOr types.int;
+                default = null;
+                description = ''
+                  Abort archival if upstream bandwidth usage in bytes
+                  exceeds this threshold.
+                '';
+              };
+
+              maxbwRateUp = mkOption {
+                type = types.nullOr types.int;
+                default = null;
+                example = literalExample "25 * 1000";
+                description = ''
+                  Upload bandwidth rate limit in bytes.
+                '';
+              };
+
+              maxbwRateDown = mkOption {
+                type = types.nullOr types.int;
+                default = null;
+                example = literalExample "50 * 1000";
+                description = ''
+                  Download bandwidth rate limit in bytes.
+                '';
+              };
             };
           }
         ));
diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix
index d9ae0454ba5..6a775bb159f 100644
--- a/nixos/modules/services/cluster/kubernetes.nix
+++ b/nixos/modules/services/cluster/kubernetes.nix
@@ -224,7 +224,7 @@ in {
 
       machines = mkOption {
         description = "Kubernetes controller list of machines to schedule to schedule onto";
-        default = [];
+        default = [config.networking.hostName];
         type = types.listOf types.str;
       };
 
@@ -310,6 +310,12 @@ in {
         type = types.str;
       };
 
+      master = mkOption {
+        description = "Kubernetes apiserver address";
+        default = "${cfg.apiserver.address}:${toString cfg.apiserver.port}";
+        type = types.str;
+      };
+
       extraOpts = mkOption {
         description = "Kubernetes proxy extra command line options.";
         default = "";
@@ -355,6 +361,7 @@ in {
             --secure_port=${toString cfg.apiserver.securePort} \
             --portal_net=${cfg.apiserver.portalNet} \
             --logtostderr=true \
+            --runtime_config=api/v1beta3 \
             ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
             ${cfg.apiserver.extraOpts}
           '';
@@ -416,7 +423,6 @@ in {
         script = ''
           export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH"
           exec ${cfg.package}/bin/kubelet \
-            --etcd_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.etcdServers} \
             --api_servers=${concatMapStringsSep "," (f: "http://${f}") cfg.kubelet.apiServers}  \
             --address=${cfg.kubelet.address} \
             --port=${toString cfg.kubelet.port} \
@@ -443,7 +449,7 @@ in {
         after = [ "network-interfaces.target" "etcd.service" ];
         serviceConfig = {
           ExecStart = ''${cfg.package}/bin/kube-proxy \
-            --etcd_servers=${concatMapStringsSep "," (s: "http://${s}") cfg.etcdServers} \
+            --master=${cfg.proxy.master} \
             --bind_address=${cfg.proxy.address} \
             --logtostderr=true \
             ${optionalString cfg.verbose "--v=6 --log_flush_frequency=1s"} \
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 6bdd5edff1f..0e041fdbfbc 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -34,6 +34,8 @@ with lib;
 
     services.dbus.packages = [ pkgs.geoclue2 ];
 
+    systemd.packages = [ pkgs.geoclue2 ];
+
   };
 
 }
diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix
new file mode 100644
index 00000000000..82de362c371
--- /dev/null
+++ b/nixos/modules/services/hardware/actkbd.nix
@@ -0,0 +1,130 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.actkbd;
+
+  configFile = pkgs.writeText "actkbd.conf" ''
+    ${concatMapStringsSep "\n"
+      ({ keys, events, attributes, command, ... }:
+        ''${concatMapStringsSep "+" toString keys}:${concatStringsSep "," events}:${concatStringsSep "," attributes}:${command}''
+      )
+      cfg.bindings}
+    ${cfg.extraConfig}
+  '';
+
+  bindingCfg = { config, ... }: {
+    options = {
+
+      keys = mkOption {
+        type = types.listOf types.int;
+        description = "List of keycodes to match.";
+      };
+
+      events = mkOption {
+        type = types.listOf (types.enum ["key" "rep" "rel"]);
+        default = [ "key" ];
+        description = "List of events to match.";
+      };
+
+      attributes = mkOption {
+        type = types.listOf types.str;
+        default = [ "exec" ];
+        description = "List of attributes.";
+      };
+
+      command = mkOption {
+        type = types.str;
+        default = "";
+        description = "What to run.";
+      };
+
+    };
+  };
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.actkbd = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the <command>actkbd</command> key mapping daemon.
+
+          Turning this on will start an <command>actkbd</command>
+          instance for every evdev input that has at least one key
+          (which is okay even for systems with tiny memory footprint,
+          since actkbd normally uses &lt;100 bytes of memory per
+          instance).
+
+          This allows binding keys globally without the need for e.g.
+          X11.
+        '';
+      };
+
+      bindings = mkOption {
+        type = types.listOf (types.submodule bindingCfg);
+        default = [];
+        example = lib.literalExample ''
+          [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsaUtils}/bin/amixer -q set Master toggle"; }
+          ]
+        '';
+        description = ''
+          Key bindings for <command>actkbd</command>.
+
+          See <command>actkbd</command> <filename>README</filename> for documentation.
+
+          The example shows a piece of what <option>sound.enableMediaKeys</option> does when enabled.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Literal contents to append to the end of actkbd configuration file.
+        '';
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    services.udev.packages = lib.singleton (pkgs.writeTextFile {
+      name = "actkbd-udev-rules";
+      destination = "/etc/udev/rules.d/61-actkbd.rules";
+      text = ''
+        ACTION=="add", SUBSYSTEM=="input", KERNEL=="event[0-9]*", ENV{ID_INPUT_KEY}=="1", TAG+="systemd", ENV{SYSTEMD_WANTS}+="actkbd@$env{DEVNAME}.service"
+      '';
+    });
+
+    systemd.services."actkbd@" = {
+      enable = true;
+      restartIfChanged = true;
+      unitConfig = {
+        Description = "actkbd on %I";
+        ConditionPathExists = "%I";
+      };
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.actkbd}/bin/actkbd -D -c ${configFile} -d %I";
+      };
+    };
+
+  };
+
+}
diff --git a/nixos/modules/services/logging/fluentd.nix b/nixos/modules/services/logging/fluentd.nix
index 61eeec504e0..3aa27a15266 100644
--- a/nixos/modules/services/logging/fluentd.nix
+++ b/nixos/modules/services/logging/fluentd.nix
@@ -33,6 +33,7 @@ in {
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.fluentd}/bin/fluentd -c ${pkgs.writeText "fluentd.conf" cfg.config}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };
     };
   };
diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix
index 284361a04d9..26d2753879d 100644
--- a/nixos/modules/services/misc/etcd.nix
+++ b/nixos/modules/services/misc/etcd.nix
@@ -11,7 +11,7 @@ in {
     enable = mkOption {
       description = "Whether to enable etcd.";
       default = false;
-      type = types.uniq types.bool;
+      type = types.bool;
     };
 
     name = mkOption {
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
new file mode 100644
index 00000000000..7f7f981de49
--- /dev/null
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -0,0 +1,76 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.ihaskell;
+  ihaskell = pkgs.ihaskell.override {
+    inherit (cfg.haskellPackages) ihaskell ghcWithPackages;
+    packages = self: cfg.extraPackages self;
+  };
+
+in
+
+{
+  options = {
+    services.ihaskell = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Autostart an IHaskell notebook service.";
+      };
+
+      haskellPackages = mkOption {
+        default = pkgs.haskellngPackages;
+        defaultText = "pkgs.haskellngPackages";
+        example = literalExample "pkgs.haskell-ng.packages.ghc784";
+        description = ''
+          haskellPackages used to build IHaskell and other packages.
+          This can be used to change the GHC version used to build
+          IHaskell and the packages listed in
+          <varname>extraPackages</varname>.
+        '';
+      };
+
+      extraPackages = mkOption {
+        default = self: [];
+        example = literalExample ''
+          haskellPackages: [
+            haskellPackages.wreq
+            haskellPackages.lens
+          ]
+        '';
+        description = ''
+          Extra packages available to ghc when running ihaskell. The
+          value must be a function which receives the attrset defined
+          in <varname>haskellPackages</varname> as the sole argument.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers.ihaskell = {
+      group = config.users.extraGroups.ihaskell.name;
+      description = "IHaskell user";
+      home = "/var/lib/ihaskell";
+      createHome = true;
+      uid = config.ids.uids.ihaskell;
+    };
+
+    users.extraGroups.ihaskell.gid = config.ids.gids.ihaskell;
+
+    systemd.services.ihaskell = {
+      description = "IHaskell notebook instance";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        User = config.users.extraUsers.ihaskell.name;
+        Group = config.users.extraGroups.ihaskell.name;
+        ExecStart = "${pkgs.stdenv.shell} -c \"cd $HOME;${ihaskell}/bin/ihaskell-notebook\"";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
new file mode 100644
index 00000000000..f4642b5157e
--- /dev/null
+++ b/nixos/modules/services/misc/plex.nix
@@ -0,0 +1,87 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.plex;
+  plex = pkgs.plex;
+in
+{
+  options = {
+    services.plex = {
+      enable = mkEnableOption "Enable Plex Media Server";
+
+      # FIXME: In order for this config option to work, symlinks in the Plex
+      # package in the Nix store have to be changed to point to this directory.
+      dataDir = mkOption {
+        type = types.str;
+        default = "/var/lib/plex";
+        description = "The directory where Plex stores its data files.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "plex";
+        description = "User account under which Plex runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "plex";
+        description = "Group under which Plex runs.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Most of this is just copied from the RPM package's systemd service file.
+    systemd.services.plex = {
+      description = "Plex Media Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        test -d "${cfg.dataDir}" || {
+          echo "Creating initial Plex data directory in \"${cfg.dataDir}\"."
+          mkdir -p "${cfg.dataDir}"
+          chown -R ${cfg.user}:${cfg.group} "${cfg.dataDir}"
+        }
+        # Copy the database skeleton files to /var/lib/plex/.skeleton
+        test -d "${cfg.dataDir}/.skeleton" || mkdir "${cfg.dataDir}/.skeleton"
+        for db in "com.plexapp.plugins.library.db"; do
+            cp "${plex}/usr/lib/plexmediaserver/Resources/base_$db" "${cfg.dataDir}/.skeleton/$db"
+            chmod u+w "${cfg.dataDir}/.skeleton/$db"
+            chown ${cfg.user}:${cfg.group} "${cfg.dataDir}/.skeleton/$db"
+        done
+     '';
+      serviceConfig = {
+        Type = "simple";
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = "true";
+        ExecStart = "/bin/sh -c '${plex}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'";
+      };
+      environment = {
+        PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=cfg.dataDir;
+        PLEX_MEDIA_SERVER_HOME="${plex}/usr/lib/plexmediaserver";
+        PLEX_MEDIA_SERVER_MAX_PLUGIN_PROCS="6";
+        PLEX_MEDIA_SERVER_TMPDIR="/tmp";
+        LD_LIBRARY_PATH="${plex}/usr/lib/plexmediaserver";
+        LC_ALL="en_US.UTF-8";
+        LANG="en_US.UTF-8";
+      };
+    };
+
+    users.extraUsers = mkIf (cfg.user == "plex") {
+      plex = {
+        group = cfg.group;
+        uid = config.ids.uids.plex;
+      };
+    };
+
+    users.extraGroups = mkIf (cfg.group == "plex") {
+      plex = {
+        gid = config.ids.gids.plex;
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/misc/ripple-data-api.nix b/nixos/modules/services/misc/ripple-data-api.nix
index 6e5ac7ab00b..3b281449a25 100644
--- a/nixos/modules/services/misc/ripple-data-api.nix
+++ b/nixos/modules/services/misc/ripple-data-api.nix
@@ -43,6 +43,24 @@ in {
         type = types.int;
       };
 
+      importMode = mkOption {
+        description = "Ripple data api import mode.";
+        default = "liveOnly";
+        type = types.enum ["live" "liveOnly"];
+      };
+
+      minLedger = mkOption {
+        description = "Ripple data api minimal ledger to fetch.";
+        default = null;
+        type = types.nullOr types.int;
+      };
+
+      maxLedger = mkOption {
+        description = "Ripple data api maximal ledger to fetch.";
+        default = null;
+        type = types.nullOr types.int;
+      };
+
       redis = {
         enable = mkOption {
           description = "Whether to enable caching of ripple data to redis.";
@@ -129,6 +147,7 @@ in {
 
       serviceConfig = {
         ExecStart = "${pkgs.ripple-data-api}/bin/api";
+        Restart = "always";
         User = "ripple-data-api";
       };
     };
@@ -145,8 +164,15 @@ in {
         LOG_FILE = "/dev/null";
       };
 
-      serviceConfig = {
-        ExecStart = "${pkgs.ripple-data-api}/bin/importer live debug2";
+      serviceConfig = let
+        importMode =
+          if cfg.minLedger != null && cfg.maxLedger != null then
+            "${toString cfg.minLedger} ${toString cfg.maxLedger}"
+          else
+            cfg.importMode;
+      in {
+        ExecStart = "${pkgs.ripple-data-api}/bin/importer ${importMode} debug";
+        Restart = "always";
         User = "ripple-data-api";
       };
 
diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix
index 85a1ed8ae9e..03fcc003a40 100644
--- a/nixos/modules/services/misc/rippled.nix
+++ b/nixos/modules/services/misc/rippled.nix
@@ -12,7 +12,7 @@ let
     path=${db.path}
     ${optionalString (db.compression != null) ("compression=${b2i db.compression}") }
     ${optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")}
-    ${optionalString (db.advisoryDelete != null) ("advisory_delete=${toString db.advisoryDelete}")}
+    ${optionalString (db.advisoryDelete != null) ("advisory_delete=${b2i db.advisoryDelete}")}
     ${db.extraOpts}
   '';
 
@@ -71,6 +71,13 @@ let
     [sntp_servers]
     ${concatStringsSep "\n" cfg.sntpServers}
 
+    ${optionalString cfg.statsd.enable ''
+    [insight]
+    server=statsd
+    address=${cfg.statsd.address}
+    prefix=${cfg.statsd.prefix}
+    ''}
+
     [rpc_startup]
     { "command": "log_level", "severity": "${cfg.logLevel}" }
   '' + cfg.extraConfig;
@@ -142,7 +149,6 @@ let
 	  default = null;
 	  type = types.nullOr types.path;
 	};
-
       };
     };
   };
@@ -150,7 +156,7 @@ let
   dbOptions = {
     type = mkOption {
       description = "Rippled database type.";
-      type = types.enum ["rocksdb" "nudb" "sqlite"];
+      type = types.enum ["rocksdb" "nudb" "sqlite" "hyperleveldb"];
       default = "rocksdb";
     };
 
@@ -317,7 +323,7 @@ in
 	  Path to the ripple database.
 	'';
 	type = types.path;
-	default = "/var/lib/rippled/db";
+	default = "/var/lib/rippled";
       };
 
       validationQuorum = mkOption {
@@ -366,6 +372,22 @@ in
 	default = "error";
       };
 
+      statsd = {
+        enable = mkEnableOption "Whether enable statsd monitoring for rippled";
+
+        address = mkOption {
+          description = "The UDP address and port of the listening StatsD server.";
+          default = "127.0.0.1:8125";
+          type = types.str;
+        };
+
+        prefix = mkOption {
+          description = "A string prepended to each collected metric.";
+          default = "";
+          type = types.str;
+        };
+      };
+
       extraConfig = mkOption {
         default = "";
 	description = ''
@@ -400,6 +422,8 @@ in
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/rippled --fg --conf ${cfg.config}";
         User = "rippled";
+	Restart = "on-failure";
+	LimitNOFILE=10000;
       };
     };
 
diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index d6babb8e9a5..8b3741bca0a 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -4,6 +4,10 @@ with lib;
 
 let
 
+  smbToString = x: if builtins.typeOf x == "bool"
+                   then (if x then "true" else "false")
+                   else toString x;
+
   cfg = config.services.samba;
 
   samba = cfg.package;
@@ -15,9 +19,9 @@ let
 
   shareConfig = name:
     let share = getAttr name cfg.shares; in
-    "[${name}]\n " + (toString (
+    "[${name}]\n " + (smbToString (
        map
-         (key: "${key} = ${toString (getAttr key share)}\n")
+         (key: "${key} = ${smbToString (getAttr key share)}\n")
          (attrNames share)
     ));
 
@@ -27,12 +31,12 @@ let
       [ global ]
       security = ${cfg.securityType}
       passwd program = /var/setuid-wrappers/passwd %u
-      pam password change = ${if cfg.syncPasswordsByPam then "yes" else "no"}
-      invalid users = ${toString cfg.invalidUsers}
+      pam password change = ${smbToString cfg.syncPasswordsByPam}
+      invalid users = ${smbToString cfg.invalidUsers}
 
       ${cfg.extraConfig}
 
-      ${toString (map shareConfig (attrNames cfg.shares))}
+      ${smbToString (map shareConfig (attrNames cfg.shares))}
     '');
 
   # This may include nss_ldap, needed for samba if it has to use ldap.
@@ -151,7 +155,7 @@ in
         example =
           { srv =
              { path = "/srv";
-               "read only" = "yes";
+               "read only" = true;
                 comment = "Public samba share.";
              };
           };
@@ -193,7 +197,7 @@ in
             "samba-setup" = {
               description = "Samba Setup Task";
               script = setupScript;
-              unitConfig.RequiresMountsFor = "/var/samba /var/log/samba";
+              unitConfig.RequiresMountsFor = "/var/lib/samba";
             };
           };
         };
diff --git a/nixos/modules/services/networking/asterisk.nix b/nixos/modules/services/networking/asterisk.nix
new file mode 100644
index 00000000000..b079cb22730
--- /dev/null
+++ b/nixos/modules/services/networking/asterisk.nix
@@ -0,0 +1,223 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.asterisk;
+
+  asteriskUser = "asterisk";
+
+  varlibdir = "/var/lib/asterisk";
+  spooldir = "/var/spool/asterisk";
+  logdir = "/var/log/asterisk";
+
+  asteriskEtc = pkgs.stdenv.mkDerivation
+  ((mapAttrs' (name: value: nameValuePair
+        # Fudge the names to make bash happy
+        ((replaceChars ["."] ["_"] name) + "_")
+        (value)
+      ) cfg.confFiles) //
+  {
+    confFilesString = concatStringsSep " " (
+      attrNames cfg.confFiles
+    );
+
+    name = "asterisk.etc";
+
+    # Default asterisk.conf file
+    # (Notice that astetcdir will be set to the path of this derivation)
+    asteriskConf = ''
+      [directories]
+      astetcdir => @out@
+      astmoddir => ${pkgs.asterisk}/lib/asterisk/modules
+      astvarlibdir => /var/lib/asterisk
+      astdbdir => /var/lib/asterisk
+      astkeydir => /var/lib/asterisk
+      astdatadir => /var/lib/asterisk
+      astagidir => /var/lib/asterisk/agi-bin
+      astspooldir => /var/spool/asterisk
+      astrundir => /var/run/asterisk
+      astlogdir => /var/log/asterisk
+      astsbindir => ${pkgs.asterisk}/sbin
+    '';
+    extraConf = cfg.extraConfig;
+
+    # Loading all modules by default is considered sensible by the authors of
+    # "Asterisk: The Definitive Guide". Secure sites will likely want to
+    # specify their own "modules.conf" in the confFiles option.
+    modulesConf = ''
+      [modules]
+      autoload=yes
+    '';
+
+    # Use syslog for logging so logs can be viewed with journalctl
+    loggerConf = ''
+      [general]
+
+      [logfiles]
+      syslog.local0 => notice,warning,error
+    '';
+
+    buildCommand = ''
+      mkdir -p "$out"
+
+      # Create asterisk.conf, pointing astetcdir to the path of this derivation
+      echo "$asteriskConf" | sed "s|@out@|$out|g" > "$out"/asterisk.conf
+      echo "$extraConf" >> "$out"/asterisk.conf
+
+      echo "$modulesConf" > "$out"/modules.conf
+
+      echo "$loggerConf" > "$out"/logger.conf
+
+      # Config files specified in confFiles option override all other files
+      for i in $confFilesString; do
+        conf=$(echo "$i"_ | sed 's/\./_/g')
+        echo "''${!conf}" > "$out"/"$i"
+      done
+    '';
+  });
+in
+
+{
+  options = {
+    services.asterisk = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable the Asterisk PBX server.
+        '';
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.lines;
+        example = ''
+          [options]
+          verbose=3
+          debug=3
+        '';
+        description = ''
+          Extra configuration options appended to the default
+          <literal>asterisk.conf</literal> file.
+        '';
+      };
+
+      confFiles = mkOption {
+        default = {};
+        type = types.attrsOf types.str;
+        example = literalExample
+          ''
+            {
+              "extensions.conf" = '''
+                [tests]
+                ; Dial 100 for "hello, world"
+                exten => 100,1,Answer()
+                same  =>     n,Wait(1)
+                same  =>     n,Playback(hello-world)
+                same  =>     n,Hangup()
+
+                [softphones]
+                include => tests
+
+                [unauthorized]
+              ''';
+              "sip.conf" = '''
+                [general]
+                allowguest=no              ; Require authentication
+                context=unauthorized       ; Send unauthorized users to /dev/null
+                srvlookup=no               ; Don't do DNS lookup
+                udpbindaddr=0.0.0.0        ; Listen on all interfaces
+                nat=force_rport,comedia    ; Assume device is behind NAT
+
+                [softphone](!)
+                type=friend                ; Match on username first, IP second
+                context=softphones         ; Send to softphones context in
+                                           ; extensions.conf file
+                host=dynamic               ; Device will register with asterisk
+                disallow=all               ; Manually specify codecs to allow
+                allow=g722
+                allow=ulaw
+                allow=alaw
+
+                [myphone](softphone)
+                secret=GhoshevFew          ; Change this password!
+              ''';
+              "logger.conf" = '''
+                [general]
+
+                [logfiles]
+                ; Add debug output to log
+                syslog.local0 => notice,warning,error,debug
+              ''';
+            }
+        '';
+        description = ''
+          Sets the content of config files (typically ending with
+          <literal>.conf</literal>) in the Asterisk configuration directory.
+
+          Note that if you want to change <literal>asterisk.conf</literal>, it
+          is preferable to use the <option>services.asterisk.extraConfig</option>
+          option over this option. If <literal>"asterisk.conf"</literal> is
+          specified with the <option>confFiles</option> option (not recommended),
+          you must be prepared to set your own <literal>astetcdir</literal>
+          path.
+
+          See
+          <link xlink:href="http://www.asterisk.org/community/documentation"/>
+          for more examples of what is possible here.
+        '';
+      };
+
+      extraArguments = mkOption {
+        default = [];
+        type = types.listOf types.str;
+        example =
+          [ "-vvvddd" "-e" "1024" ];
+        description = ''
+          Additional command line arguments to pass to Asterisk.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers = singleton
+    { name = asteriskUser;
+      uid = config.ids.uids.asterisk;
+      description = "Asterisk daemon user";
+      home = varlibdir;
+    };
+
+    systemd.services.asterisk = {
+      description = ''
+        Asterisk PBX server
+      '';
+
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        # Copy skeleton directory tree to /var
+        for d in '${varlibdir}' '${spooldir}' '${logdir}'; do
+          # TODO: Make exceptions for /var directories that likely should be updated
+          if [ ! -e "$d" ]; then
+            cp --recursive ${pkgs.asterisk}/"$d" "$d"
+            chown --recursive ${asteriskUser} "$d"
+            find "$d" -type d | xargs chmod 0755
+          fi
+        done
+      '';
+
+      serviceConfig = {
+        ExecStart =
+          let
+            # FIXME: This doesn't account for arguments with spaces
+            argString = concatStringsSep " " cfg.extraArguments;
+          in
+          "${pkgs.asterisk}/bin/asterisk -U ${asteriskUser} -C ${asteriskEtc}/asterisk.conf ${argString} -F";
+        Type = "forking";
+        PIDFile = "/var/run/asterisk/asterisk.pid";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/networking/btsync.nix b/nixos/modules/services/networking/btsync.nix
index 8b90f295ed4..d0123b79e3f 100644
--- a/nixos/modules/services/networking/btsync.nix
+++ b/nixos/modules/services/networking/btsync.nix
@@ -293,7 +293,7 @@ in
     systemd.services.btsync = with pkgs; {
       description = "Bittorrent Sync Service";
       wantedBy    = [ "multi-user.target" ];
-      after       = [ "network.target" ];
+      after       = [ "network.target" "local-fs.target" ];
       serviceConfig = {
         Restart   = "on-abort";
         UMask     = "0002";
@@ -305,7 +305,7 @@ in
 
     systemd.services."btsync@" = with pkgs; {
       description = "Bittorrent Sync Service for %i";
-      after       = [ "network.target" ];
+      after       = [ "network.target" "local-fs.target" ];
       serviceConfig = {
         Restart   = "on-abort";
         User      = "%i";
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index be0acb27324..f4063a3406f 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -44,6 +44,9 @@ let
       })
     else "";
 
+  parseModules = x:
+    x // { connectTo = mapAttrs (name: value: { inherit (value) password publicKey; }) x.connectTo; };
+
   # would be nice to  merge 'cfg' with a //,
   # but the json nesting is wacky.
   cjdrouteConf = builtins.toJSON ( {
@@ -53,8 +56,8 @@ let
     };
     authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords;
     interfaces = {
-      ETHInterface = if (cfg.ETHInterface.bind != "") then [ cfg.ETHInterface ] else [ ];
-      UDPInterface = if (cfg.UDPInterface.bind != "") then [ cfg.UDPInterface ] else [ ];
+      ETHInterface = if (cfg.ETHInterface.bind != "") then [ (parseModules cfg.ETHInterface) ] else [ ];
+      UDPInterface = if (cfg.UDPInterface.bind != "") then [ (parseModules cfg.UDPInterface) ] else [ ];
     };
 
     privateKey = "@CJDNS_PRIVATE_KEY@";
@@ -151,12 +154,14 @@ in
 
       ETHInterface = {
         bind = mkOption {
-        default = "";
-        example = "eth0";
-        description = ''
-          Bind to this device for native ethernet operation.
-        '';
-      };
+          default = "";
+          example = "eth0";
+          description =
+            ''
+              Bind to this device for native ethernet operation.
+              <literal>all</literal> is a pseudo-name which will try to connect to all devices.
+            '';
+        };
 
         beacon = mkOption {
           type = types.int;
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index f01deb6ee7c..92f6396b358 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -127,8 +127,8 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       serviceConfig = {
-        # This may change back to forking if too many problems occur:
-        type = "simple";
+        # Uncomment this if too many problems occur:
+        # Type = "forking";
         User = ddclientUser;
         Group = "nogroup"; #TODO get this to work
         PermissionsStartOnly = "true";
diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix
index 7ddabf73106..18086154b6b 100644
--- a/nixos/modules/services/networking/dnsmasq.nix
+++ b/nixos/modules/services/networking/dnsmasq.nix
@@ -28,6 +28,7 @@ in
     services.dnsmasq = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to run dnsmasq.
@@ -35,14 +36,16 @@ in
       };
 
       resolveLocalQueries = mkOption {
+        type = types.bool;
         default = true;
         description = ''
           Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to
-          /etc/resolv.conf)
+          /etc/resolv.conf).
         '';
       };
 
       servers = mkOption {
+        type = types.listOf types.string;
         default = [];
         example = [ "8.8.8.8" "8.8.4.4" ];
         description = ''
@@ -51,11 +54,11 @@ in
       };
 
       extraConfig = mkOption {
-        type = types.string;
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration directives that should be added to
-          <literal>dnsmasq.conf</literal>
+          <literal>dnsmasq.conf</literal>.
         '';
       };
 
@@ -81,7 +84,7 @@ in
       };
 
     systemd.services.dnsmasq = {
-        description = "dnsmasq daemon";
+        description = "Dnsmasq Daemon";
         after = [ "network.target" "systemd-resolved.service" ];
         wantedBy = [ "multi-user.target" ];
         path = [ dnsmasq ];
diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix
new file mode 100644
index 00000000000..bad22c79138
--- /dev/null
+++ b/nixos/modules/services/networking/i2p.nix
@@ -0,0 +1,42 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.i2p;
+  homeDir = "/var/lib/i2p";
+in {
+  ###### interface
+  options.services.i2p = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enables i2p as a running service upon activation.
+        '';
+      };
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+    users.extraUsers.i2p = {
+      group = "i2p";
+      description = "i2p User";
+      home = homeDir;
+      createHome = true;
+      uid = config.ids.uids.i2p;
+    };
+    users.extraGroups.i2p.gid = config.ids.gids.i2p;
+    systemd.services.i2p = {
+      description = "I2P router with administration interface for hidden services";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        User = "i2p";
+        WorkingDirectory = homeDir;
+        Restart = "on-abort";
+        ExecStart = "${pkgs.i2p}/bin/i2prouter-plain";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/networking/lambdabot.nix b/nixos/modules/services/networking/lambdabot.nix
new file mode 100644
index 00000000000..4ef7c7c9ab6
--- /dev/null
+++ b/nixos/modules/services/networking/lambdabot.nix
@@ -0,0 +1,81 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.lambdabot;
+
+  rc = builtins.toFile "script.rc" cfg.script;
+
+in
+
+{
+
+  ### configuration
+
+  options = {
+
+    services.lambdabot = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable the Lambdabot IRC bot";
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.lambdabot;
+        description = "Used lambdabot package";
+      };
+
+      script = mkOption {
+        type = types.str;
+        default = "";
+        description = "Lambdabot script";
+      };
+
+    };
+
+  };
+
+  ### implementation
+
+  config = mkIf cfg.enable {
+
+    systemd.services.lambdabot = {
+      description = "Lambdabot daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      # Workaround for https://github.com/lambdabot/lambdabot/issues/117
+      script = ''
+        mkdir -p ~/.lambdabot
+        cd ~/.lambdabot
+        mkfifo /run/lambdabot/offline
+        (
+          echo 'rc ${rc}'
+          while true; do
+            cat /run/lambdabot/offline
+          done
+        ) | ${cfg.package}/bin/lambdabot
+      '';
+      serviceConfig = {
+        User = "lambdabot";
+        RuntimeDirectory = [ "lambdabot" ];
+      };
+    };
+
+    users.extraUsers.lambdabot = {
+      group = "lambdabot";
+      description = "Lambdabot daemon user";
+      home = "/var/lib/lambdabot";
+      createHome = true;
+      uid = config.ids.uids.lambdabot;
+    };
+
+    users.extraGroups.lambdabot.gid = config.ids.gids.lambdabot;
+
+  };
+
+}
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index f00c5d1f701..60f380f024b 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -98,13 +98,23 @@ in {
         '';
       };
 
+      # Ugly hack for using the correct gnome3 packageSet
+      basePackages = mkOption {
+        type = types.attrsOf types.path;
+        default = { inherit networkmanager modemmanager wpa_supplicant
+                            networkmanager_openvpn networkmanager_vpnc
+                            networkmanager_openconnect
+                            networkmanager_pptp networkmanager_l2tp; };
+        internal = true;
+      };
+
       packages = mkOption {
         type = types.listOf types.path;
         default = [ ];
         description = ''
           Extra packages that provide NetworkManager plugins.
         '';
-        apply = list: [ networkmanager modemmanager wpa_supplicant ] ++ list;
+        apply = list: (attrValues cfg.basePackages) ++ list;
       };
 
       appendNameservers = mkOption {
@@ -164,7 +174,7 @@ in {
 
     boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
 
-    environment.etc = [
+    environment.etc = with cfg.basePackages; [
       { source = ipUpScript;
         target = "NetworkManager/dispatcher.d/01nixos-ip-up";
       }
@@ -195,14 +205,7 @@ in {
         target = "NetworkManager/dispatcher.d/${dispatcherTypesSubdirMap.${s.type}}03userscript${lib.fixedWidthNumber 4 i}";
       }) cfg.dispatcherScripts;
 
-    environment.systemPackages = cfg.packages ++ [
-        networkmanager_openvpn
-        networkmanager_vpnc
-        networkmanager_openconnect
-        networkmanager_pptp
-        networkmanager_l2tp
-        modemmanager
-        ];
+    environment.systemPackages = cfg.packages;
 
     users.extraGroups = singleton {
       name = "networkmanager";
@@ -238,15 +241,7 @@ in {
 
     security.polkit.extraConfig = polkitConf;
 
-    # openvpn plugin has only dbus interface
-    services.dbus.packages = cfg.packages ++ [
-        networkmanager_openvpn
-        networkmanager_vpnc
-        networkmanager_openconnect
-        networkmanager_pptp
-        networkmanager_l2tp
-        modemmanager
-        ];
+    services.dbus.packages = cfg.packages;
 
     services.udev.packages = cfg.packages;
   };
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index b2740bd33b7..c25532511a0 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -281,10 +281,8 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
-      { name = "sshd";
-        uid = config.ids.uids.sshd;
-        description = "SSH privilege separation user";
+    users.extraUsers.sshd =
+      { description = "SSH privilege separation user";
         home = "/var/empty";
       };
 
@@ -379,7 +377,7 @@ in
           Port ${toString port}
         '') cfg.ports}
 
-        ${concatMapStrings ({ port, addr }: ''
+        ${concatMapStrings ({ port, addr, ... }: ''
           ListenAddress ${addr}${if port != null then ":" + toString port else ""}
         '') cfg.listenAddresses}
 
@@ -418,7 +416,7 @@ in
                     (data.publicKey != null && data.publicKeyFile == null);
         message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
       })
-      ++ flip map cfg.listenAddresses ({ addr, port }: {
+      ++ flip map cfg.listenAddresses ({ addr, port, ... }: {
         assertion = addr != null;
         message = "addr must be specified in each listenAddresses entry";
       });
diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix
index e251571dca3..c87fe914df8 100644
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixos/modules/services/networking/sslh.nix
@@ -81,7 +81,7 @@ in
       description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${pkgs.sslh}/bin/sslh -F ${configFile}";
+      serviceConfig.ExecStart = "${pkgs.sslh}/bin/sslh -F${configFile}";
       serviceConfig.KillMode = "process";
       serviceConfig.PIDFile = "${cfg.pidfile}";
     };
diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram.nix
new file mode 100644
index 00000000000..f9abf38942f
--- /dev/null
+++ b/nixos/modules/services/security/hologram.nix
@@ -0,0 +1,102 @@
+{pkgs, config, lib, ...}:
+
+with lib;
+
+let
+  cfg = config.services.hologram-server;
+
+  cfgFile = pkgs.writeText "hologram-server.json" (builtins.toJSON {
+    ldap = {
+      host = cfg.ldapHost;
+      bind = {
+        dn       = cfg.ldapBindDN;
+        password = cfg.ldapBindPassword;
+      };
+      insecureldap = cfg.ldapInsecure;
+      userattr     = cfg.ldapUserAttr;
+      baseDN       = cfg.ldapBaseDN;
+    };
+    aws = {
+      account     = cfg.awsAccount;
+      defaultrole = cfg.awsDefaultRole;
+    };
+    stats  = cfg.statsAddress;
+    listen = cfg.listenAddress;
+  });
+in {
+  options = {
+    services.hologram-server = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the Hologram server for AWS instance credentials";
+      };
+
+      listenAddress = mkOption {
+        type        = types.str;
+        default     = "0.0.0.0:3100";
+        description = "Address and port to listen on";
+      };
+
+      ldapHost = mkOption {
+        type        = types.str;
+        description = "Address of the LDAP server to use";
+      };
+
+      ldapInsecure = mkOption {
+        type        = types.bool;
+        default     = false;
+        description = "Whether to connect to LDAP over SSL or not";
+      };
+
+      ldapUserAttr = mkOption {
+        type        = types.str;
+        default     = "cn";
+        description = "The LDAP attribute for usernames";
+      };
+
+      ldapBaseDN = mkOption {
+        type        = types.str;
+        description = "The base DN for your Hologram users";
+      };
+
+      ldapBindDN = mkOption {
+        type        = types.str;
+        description = "DN of account to use to query the LDAP server";
+      };
+
+      ldapBindPassword = mkOption {
+        type        = types.str;
+        description = "Password of account to use to query the LDAP server";
+      };
+
+      awsAccount = mkOption {
+        type        = types.str;
+        description = "AWS account number";
+      };
+
+      awsDefaultRole = mkOption {
+        type        = types.str;
+        description = "AWS default role";
+      };
+
+      statsAddress = mkOption {
+        type        = types.str;
+        default     = "";
+        description = "Address of statsd server";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.hologram-server = {
+      description = "Provide EC2 instance credentials to machines outside of EC2";
+      after       = [ "network.target" ];
+      wantedBy    = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.goPackages.hologram}/bin/hologram-server --debug --conf ${cfgFile}";
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index d40f7d6d05d..853b458cf58 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -133,6 +133,8 @@ in
     # Don't restart dbus-daemon. Bad things tend to happen if we do.
     systemd.services.dbus.reloadIfChanged = true;
 
+    systemd.services.dbus.restartTriggers = [ configDir ];
+
     environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
 
   };
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index 0879d9b85bd..caedc2e4217 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -42,11 +42,7 @@ in
 
   config = mkIf cfg.enable {
 
-    users.extraUsers = singleton
-      { name = "nscd";
-        uid = config.ids.uids.nscd;
-        description = "Name service cache daemon user";
-      };
+    users.extraUsers.nscd.description = "Name service cache daemon user";
 
     systemd.services.nscd =
       { description = "Name Service Cache Daemon";
diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix
index 3958be33df2..85ee23c1a3d 100644
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@@ -10,6 +10,15 @@ with lib;
 
     services.mingetty = {
 
+      autologinUser = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Username of the account that will be automatically logged in at the console.
+          If unspecified, a login prompt is shown as usual.
+        '';
+      };
+
       greetingLine = mkOption {
         type = types.str;
         default = ''<<< Welcome to NixOS ${config.system.nixosVersion} (\m) - \l >>>'';
@@ -46,28 +55,30 @@ with lib;
 
   ###### implementation
 
-  config = {
-
+  config = let
+    autologinArg = optionalString (config.services.mingetty.autologinUser != null) "--autologin ${config.services.mingetty.autologinUser}";
+    gettyCmd = extraArgs: "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login ${autologinArg} ${extraArgs}";
+  in {
     systemd.services."getty@" =
-      { serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud %I 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud %I 115200,38400,9600 $TERM";
         restartIfChanged = false;
       };
 
     systemd.services."serial-getty@" =
       { serviceConfig.ExecStart =
           let speeds = concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
-          in "@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds} $TERM";
+          in gettyCmd "%I ${speeds} $TERM";
         restartIfChanged = false;
       };
 
     systemd.services."container-getty@" =
       { unitConfig.ConditionPathExists = "/dev/pts/%I"; # Work around being respawned when "machinectl login" exits.
-        serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud pts/%I 115200,38400,9600 $TERM";
+        serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud pts/%I 115200,38400,9600 $TERM";
         restartIfChanged = false;
       };
 
     systemd.services."console-getty" =
-      { serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud console 115200,38400,9600 $TERM";
+      { serviceConfig.ExecStart = gettyCmd "--noclear --keep-baud console 115200,38400,9600 $TERM";
         serviceConfig.Restart = "always";
         restartIfChanged = false;
 	enable = mkDefault config.boot.isContainer;
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 2b5cba68d45..2885fd39652 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -231,6 +231,9 @@ let
     ${if cfg.sslServerCert != null then ''
       SSLCertificateFile ${cfg.sslServerCert}
       SSLCertificateKeyFile ${cfg.sslServerKey}
+      ${if cfg.sslServerChain != null then ''
+        SSLCertificateChainFile ${cfg.sslServerChain}
+      '' else ""}
     '' else ""}
 
     ${if cfg.enableSSL then ''
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index c0ed2041639..52d8c89baff 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -83,11 +83,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.23.3";
+    name= "mediawiki-1.23.9";
 
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
-      sha256 = "0l6798jwjwk2khfnm84mgc65ij53a8pnv30wdnn15ys4ivia4bpf";
+      sha256 = "1l7k4g0pgz92yvrfr52w26x740s4362v0gc95pk0i30vn2sp5bql";
     };
 
     skins = config.skins;
@@ -142,6 +142,7 @@ in
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
         ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs}
+        ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedFiles}
         RewriteRule ${if config.enableUploads
           then "!^/images"
           else "^.*\$"
diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
new file mode 100644
index 00000000000..84c8281ecd8
--- /dev/null
+++ b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
@@ -0,0 +1,193 @@
+{ config, lib, pkgs, serverInfo, php, ... }:
+
+with lib;
+
+let
+
+  httpd = serverInfo.serverConfig.package;
+
+  version24 = !versionOlder httpd.version "2.4";
+
+  allGranted = if version24 then ''
+    Require all granted
+  '' else ''
+    Order allow,deny
+    Allow from all
+  '';
+
+  moodleConfig = pkgs.writeText "config.php"
+    ''
+      <?php
+      unset($CFG);
+      global $CFG;
+      $CFG = new stdClass();
+      $CFG->dbtype    = '${config.dbType}';
+      $CFG->dblibrary = 'native';
+      $CFG->dbhost    = '${config.dbHost}';
+      $CFG->dbname    = '${config.dbName}';
+      $CFG->dbuser    = '${config.dbUser}';
+      $CFG->dbpass    = '${config.dbPassword}';
+      $CFG->prefix    = '${config.dbPrefix}';
+      $CFG->dboptions = array(
+          'dbpersist' => false,
+          'dbsocket'  => false,
+          'dbport'    => "${config.dbPort}",
+      );
+      $CFG->wwwroot   = '${config.wwwRoot}';
+      $CFG->dataroot  = '${config.dataRoot}';
+      $CFG->directorypermissions = 02777;
+      $CFG->admin = 'admin';
+      ${optionalString (config.debug.noEmailEver == true) ''
+        $CFG->noemailever = true;
+      ''}
+
+      ${config.extraConfig}
+      require_once(dirname(__FILE__) . '/lib/setup.php'); // Do not edit
+    '';
+  # Unpack Moodle and put the config file in its root directory.
+  moodleRoot = pkgs.stdenv.mkDerivation rec {
+    name= "moodle-2.8.5";
+
+    src = pkgs.fetchurl {
+      url = "https://download.moodle.org/stable28/${name}.tgz";
+      sha256 = "1a159a193010cddedce10ee009184502e6f732e4d7c85167d8597fe5dff9e190";
+    };
+
+    buildPhase =
+      ''
+      ''; 
+
+    installPhase =
+      ''
+        mkdir -p $out
+        cp -r * $out
+        cp ${moodleConfig} $out/config.php
+      '';
+  };
+
+in
+
+{
+
+  extraConfig =
+  ''
+    # this should be config.urlPrefix instead of /
+    Alias / ${moodleRoot}/
+    <Directory ${moodleRoot}>
+      DirectoryIndex index.php
+    </Directory>
+  '';
+
+  documentRoot = moodleRoot; # TODO: fix this, should be config.urlPrefix
+
+  enablePHP = true;
+
+  options = {
+
+    id = mkOption {
+      default = "main";
+      description = ''
+        A unique identifier necessary to keep multiple Moodle server
+        instances on the same machine apart.
+      '';
+    };
+
+    dbType = mkOption {
+      default = "postgres";
+      example = "mysql";
+      description = "Database type.";
+    };
+
+    dbName = mkOption {
+      default = "moodle";
+      description = "Name of the database that holds the Moodle data.";
+    };
+
+    dbHost = mkOption {
+      default = "localhost";
+      example = "10.0.2.2";
+      description = ''
+        The location of the database server.
+      '';
+    };
+
+    dbPort = mkOption {
+      default = ""; # use the default port
+      example = "12345";
+      description = ''
+        The port that is used to connect to the database server.
+      '';
+    };
+
+    dbUser = mkOption {
+      default = "moodle";
+      description = "The user name for accessing the database.";
+    };
+
+    dbPassword = mkOption {
+      default = "";
+      example = "password";
+      description = ''
+        The password of the database user.  Warning: this is stored in
+        cleartext in the Nix store!
+      '';
+    };
+    
+    dbPrefix = mkOption {
+      default = "mdl_";
+      example = "my_other_mdl_";
+      description = ''
+        A prefix for each table, if multiple moodles should run in a single database.
+      '';
+    };
+
+    wwwRoot = mkOption {
+      type = types.string;
+      example = "http://my.machine.com/my-moodle";
+      description = ''
+        The full web address where moodle has been installed.
+      '';
+    };
+
+    dataRoot = mkOption {
+      default = "/var/lib/moodledata";
+      example = "/var/lib/moodledata";
+      description = ''
+        The data directory for moodle. Needs to be writable!
+      '';
+      type = types.path;
+      };
+
+    
+    extraConfig = mkOption {
+      default = "";
+      example =
+        ''
+        '';
+      description = ''
+        Any additional text to be appended to Moodle's
+        configuration file.  This is a PHP script.
+      '';
+    };
+
+    debug = {
+      noEmailEver = mkOption {
+        default = false;
+	example = "true";
+	description = ''
+	  Set this to true to prevent Moodle from ever sending any email.
+	'';
+	};
+    };
+  };
+
+  startupScript = pkgs.writeScript "moodle_startup.sh" ''
+  echo "Checking for existence of ${config.dataRoot}"
+  if [ ! -e "${config.dataRoot}" ]
+  then
+    mkdir -p "${config.dataRoot}"
+    chown ${serverInfo.serverConfig.user}.${serverInfo.serverConfig.group} "${config.dataRoot}"
+  fi
+  '';
+
+}
diff --git a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
index 76f55a63e32..5abcc5e7490 100644
--- a/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/per-server-options.nix
@@ -56,6 +56,13 @@ with lib;
     description = "Path to server SSL certificate key.";
   };
 
+  sslServerChain = mkOption {
+    type = types.nullOr types.path;
+    default = null;
+    example = "/var/ca.pem";
+    description = "Path to server SSL chain file.";
+  };
+
   adminAddr = mkOption ({
     type = types.nullOr types.str;
     example = "admin@example.org";
@@ -90,7 +97,7 @@ with lib;
     default = [];
     example = [
       { urlPath = "/foo/bar.png";
-        dir = "/home/eelco/some-file.png";
+        files = "/home/eelco/some-file.png";
       }
     ];
     description = ''
diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
new file mode 100644
index 00000000000..01b6cfc62af
--- /dev/null
+++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix
@@ -0,0 +1,209 @@
+{ config, lib, pkgs, serverInfo, php, ... }:
+
+with lib;
+
+let
+  # https://wordpress.org/plugins/postgresql-for-wordpress/
+  # Wordpress plugin 'postgresql-for-wordpress' installation example
+  postgresqlForWordpressPlugin = pkgs.stdenv.mkDerivation {
+    name = "postgresql-for-wordpress-plugin";
+    # Download the theme from the wordpress site
+    src = pkgs.fetchurl {
+      url = https://downloads.wordpress.org/plugin/postgresql-for-wordpress.1.3.1.zip;
+      sha256 = "f11a5d76af884c7bec2bc653ed5bd29d3ede9a8657bd67ab7824e329e5d809e8";
+    };
+    # We need unzip to build this package
+    buildInputs = [ pkgs.unzip ];
+    # Installing simply means copying all files to the output directory
+    installPhase = "mkdir -p $out; cp -R * $out/";
+  };
+
+  # Our bare-bones wp-config.php file using the above settings
+  wordpressConfig = pkgs.writeText "wp-config.php" ''
+    <?php
+    define('DB_NAME',     '${config.dbName}');
+    define('DB_USER',     '${config.dbUser}');
+    define('DB_PASSWORD', '${config.dbPassword}');
+    define('DB_HOST',     '${config.dbHost}');
+    define('DB_CHARSET',  'utf8');
+    $table_prefix  = '${config.tablePrefix}';
+    if ( !defined('ABSPATH') )
+    	define('ABSPATH', dirname(__FILE__) . '/');
+    require_once(ABSPATH . 'wp-settings.php');
+    ${config.extraConfig}
+  '';
+
+  # .htaccess to support pretty URLs
+  htaccess = pkgs.writeText "htaccess" ''
+    <IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteBase /
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule . /index.php [L]
+    </IfModule>
+  '';
+
+  # The wordpress package itself
+  wordpressRoot = pkgs.stdenv.mkDerivation rec {
+    name = "wordpress";
+    # Fetch directly from the wordpress site, want to upgrade?
+    # Just change the version URL and update the hash
+    src = pkgs.fetchurl {
+      url = http://wordpress.org/wordpress-4.1.1.tar.gz;
+      sha256 = "1s9y0i9ms3m6dswb9gqrr95plnx6imahc07fyhvrp5g35f6c12k1";
+    };
+    installPhase = ''
+      mkdir -p $out
+      # Copy all the wordpress files we downloaded
+      cp -R * $out/
+      # We'll symlink the wordpress config
+      ln -s ${wordpressConfig} $out/wp-config.php
+      # As well as our custom .htaccess
+      ln -s ${htaccess} $out/.htaccess
+      # And the uploads directory
+      ln -s ${config.wordpressUploads} $out/wp-content/uploads
+      # And the theme(s)
+      ${concatMapStrings (theme: "ln -s ${theme} $out/wp-content/themes/${theme.name}\n") config.themes}
+      # And the plugin(s)
+      # remove bundled plugin(s) coming with wordpress
+      rm -Rf $out/wp-content/plugins/akismet
+      # install plugins
+      ${concatMapStrings (plugin: "ln -s ${plugin} $out/wp-content/plugins/${plugin.name}\n") (config.plugins ++ [ postgresqlForWordpressPlugin]) }
+    '';
+  };
+
+in
+
+{
+
+  # And some httpd extraConfig to make things work nicely
+  extraConfig = ''
+    <Directory ${wordpressRoot}>
+      DirectoryIndex index.php
+      Allow from *
+      Options FollowSymLinks
+      AllowOverride All
+    </Directory>
+  '';
+
+  enablePHP = true;
+
+  options = {
+    dbHost = mkOption {
+      default = "localhost";
+      description = "The location of the database server.";  
+      example = "localhost";
+    };
+    dbName = mkOption {
+      default = "wordpress";
+      description = "Name of the database that holds the Wordpress data.";
+      example = "localhost";
+    };
+    dbUser = mkOption {
+      default = "wordpress";
+      description = "The dbUser, read the username, for the database.";
+      example = "wordpress";
+    };
+    dbPassword = mkOption {
+      default = "wordpress";
+      description = "The password to the respective dbUser.";
+      example = "wordpress";
+    };
+    tablePrefix = mkOption {
+      default = "wp_";
+      description = ''
+        The $table_prefix is the value placed in the front of your database tables. Change the value if you want to use something other than wp_ for your database prefix. Typically this is changed if you are installing multiple WordPress blogs in the same database. See <link xlink:href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'/>.
+      '';
+    };
+    wordpressUploads = mkOption {
+    default = "/data/uploads";
+      description = ''
+        This directory is used for uploads of pictures and must be accessible (read: owned) by the httpd running user. The directory passed here is automatically created and permissions are given to the httpd running user.
+      '';
+    };
+    plugins = mkOption {
+      default = [];
+      type = types.listOf types.path;
+      description =
+        ''
+          List of path(s) to respective plugin(s) which are symlinked from the 'plugins' directory. Note: These plugins need to be packaged before use.
+        '';
+      example = ''
+        # Wordpress plugin 'akismet' installation example
+        akismetPlugin = pkgs.stdenv.mkDerivation {
+          name = "akismet-plugin";
+          # Download the theme from the wordpress site
+          src = pkgs.fetchurl {
+            url = https://downloads.wordpress.org/plugin/akismet.3.1.zip;
+            sha256 = "1i4k7qyzna08822ncaz5l00wwxkwcdg4j9h3z2g0ay23q640pclg";
+          };
+          # We need unzip to build this package
+          buildInputs = [ pkgs.unzip ];
+          # Installing simply means copying all files to the output directory
+          installPhase = "mkdir -p $out; cp -R * $out/";
+        };
+
+        And then pass this theme to the themes list like this:
+          plugins = [ akismetPlugin ];
+      '';
+    };
+    themes = mkOption {
+      default = [];
+      type = types.listOf types.path;
+      description =
+        ''
+          List of path(s) to respective theme(s) which are symlinked from the 'theme' directory. Note: These themes need to be packaged before use.
+        '';
+      example = ''
+        # For shits and giggles, let's package the responsive theme
+        responsiveTheme = pkgs.stdenv.mkDerivation {
+          name = "responsive-theme";
+          # Download the theme from the wordpress site
+          src = pkgs.fetchurl {
+            url = http://wordpress.org/themes/download/responsive.1.9.7.6.zip;
+            sha256 = "06i26xlc5kdnx903b1gfvnysx49fb4kh4pixn89qii3a30fgd8r8";
+          };
+          # We need unzip to build this package
+          buildInputs = [ pkgs.unzip ];
+          # Installing simply means copying all files to the output directory
+          installPhase = "mkdir -p $out; cp -R * $out/";
+        };
+
+        And then pass this theme to the themes list like this:
+          themes = [ responsiveTheme ];
+      '';
+    };
+    extraConfig = mkOption {
+      default = "";
+      example =
+        ''
+          define( 'AUTOSAVE_INTERVAL', 60 ); // Seconds
+        '';
+      description = ''
+        Any additional text to be appended to Wordpress's wp-config.php
+        configuration file.  This is a PHP script.  For configuration
+        settings, see <link xlink:href='http://codex.wordpress.org/Editing_wp-config.php'/>.
+      '';
+    };
+  }; 
+
+  documentRoot = wordpressRoot;
+
+  startupScript = pkgs.writeScript "init-wordpress.sh" ''
+    #!/bin/sh
+    mkdir -p ${config.wordpressUploads}
+    chown ${serverInfo.serverConfig.user} ${config.wordpressUploads}
+
+    # we should use systemd dependencies here
+    #waitForUnit("network-interfaces.target");
+    if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then
+      # Wait until MySQL is up
+      while [ ! -e /var/run/mysql/mysqld.pid ]; do
+        sleep 1
+      done
+      ${pkgs.mysql}/bin/mysql -e 'CREATE DATABASE ${config.dbName};'
+      ${pkgs.mysql}/bin/mysql -e 'GRANT ALL ON ${config.dbName}.* TO ${config.dbUser}@localhost IDENTIFIED BY "${config.dbPassword}";'
+    fi
+  '';
+}
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 0f21ef01263..fe50c182bfe 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -102,6 +102,7 @@ in
         '';
       serviceConfig = {
         ExecStart = "${nginx}/bin/nginx -c ${configFile} -p ${cfg.stateDir}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "on-failure";
         RestartSec = "10s";
         StartLimitInterval = "1min";
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 6398a15bfcc..d53f119c955 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -21,7 +21,7 @@ let
     destination = "/share/applications/mimeapps.list";
     text = ''
       [Default Applications]
-      inode/directory=nautilus.desktop
+      inode/directory=nautilus.desktop;org.gnome.Nautilus.desktop
     '';
   };
 
@@ -80,6 +80,7 @@ in {
     services.telepathy.enable = mkDefault true;
     networking.networkmanager.enable = mkDefault true;
     services.upower.enable = config.powerManagement.enable;
+    hardware.bluetooth.enable = mkDefault true;
 
     fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ];
 
@@ -108,7 +109,7 @@ in {
           # Override default mimeapps
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
 
-          # Let gnome-control-center find gnome-shell search providers
+          # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility.
           export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
 
           # Let nautilus find extensions
@@ -120,6 +121,9 @@ in {
           # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
           ${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update
 
+          # Find the mouse
+          export XCURSOR_PATH=~/.icons:${config.system.path}/share/icons
+
           ${gnome3.gnome_session}/bin/gnome-session&
           waitPID=$!
         '';
@@ -128,52 +132,15 @@ in {
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
                                                 "${gnome3.glib_networking}/lib/gio/modules"
                                                 "${gnome3.gvfs}/lib/gio/modules" ];
-    environment.systemPackages =
-      [ pkgs.desktop_file_utils
-        gnome3.glib_networking
-        gnome3.gtk3 # for gtk-update-icon-cache
-        pkgs.ibus
-        pkgs.shared_mime_info # for update-mime-database
-        gnome3.gvfs
-        gnome3.dconf
-        gnome3.gnome-backgrounds
-        gnome3.gnome_control_center
-        gnome3.gnome_icon_theme
-        gnome3.gnome-menus
-        gnome3.gnome_settings_daemon
-        gnome3.gnome_shell
-        gnome3.gnome_themes_standard
-      ] ++ cfg.sessionPath ++ (removePackagesByName [
-        gnome3.baobab
-        gnome3.empathy
-        gnome3.eog
-        gnome3.epiphany
-        gnome3.evince
-        gnome3.gucharmap
-        gnome3.nautilus
-        gnome3.totem
-        gnome3.vino
-        gnome3.yelp
-        gnome3.gnome-calculator
-        gnome3.gnome-contacts
-        gnome3.gnome-font-viewer
-        gnome3.gnome-screenshot
-        gnome3.gnome-shell-extensions
-        gnome3.gnome-system-log
-        gnome3.gnome-system-monitor
-        gnome3.gnome_terminal
-        gnome3.gnome-user-docs
-
-        gnome3.bijiben
-        gnome3.evolution
-        gnome3.file-roller
-        gnome3.gedit
-        gnome3.gnome-clocks
-        gnome3.gnome-music
-        gnome3.gnome-tweak-tool
-        gnome3.gnome-photos
-        gnome3.nautilus-sendto
-      ] config.environment.gnome3.excludePackages);
+    environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
+      ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages);
+
+    # Use the correct gnome3 packageSet
+    networking.networkmanager.basePackages =
+      { inherit (pkgs) networkmanager modemmanager wpa_supplicant;
+        inherit (gnome3) networkmanager_openvpn networkmanager_vpnc
+                         networkmanager_openconnect networkmanager_pptp
+                         networkmanager_l2tp; };
 
     # Needed for themes and backgrounds
     environment.pathsToLink = [ "/share" ];
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index a7ebafa28b3..6c3c5273086 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -58,14 +58,14 @@ in
           # Find the mouse
           XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
         };
-        execCmd = "exec ${gdm}/sbin/gdm";
+        execCmd = "exec ${gdm}/bin/gdm";
       };
 
     # Because sd_login_monitor_new requires /run/systemd/machines
     systemd.services.display-manager.wants = [ "systemd-machined.service" ];
     systemd.services.display-manager.after = [ "systemd-machined.service" ];
 
-    systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou ];
+    systemd.services.display-manager.path = [ gnome3.gnome_shell gnome3.caribou pkgs.xlibs.xhost pkgs.dbus_tools ];
 
     services.dbus.packages = [ gdm ];
 
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 6a7b810261d..4aeaed8cd32 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -19,7 +19,7 @@ let
     '';
 
   theme = pkgs.gnome3.gnome_themes_standard;
-  icons = pkgs.gnome3.gnome_icon_theme;
+  icons = pkgs.gnome3.defaultIconTheme;
 
   # The default greeter provided with this expression is the GTK greeter.
   # Again, we need a few things in the environment for the greeter to run with
@@ -69,6 +69,7 @@ let
       xserver-command = ${xserverWrapper}
       session-wrapper = ${dmcfg.session.script}
       greeter-session = ${cfg.greeter.name}
+      ${cfg.extraSeatDefaults}
     '';
 
   gtkGreeterConf = writeText "lightdm-gtk-greeter.conf"
@@ -109,6 +110,15 @@ in
         '';
       };
 
+      extraSeatDefaults = mkOption {
+        type = types.lines;
+        default = "";
+        example = ''
+          greeter-show-manual-login=true
+        '';
+        description = "Extra lines to append to SeatDefaults section.";
+      };
+
     };
   };
 
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 64e0d4d8050..5198864ef6e 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -41,16 +41,24 @@ let
     };
   in imap mkHead cfg.xrandrHeads;
 
-  xrandrDeviceSection = flip concatMapStrings xrandrHeads (h: ''
-    Option "monitor-${h.output}" "${h.name}"
-  '');
+  xrandrDeviceSection = let
+    monitors = flip map xrandrHeads (h: ''
+      Option "monitor-${h.output}" "${h.name}"
+    '');
+    # First option is indented through the space in the config but any
+    # subsequent options aren't so we need to apply indentation to
+    # them here
+    monitorsIndented = if length monitors > 1
+      then singleton (head monitors) ++ map (m: "  " + m) (tail monitors)
+      else monitors;
+  in concatStrings monitorsIndented;
 
   # Here we chain every monitor from the left to right, so we have:
   # m4 right of m3 right of m2 right of m1   .----.----.----.----.
   # Which will end up in reverse ----------> | m1 | m2 | m3 | m4 |
   #                                          `----^----^----^----'
   xrandrMonitorSections = let
-    mkMonitor = previous: current: previous ++ singleton {
+    mkMonitor = previous: current: singleton {
       inherit (current) name;
       value = ''
         Section "Monitor"
@@ -60,8 +68,8 @@ let
           ''}
         EndSection
       '';
-    };
-    monitors = foldl mkMonitor [] xrandrHeads;
+    } ++ previous;
+    monitors = reverseList (foldl mkMonitor [] xrandrHeads);
   in concatMapStrings (getAttr "value") monitors;
 
   configFile = pkgs.stdenv.mkDerivation {
@@ -147,6 +155,19 @@ in
         '';
       };
 
+      inputClassSections = mkOption {
+        type = types.listOf types.lines;
+        default = [];
+        example = [ ''
+           Identifier      "Trackpoint Wheel Emulation"
+           MatchProduct    "ThinkPad USB Keyboard with TrackPoint"
+           Option          "EmulateWheel"          "true
+           Option          "EmulateWheelButton"    "2"
+           Option          "Emulate3Buttons"       "false"
+          '' ];
+        description = "Content of additional InputClass sections of the X server configuration file.";
+      };
+
       modules = mkOption {
         type = types.listOf types.path;
         default = [];
@@ -522,6 +543,14 @@ in
           Option "XkbVariant" "${cfg.xkbVariant}"
         EndSection
 
+        # Additional "InputClass" sections
+        ${flip concatMapStrings cfg.inputClassSections (inputClassSection: ''
+        Section "InputClass"
+          ${inputClassSection}
+        EndSection
+        '')}
+
+
         Section "ServerLayout"
           Identifier "Layout[all]"
           ${cfg.serverLayoutSection}
@@ -593,4 +622,3 @@ in
   };
 
 }
-
diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 7aa4b12a654..4289740322a 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -322,7 +322,9 @@ foreach my $device (keys %$prevSwaps) {
 
 
 # Should we have systemd re-exec itself?
-my $restartSystemd = abs_path("/proc/1/exe") ne abs_path("@systemd@/lib/systemd/systemd");
+my $prevSystemd = abs_path("/proc/1/exe") or die;
+my $newSystemd = abs_path("@systemd@/lib/systemd/systemd") or die;
+my $restartSystemd = $prevSystemd ne $newSystemd;
 
 
 sub filterUnits {
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 2ef1fca1983..81009e9fb82 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -468,8 +468,8 @@ sub getEfiTarget {
         if ($grubTargetEfi eq "") { die }
         else {return "only" }
     } else {
-        # at least one grub target has to be given
-        die
+        # prevent an installation if neither grub nor grubEfi is given
+        return "neither"
     }
 }
 
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
new file mode 100644
index 00000000000..0221374ab83
--- /dev/null
+++ b/nixos/modules/system/boot/networkd.nix
@@ -0,0 +1,670 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with import ./systemd-unit-options.nix { inherit config lib; };
+with import ./systemd-lib.nix { inherit config lib pkgs; };
+
+let
+
+  cfg = config.systemd.network;
+
+  checkLink = checkUnitConfig "Link" [
+    (assertOnlyFields [
+      "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name"
+      "MTUBytes" "BitsPerSecond" "Duplex" "WakeOnLan"
+    ])
+    (assertValueOneOf "MACAddressPolicy" ["persistent" "random"])
+    (assertMacAddress "MACAddress")
+    (assertValueOneOf "NamePolicy" [
+      "kernel" "database" "onboard" "slot" "path" "mac"
+    ])
+    (assertByteFormat "MTUBytes")
+    (assertByteFormat "BitsPerSecond")
+    (assertValueOneOf "Duplex" ["half" "full"])
+    (assertValueOneOf "WakeOnLan" ["phy" "magic" "off"])
+  ];
+
+  checkNetdev = checkUnitConfig "Netdev" [
+    (assertOnlyFields [
+      "Description" "Name" "Kind" "MTUBytes" "MACAddress"
+    ])
+    (assertHasField "Name")
+    (assertHasField "Kind")
+    (assertValueOneOf "Kind" [
+      "bridge" "bond" "vlan" "macvlan" "vxlan" "ipip"
+      "gre" "sit" "vti" "veth" "tun" "tap" "dummy"
+    ])
+    (assertByteFormat "MTUBytes")
+    (assertMacAddress "MACAddress")
+  ];
+
+  checkVlan = checkUnitConfig "VLAN" [
+    (assertOnlyFields ["Id"])
+    (assertRange "Id" 0 4094)
+  ];
+
+  checkMacvlan = checkUnitConfig "MACVLAN" [
+    (assertOnlyFields ["Mode"])
+    (assertValueOneOf "Mode" ["private" "vepa" "bridge" "passthru"])
+  ];
+
+  checkVxlan = checkUnitConfig "VXLAN" [
+    (assertOnlyFields ["Id" "Group" "TOS" "TTL" "MacLearning"])
+    (assertRange "TTL" 0 255)
+    (assertValueOneOf "MacLearning" boolValues)
+  ];
+
+  checkTunnel = checkUnitConfig "Tunnel" [
+    (assertOnlyFields ["Local" "Remote" "TOS" "TTL" "DiscoverPathMTU"])
+    (assertRange "TTL" 0 255)
+    (assertValueOneOf "DiscoverPathMTU" boolValues)
+  ];
+
+  checkPeer = checkUnitConfig "Peer" [
+    (assertOnlyFields ["Name" "MACAddress"])
+    (assertMacAddress "MACAddress")
+  ];
+
+  tunTapChecks = [
+    (assertOnlyFields ["OneQueue" "MultiQueue" "PacketInfo" "User" "Group"])
+    (assertValueOneOf "OneQueue" boolValues)
+    (assertValueOneOf "MultiQueue" boolValues)
+    (assertValueOneOf "PacketInfo" boolValues)
+  ];
+
+  checkTun = checkUnitConfig "Tun" tunTapChecks;
+
+  checkTap = checkUnitConfig "Tap" tunTapChecks;
+
+  checkBond = checkUnitConfig "Bond" [
+    (assertOnlyFields [
+      "Mode" "TransmitHashPolicy" "LACPTransmitRate" "MIIMonitorSec"
+      "UpDelaySec" "DownDelaySec"
+    ])
+    (assertValueOneOf "Mode" [
+      "balance-rr" "active-backup" "balance-xor"
+      "broadcast" "802.3ad" "balance-tlb" "balance-alb"
+    ])
+    (assertValueOneOf "TransmitHashPolicy" [
+      "layer2" "layer3+4" "layer2+3" "encap2+3" "802.3ad" "encap3+4"
+    ])
+    (assertValueOneOf "LACPTransmitRate" ["slow" "fast"])
+  ];
+
+  checkNetwork = checkUnitConfig "Network" [
+    (assertOnlyFields [
+      "Description" "DHCP" "DHCPServer" "IPv4LL" "IPv4LLRoute"
+      "LLMNR" "Domains" "Bridge" "Bond"
+    ])
+    (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"])
+    (assertValueOneOf "DHCPServer" boolValues)
+    (assertValueOneOf "IPv4LL" boolValues)
+    (assertValueOneOf "IPv4LLRoute" boolValues)
+    (assertValueOneOf "LLMNR" boolValues)
+  ];
+
+  checkAddress = checkUnitConfig "Address" [
+    (assertOnlyFields ["Address" "Peer" "Broadcast" "Label"])
+    (assertHasField "Address")
+  ];
+
+  checkRoute = checkUnitConfig "Route" [
+    (assertOnlyFields ["Gateway" "Destination" "Metric"])
+    (assertHasField "Gateway")
+  ];
+
+  checkDhcp = checkUnitConfig "DHCP" [
+    (assertOnlyFields [
+      "UseDNS" "UseMTU" "SendHostname" "UseHostname" "UseDomains" "UseRoutes"
+      "CriticalConnections" "VendorClassIdentifier" "RequestBroadcast"
+      "RouteMetric"
+    ])
+    (assertValueOneOf "UseDNS" boolValues)
+    (assertValueOneOf "UseMTU" boolValues)
+    (assertValueOneOf "SendHostname" boolValues)
+    (assertValueOneOf "UseHostname" boolValues)
+    (assertValueOneOf "UseDomains" boolValues)
+    (assertValueOneOf "UseRoutes" boolValues)
+    (assertValueOneOf "CriticalConnections" boolValues)
+    (assertValueOneOf "RequestBroadcast" boolValues)
+  ];
+
+  commonNetworkOptions = {
+
+    enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to manage network configuration using <command>systemd-network</command>.
+      '';
+    };
+
+    matchConfig = mkOption {
+      default = {};
+      example = { Name = "eth0"; };
+      type = types.attrsOf unitOption;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Match]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+        for details.
+      '';
+    };
+
+  };
+
+  linkOptions = commonNetworkOptions // {
+
+    linkConfig = mkOption {
+      default = {};
+      example = { MACAddress = "00:ff:ee:aa:cc:dd"; };
+      type = types.addCheck (types.attrsOf unitOption) checkLink;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Link]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.link</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
+  netdevOptions = commonNetworkOptions // {
+
+    netdevConfig = mkOption {
+      default = {};
+      example = { Name = "mybridge"; Kind = "bridge"; };
+      type = types.addCheck (types.attrsOf unitOption) checkNetdev;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Netdev]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    vlanConfig = mkOption {
+      default = {};
+      example = { Id = "4"; };
+      type = types.addCheck (types.attrsOf unitOption) checkVlan;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[VLAN]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    macvlanConfig = mkOption {
+      default = {};
+      example = { Mode = "private"; };
+      type = types.addCheck (types.attrsOf unitOption) checkMacvlan;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[MACVLAN]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    vxlanConfig = mkOption {
+      default = {};
+      example = { Id = "4"; };
+      type = types.addCheck (types.attrsOf unitOption) checkVxlan;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[VXLAN]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    tunnelConfig = mkOption {
+      default = {};
+      example = { Remote = "192.168.1.1"; };
+      type = types.addCheck (types.attrsOf unitOption) checkTunnel;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Tunnel]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    peerConfig = mkOption {
+      default = {};
+      example = { Name = "veth2"; };
+      type = types.addCheck (types.attrsOf unitOption) checkPeer;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Peer]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    tunConfig = mkOption {
+      default = {};
+      example = { User = "openvpn"; };
+      type = types.addCheck (types.attrsOf unitOption) checkTun;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Tun]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    tapConfig = mkOption {
+      default = {};
+      example = { User = "openvpn"; };
+      type = types.addCheck (types.attrsOf unitOption) checkTap;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Tap]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    bondConfig = mkOption {
+      default = {};
+      example = { Mode = "802.3ad"; };
+      type = types.addCheck (types.attrsOf unitOption) checkBond;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Bond]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
+  addressOptions = {
+
+    addressConfig = mkOption {
+      default = {};
+      example = { Address = "192.168.0.100/24"; };
+      type = types.addCheck (types.attrsOf unitOption) checkAddress;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Address]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
+  routeOptions = {
+
+    routeConfig = mkOption {
+      default = {};
+      example = { Gateway = "192.168.0.1"; };
+      type = types.addCheck (types.attrsOf unitOption) checkRoute;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Route]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
+  networkOptions = commonNetworkOptions // {
+
+    networkConfig = mkOption {
+      default = {};
+      example = { Description = "My Network"; };
+      type = types.addCheck (types.attrsOf unitOption) checkNetwork;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[Network]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    dhcpConfig = mkOption {
+      default = {};
+      example = { UseDNS = true; UseRoutes = true; };
+      type = types.addCheck (types.attrsOf unitOption) checkDhcp;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[DHCP]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    name = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The name of the network interface to match against.
+      '';
+    };
+
+    DHCP = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        Whether to enable DHCP on the interfaces matched.
+      '';
+    };
+
+    domains = mkOption {
+      type = types.nullOr (types.listOf types.str);
+      default = null;
+      description = ''
+        A list of domains to pass to the network config.
+      '';
+    };
+
+    address = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of addresses to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    gateway = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of gateways to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    dns = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of dns servers to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    ntp = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of ntp servers to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    vlan = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of vlan interfaces to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    macvlan = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of macvlan interfaces to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    vxlan = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of vxlan interfaces to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    tunnel = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = ''
+        A list of tunnel interfaces to be added to the network section of the
+        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    addresses = mkOption {
+      default = [ ];
+      type = types.listOf types.optionSet;
+      options = [ addressOptions ];
+      description = ''
+        A list of address sections to be added to the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+    routes = mkOption {
+      default = [ ];
+      type = types.listOf types.optionSet;
+      options = [ routeOptions ];
+      description = ''
+        A list of route sections to be added to the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
+  };
+
+  networkConfig = { name, config, ... }: {
+    config = {
+      matchConfig = optionalAttrs (config.name != null) {
+        Name = config.name;
+      };
+      networkConfig = optionalAttrs (config.DHCP != null) {
+        DHCP = config.DHCP;
+      } // optionalAttrs (config.domains != null) {
+        Domains = concatStringsSep " " config.domains;
+      };
+    };
+  };
+
+  linkToUnit = name: def:
+    { inherit (def) enable;
+      text = commonMatchText def +
+        ''
+          [Link]
+          ${attrsToSection def.linkConfig}
+        '';
+    };
+
+  netdevToUnit = name: def:
+    { inherit (def) enable;
+      text = commonMatchText def +
+        ''
+          [NetDev]
+          ${attrsToSection def.netdevConfig}
+
+          ${optionalString (def.vlanConfig != { }) ''
+            [VLAN]
+            ${attrsToSection def.vlanConfig}
+
+          ''}
+          ${optionalString (def.macvlanConfig != { }) ''
+            [MACVLAN]
+            ${attrsToSection def.macvlanConfig}
+
+          ''}
+          ${optionalString (def.vxlanConfig != { }) ''
+            [VXLAN]
+            ${attrsToSection def.vxlanConfig}
+
+          ''}
+          ${optionalString (def.tunnelConfig != { }) ''
+            [Tunnel]
+            ${attrsToSection def.tunnelConfig}
+
+          ''}
+          ${optionalString (def.peerConfig != { }) ''
+            [Peer]
+            ${attrsToSection def.peerConfig}
+
+          ''}
+          ${optionalString (def.tunConfig != { }) ''
+            [Tun]
+            ${attrsToSection def.tunConfig}
+
+          ''}
+          ${optionalString (def.tapConfig != { }) ''
+            [Tap]
+            ${attrsToSection def.tapConfig}
+
+          ''}
+          ${optionalString (def.bondConfig != { }) ''
+            [Bond]
+            ${attrsToSection def.bondConfig}
+
+          ''}
+        '';
+    };
+
+  networkToUnit = name: def:
+    { inherit (def) enable;
+      text = commonMatchText def +
+        ''
+          [Network]
+          ${attrsToSection def.networkConfig}
+          ${concatStringsSep "\n" (map (s: "Address=${s}") def.address)}
+          ${concatStringsSep "\n" (map (s: "Gateway=${s}") def.gateway)}
+          ${concatStringsSep "\n" (map (s: "DNS=${s}") def.dns)}
+          ${concatStringsSep "\n" (map (s: "NTP=${s}") def.ntp)}
+          ${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)}
+          ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)}
+          ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)}
+          ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)}
+
+          ${optionalString (def.dhcpConfig != { }) ''
+            [DHCP]
+            ${attrsToSection def.dhcpConfig}
+
+          ''}
+          ${flip concatMapStrings def.addresses (x: ''
+            [Address]
+            ${attrsToSection x.addressConfig}
+
+          '')}
+          ${flip concatMapStrings def.routes (x: ''
+            [Route]
+            ${attrsToSection x.routeConfig}
+
+          '')}
+        '';
+    };
+
+in
+
+{
+
+  options = {
+
+    systemd.network.enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable networkd or not.
+      '';
+    };
+
+    systemd.network.links = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = [ linkOptions ];
+      description = "Definition of systemd network links.";
+    };
+
+    systemd.network.netdevs = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = [ netdevOptions ];
+      description = "Definition of systemd network devices.";
+    };
+
+    systemd.network.networks = mkOption {
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = [ networkOptions networkConfig ];
+      description = "Definition of systemd networks.";
+    };
+
+    systemd.network.units = mkOption {
+      description = "Definition of networkd units.";
+      default = {};
+      type = types.attrsOf types.optionSet;
+      options = { name, config, ... }:
+        { options = concreteUnitOptions;
+          config = {
+            unit = mkDefault (makeUnit name config);
+          };
+        };
+    };
+
+  };
+
+  config = mkIf config.systemd.network.enable {
+
+    systemd.additionalUpstreamSystemUnits =
+      [ "systemd-networkd.service" "systemd-networkd-wait-online.service" ];
+
+    systemd.network.units =
+      mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links
+      // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.netdevs
+      // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.networks;
+
+    environment.etc."systemd/network".source =
+      generateUnits "network" cfg.units [] [];
+
+    users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
+    users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
+
+    systemd.services.systemd-networkd = {
+      wantedBy = [ "multi-user.target" ];
+      before = [ "network-interfaces.target" ];
+      restartTriggers = [ config.environment.etc."systemd/network".source ];
+    };
+
+    systemd.services.systemd-networkd-wait-online = {
+      before = [ "network-online.target" "ip-up.target" ];
+      wantedBy = [ "network-online.target" "ip-up.target" ];
+    };
+
+    systemd.services."systemd-network-wait-online@" = {
+      description = "Wait for Network Interface %I to be Configured";
+      conflicts = [ "shutdown.target" ];
+      requisite = [ "systemd-networkd.service" ];
+      after = [ "systemd-networkd.service" ];
+      serviceConfig = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";
+      };
+    };
+
+    services.resolved.enable = mkDefault true;
+    services.timesyncd.enable = mkDefault config.services.ntp.enable;
+
+  };
+
+}
diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix
new file mode 100644
index 00000000000..ecd547322d3
--- /dev/null
+++ b/nixos/modules/system/boot/resolved.nix
@@ -0,0 +1,38 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+  options = {
+
+    services.resolved.enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to enable the systemd DNS resolver daemon.
+      '';
+    };
+
+  };
+
+  config = mkIf config.services.resolved.enable {
+
+    systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ];
+
+    systemd.services.systemd-resolved = {
+      wantedBy = [ "multi-user.target" ];
+      restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
+    };
+
+    environment.etc."systemd/resolved.conf".text = ''
+      [Resolve]
+      DNS=${concatStringsSep " " config.networking.nameservers}
+    '';
+
+    users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
+    users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
+
+  };
+
+}
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 6155bb37cc5..c0ef4e02d1f 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -24,7 +24,6 @@ let
     path =
       [ pkgs.coreutils
         pkgs.utillinux
-        pkgs.sysvtools
         pkgs.openresolv
       ] ++ optional config.nix.readOnlyStore readonlyMountpoint;
     postBootCommands = pkgs.writeText "local-cmds"
diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
new file mode 100644
index 00000000000..e8cfd3395cb
--- /dev/null
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -0,0 +1,118 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let cfg = config.systemd; in
+
+rec {
+
+  shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);
+
+  makeUnit = name: unit:
+    let
+      pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name;
+    in
+    if unit.enable then
+      pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; }
+        ''
+          mkdir -p $out
+          echo -n "$text" > $out/${shellEscape name}
+        ''
+    else
+      pkgs.runCommand "unit-${pathSafeName}-disabled" { preferLocalBuild = true; }
+        ''
+          mkdir -p $out
+          ln -s /dev/null $out/${shellEscape name}
+        '';
+
+  generateUnits = type: units: upstreamUnits: upstreamWants:
+    pkgs.runCommand "${type}-units" { preferLocalBuild = true; } ''
+      mkdir -p $out
+
+      # Copy the upstream systemd units we're interested in.
+      for i in ${toString upstreamUnits}; do
+        fn=${cfg.package}/example/systemd/${type}/$i
+        if ! [ -e $fn ]; then echo "missing $fn"; false; fi
+        if [ -L $fn ]; then
+          target="$(readlink "$fn")"
+          if [ ''${target:0:3} = ../ ]; then
+            ln -s "$(readlink -f "$fn")" $out/
+          else
+            cp -pd $fn $out/
+          fi
+        else
+          ln -s $fn $out/
+        fi
+      done
+
+      # Copy .wants links, but only those that point to units that
+      # we're interested in.
+      for i in ${toString upstreamWants}; do
+        fn=${cfg.package}/example/systemd/${type}/$i
+        if ! [ -e $fn ]; then echo "missing $fn"; false; fi
+        x=$out/$(basename $fn)
+        mkdir $x
+        for i in $fn/*; do
+          y=$x/$(basename $i)
+          cp -pd $i $y
+          if ! [ -e $y ]; then rm $y; fi
+        done
+      done
+
+      # Symlink all units provided listed in systemd.packages.
+      for i in ${toString cfg.packages}; do
+        for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
+          if ! [[ "$fn" =~ .wants$ ]]; then
+            ln -s $fn $out/
+          fi
+        done
+      done
+
+      # Symlink all units defined by systemd.units. If these are also
+      # provided by systemd or systemd.packages, then add them as
+      # <unit-name>.d/overrides.conf, which makes them extend the
+      # upstream unit.
+      for i in ${toString (mapAttrsToList (n: v: v.unit) units)}; do
+        fn=$(basename $i/*)
+        if [ -e $out/$fn ]; then
+          if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
+            ln -sfn /dev/null $out/$fn
+          else
+            mkdir $out/$fn.d
+            ln -s $i/$fn $out/$fn.d/overrides.conf
+          fi
+       else
+          ln -fs $i/$fn $out/
+        fi
+      done
+
+      # Created .wants and .requires symlinks from the wantedBy and
+      # requiredBy options.
+      ${concatStrings (mapAttrsToList (name: unit:
+          concatMapStrings (name2: ''
+            mkdir -p $out/'${name2}.wants'
+            ln -sfn '../${name}' $out/'${name2}.wants'/
+          '') unit.wantedBy) units)}
+
+      ${concatStrings (mapAttrsToList (name: unit:
+          concatMapStrings (name2: ''
+            mkdir -p $out/'${name2}.requires'
+            ln -sfn '../${name}' $out/'${name2}.requires'/
+          '') unit.requiredBy) units)}
+
+      ${optionalString (type == "system") ''
+        # Stupid misc. symlinks.
+        ln -s ${cfg.defaultUnit} $out/default.target
+
+        ln -s rescue.target $out/kbrequest.target
+
+        mkdir -p $out/getty.target.wants/
+        ln -s ../autovt@tty1.service $out/getty.target.wants/
+
+        ln -s ../local-fs.target ../remote-fs.target ../network.target \
+        ../nss-lookup.target ../nss-user-lookup.target ../swap.target \
+        $out/multi-user.target.wants/
+      ''}
+    ''; # */
+
+}
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 2f4786c7896..785634cbf66 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -62,126 +62,7 @@ let
     ])
   ];
 
-  checkLink = checkUnitConfig "Link" [
-    (assertOnlyFields [
-      "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name"
-      "MTUBytes" "BitsPerSecond" "Duplex" "WakeOnLan"
-    ])
-    (assertValueOneOf "MACAddressPolicy" ["persistent" "random"])
-    (assertMacAddress "MACAddress")
-    (assertValueOneOf "NamePolicy" [
-      "kernel" "database" "onboard" "slot" "path" "mac"
-    ])
-    (assertByteFormat "MTUBytes")
-    (assertByteFormat "BitsPerSecond")
-    (assertValueOneOf "Duplex" ["half" "full"])
-    (assertValueOneOf "WakeOnLan" ["phy" "magic" "off"])
-  ];
-
-  checkNetdev = checkUnitConfig "Netdev" [
-    (assertOnlyFields [
-      "Description" "Name" "Kind" "MTUBytes" "MACAddress"
-    ])
-    (assertHasField "Name")
-    (assertHasField "Kind")
-    (assertValueOneOf "Kind" [
-      "bridge" "bond" "vlan" "macvlan" "vxlan" "ipip"
-      "gre" "sit" "vti" "veth" "tun" "tap" "dummy"
-    ])
-    (assertByteFormat "MTUBytes")
-    (assertMacAddress "MACAddress")
-  ];
-
-  checkVlan = checkUnitConfig "VLAN" [
-    (assertOnlyFields ["Id"])
-    (assertRange "Id" 0 4094)
-  ];
-
-  checkMacvlan = checkUnitConfig "MACVLAN" [
-    (assertOnlyFields ["Mode"])
-    (assertValueOneOf "Mode" ["private" "vepa" "bridge" "passthru"])
-  ];
-
-  checkVxlan = checkUnitConfig "VXLAN" [
-    (assertOnlyFields ["Id" "Group" "TOS" "TTL" "MacLearning"])
-    (assertRange "TTL" 0 255)
-    (assertValueOneOf "MacLearning" boolValues)
-  ];
-
-  checkTunnel = checkUnitConfig "Tunnel" [
-    (assertOnlyFields ["Local" "Remote" "TOS" "TTL" "DiscoverPathMTU"])
-    (assertRange "TTL" 0 255)
-    (assertValueOneOf "DiscoverPathMTU" boolValues)
-  ];
-
-  checkPeer = checkUnitConfig "Peer" [
-    (assertOnlyFields ["Name" "MACAddress"])
-    (assertMacAddress "MACAddress")
-  ];
-
-  tunTapChecks = [
-    (assertOnlyFields ["OneQueue" "MultiQueue" "PacketInfo" "User" "Group"])
-    (assertValueOneOf "OneQueue" boolValues)
-    (assertValueOneOf "MultiQueue" boolValues)
-    (assertValueOneOf "PacketInfo" boolValues)
-  ];
-
-  checkTun = checkUnitConfig "Tun" tunTapChecks;
-
-  checkTap = checkUnitConfig "Tap" tunTapChecks;
-
-  checkBond = checkUnitConfig "Bond" [
-    (assertOnlyFields [
-      "Mode" "TransmitHashPolicy" "LACPTransmitRate" "MIIMonitorSec"
-      "UpDelaySec" "DownDelaySec"
-    ])
-    (assertValueOneOf "Mode" [
-      "balance-rr" "active-backup" "balance-xor"
-      "broadcast" "802.3ad" "balance-tlb" "balance-alb"
-    ])
-    (assertValueOneOf "TransmitHashPolicy" [
-      "layer2" "layer3+4" "layer2+3" "encap2+3" "802.3ad" "encap3+4"
-    ])
-    (assertValueOneOf "LACPTransmitRate" ["slow" "fast"])
-  ];
-
-  checkNetwork = checkUnitConfig "Network" [
-    (assertOnlyFields [
-      "Description" "DHCP" "DHCPServer" "IPv4LL" "IPv4LLRoute"
-      "LLMNR" "Domains" "Bridge" "Bond"
-    ])
-    (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"])
-    (assertValueOneOf "DHCPServer" boolValues)
-    (assertValueOneOf "IPv4LL" boolValues)
-    (assertValueOneOf "IPv4LLRoute" boolValues)
-    (assertValueOneOf "LLMNR" boolValues)
-  ];
-
-  checkAddress = checkUnitConfig "Address" [
-    (assertOnlyFields ["Address" "Peer" "Broadcast" "Label"])
-    (assertHasField "Address")
-  ];
-
-  checkRoute = checkUnitConfig "Route" [
-    (assertOnlyFields ["Gateway" "Destination" "Metric"])
-    (assertHasField "Gateway")
-  ];
-
-  checkDhcp = checkUnitConfig "DHCP" [
-    (assertOnlyFields [
-      "UseDNS" "UseMTU" "SendHostname" "UseHostname" "UseDomains" "UseRoutes"
-      "CriticalConnections" "VendorClassIdentifier" "RequestBroadcast"
-      "RouteMetric"
-    ])
-    (assertValueOneOf "UseDNS" boolValues)
-    (assertValueOneOf "UseMTU" boolValues)
-    (assertValueOneOf "SendHostname" boolValues)
-    (assertValueOneOf "UseHostname" boolValues)
-    (assertValueOneOf "UseDomains" boolValues)
-    (assertValueOneOf "UseRoutes" boolValues)
-    (assertValueOneOf "CriticalConnections" boolValues)
-    (assertValueOneOf "RequestBroadcast" boolValues)
-  ];
+in rec {
 
   unitOption = mkOptionType {
     name = "systemd option";
@@ -195,8 +76,6 @@ let
         else mergeOneOption loc defs';
   };
 
-in rec {
-
   sharedOptions = {
 
     enable = mkOption {
@@ -619,345 +498,4 @@ in rec {
 
   targetOptions = commonUnitOptions;
 
-  commonNetworkOptions = {
-
-    enable = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        If set to false, this unit will be a symlink to
-        /dev/null.
-      '';
-    };
-
-    matchConfig = mkOption {
-      default = {};
-      example = { Name = "eth0"; };
-      type = types.attrsOf unitOption;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Match]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        <citerefentry><refentrytitle>systemd.network</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details.
-      '';
-    };
-
-  };
-
-  linkOptions = commonNetworkOptions // {
-
-    linkConfig = mkOption {
-      default = {};
-      example = { MACAddress = "00:ff:ee:aa:cc:dd"; };
-      type = types.addCheck (types.attrsOf unitOption) checkLink;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Link]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.link</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-  };
-
-  netdevOptions = commonNetworkOptions // {
-
-    netdevConfig = mkOption {
-      default = {};
-      example = { Name = "mybridge"; Kind = "bridge"; };
-      type = types.addCheck (types.attrsOf unitOption) checkNetdev;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Netdev]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    vlanConfig = mkOption {
-      default = {};
-      example = { Id = "4"; };
-      type = types.addCheck (types.attrsOf unitOption) checkVlan;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[VLAN]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    macvlanConfig = mkOption {
-      default = {};
-      example = { Mode = "private"; };
-      type = types.addCheck (types.attrsOf unitOption) checkMacvlan;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[MACVLAN]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    vxlanConfig = mkOption {
-      default = {};
-      example = { Id = "4"; };
-      type = types.addCheck (types.attrsOf unitOption) checkVxlan;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[VXLAN]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    tunnelConfig = mkOption {
-      default = {};
-      example = { Remote = "192.168.1.1"; };
-      type = types.addCheck (types.attrsOf unitOption) checkTunnel;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Tunnel]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    peerConfig = mkOption {
-      default = {};
-      example = { Name = "veth2"; };
-      type = types.addCheck (types.attrsOf unitOption) checkPeer;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Peer]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    tunConfig = mkOption {
-      default = {};
-      example = { User = "openvpn"; };
-      type = types.addCheck (types.attrsOf unitOption) checkTun;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Tun]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    tapConfig = mkOption {
-      default = {};
-      example = { User = "openvpn"; };
-      type = types.addCheck (types.attrsOf unitOption) checkTap;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Tap]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    bondConfig = mkOption {
-      default = {};
-      example = { Mode = "802.3ad"; };
-      type = types.addCheck (types.attrsOf unitOption) checkBond;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Bond]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.netdev</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-  };
-
-  addressOptions = {
-
-    addressConfig = mkOption {
-      default = {};
-      example = { Address = "192.168.0.100/24"; };
-      type = types.addCheck (types.attrsOf unitOption) checkAddress;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Address]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-  };
-
-  routeOptions = {
-
-    routeConfig = mkOption {
-      default = {};
-      example = { Gateway = "192.168.0.1"; };
-      type = types.addCheck (types.attrsOf unitOption) checkRoute;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Route]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-  };
-
-  networkOptions = commonNetworkOptions // {
-
-    networkConfig = mkOption {
-      default = {};
-      example = { Description = "My Network"; };
-      type = types.addCheck (types.attrsOf unitOption) checkNetwork;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Network]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    dhcpConfig = mkOption {
-      default = {};
-      example = { UseDNS = true; UseRoutes = true; };
-      type = types.addCheck (types.attrsOf unitOption) checkDhcp;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[DHCP]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    name = mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      description = ''
-        The name of the network interface to match against.
-      '';
-    };
-
-    DHCP = mkOption {
-      type = types.nullOr types.str;
-      default = null;
-      description = ''
-        Whether to enable DHCP on the interfaces matched.
-      '';
-    };
-
-    domains = mkOption {
-      type = types.nullOr (types.listOf types.str);
-      default = null;
-      description = ''
-        A list of domains to pass to the network config.
-      '';
-    };
-
-    address = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
-      description = ''
-        A list of addresses to be added to the network section of the
-        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    gateway = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
-      description = ''
-        A list of gateways to be added to the network section of the
-        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    dns = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
-      description = ''
-        A list of dns servers to be added to the network section of the
-        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    ntp = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
-      description = ''
-        A list of ntp servers to be added to the network section of the
-        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    vlan = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
-      description = ''
-        A list of vlan interfaces to be added to the network section of the
-        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    macvlan = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
-      description = ''
-        A list of macvlan interfaces to be added to the network section of the
-        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    vxlan = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
-      description = ''
-        A list of vxlan interfaces to be added to the network section of the
-        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    tunnel = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
-      description = ''
-        A list of tunnel interfaces to be added to the network section of the
-        unit.  See <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    addresses = mkOption {
-      default = [ ];
-      type = types.listOf types.optionSet;
-      options = [ addressOptions ];
-      description = ''
-        A list of address sections to be added to the unit.  See
-        <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    routes = mkOption {
-      default = [ ];
-      type = types.listOf types.optionSet;
-      options = [ routeOptions ];
-      description = ''
-        A list of route sections to be added to the unit.  See
-        <citerefentry><refentrytitle>systemd.network</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-  };
-
 }
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 29c449d4d0b..78aac7fe96f 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -3,6 +3,7 @@
 with utils;
 with lib;
 with import ./systemd-unit-options.nix { inherit config lib; };
+with import ./systemd-lib.nix { inherit config lib pkgs; };
 
 let
 
@@ -10,24 +11,6 @@ let
 
   systemd = cfg.package;
 
-
-  makeUnit = name: unit:
-    let
-      pathSafeName = lib.replaceChars ["@" ":" "\\"] ["-" "-" "-"] name;
-    in
-    if unit.enable then
-      pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; }
-        ''
-          mkdir -p $out
-          echo -n "$text" > $out/${shellEscape name}
-        ''
-    else
-      pkgs.runCommand "unit-${pathSafeName}-disabled" { preferLocalBuild = true; }
-        ''
-          mkdir -p $out
-          ln -s /dev/null $out/${shellEscape name}
-        '';
-
   upstreamSystemUnits =
     [ # Targets.
       "basic.target"
@@ -97,12 +80,6 @@ let
       "systemd-modules-load.service"
       "kmod-static-nodes.service"
 
-      # Networking
-      "systemd-networkd.service"
-      "systemd-networkd-wait-online.service"
-      "systemd-resolved.service"
-      "systemd-timesyncd.service"
-
       # Filesystems.
       "systemd-fsck@.service"
       "systemd-fsck-root.service"
@@ -196,8 +173,6 @@ let
       "timers.target"
     ];
 
-  shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);
-
   makeJobScript = name: text:
     let x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${shellEscape name}"; inherit text; };
     in "${x}/bin/${shellEscape name}";
@@ -301,19 +276,6 @@ let
     };
   };
 
-  networkConfig = { name, config, ... }: {
-    config = {
-      matchConfig = optionalAttrs (config.name != null) {
-        Name = config.name;
-      };
-      networkConfig = optionalAttrs (config.DHCP != null) {
-        DHCP = config.DHCP;
-      } // optionalAttrs (config.domains != null) {
-        Domains = concatStringsSep " " config.domains;
-      };
-    };
-  };
-
   toOption = x:
     if x == true then "true"
     else if x == false then "false"
@@ -412,188 +374,6 @@ let
       ${attrsToSection def.matchConfig}
     '';
 
-  linkToUnit = name: def:
-    { inherit (def) enable;
-      text = commonMatchText def +
-        ''
-          [Link]
-          ${attrsToSection def.linkConfig}
-        '';
-    };
-
-  netdevToUnit = name: def:
-    { inherit (def) enable;
-      text = commonMatchText def +
-        ''
-          [NetDev]
-          ${attrsToSection def.netdevConfig}
-
-          ${optionalString (def.vlanConfig != { }) ''
-            [VLAN]
-            ${attrsToSection def.vlanConfig}
-
-          ''}
-          ${optionalString (def.macvlanConfig != { }) ''
-            [MACVLAN]
-            ${attrsToSection def.macvlanConfig}
-
-          ''}
-          ${optionalString (def.vxlanConfig != { }) ''
-            [VXLAN]
-            ${attrsToSection def.vxlanConfig}
-
-          ''}
-          ${optionalString (def.tunnelConfig != { }) ''
-            [Tunnel]
-            ${attrsToSection def.tunnelConfig}
-
-          ''}
-          ${optionalString (def.peerConfig != { }) ''
-            [Peer]
-            ${attrsToSection def.peerConfig}
-
-          ''}
-          ${optionalString (def.tunConfig != { }) ''
-            [Tun]
-            ${attrsToSection def.tunConfig}
-
-          ''}
-          ${optionalString (def.tapConfig != { }) ''
-            [Tap]
-            ${attrsToSection def.tapConfig}
-
-          ''}
-          ${optionalString (def.bondConfig != { }) ''
-            [Bond]
-            ${attrsToSection def.bondConfig}
-
-          ''}
-        '';
-    };
-
-  networkToUnit = name: def:
-    { inherit (def) enable;
-      text = commonMatchText def +
-        ''
-          [Network]
-          ${attrsToSection def.networkConfig}
-          ${concatStringsSep "\n" (map (s: "Address=${s}") def.address)}
-          ${concatStringsSep "\n" (map (s: "Gateway=${s}") def.gateway)}
-          ${concatStringsSep "\n" (map (s: "DNS=${s}") def.dns)}
-          ${concatStringsSep "\n" (map (s: "NTP=${s}") def.ntp)}
-          ${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)}
-          ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)}
-          ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)}
-          ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)}
-
-          ${optionalString (def.dhcpConfig != { }) ''
-            [DHCP]
-            ${attrsToSection def.dhcpConfig}
-
-          ''}
-          ${flip concatMapStrings def.addresses (x: ''
-            [Address]
-            ${attrsToSection x.addressConfig}
-
-          '')}
-          ${flip concatMapStrings def.routes (x: ''
-            [Route]
-            ${attrsToSection x.routeConfig}
-
-          '')}
-        '';
-    };
-
-  generateUnits = type: units: upstreamUnits: upstreamWants:
-    pkgs.runCommand "${type}-units" { preferLocalBuild = true; } ''
-      mkdir -p $out
-
-      # Copy the upstream systemd units we're interested in.
-      for i in ${toString upstreamUnits}; do
-        fn=${systemd}/example/systemd/${type}/$i
-        if ! [ -e $fn ]; then echo "missing $fn"; false; fi
-        if [ -L $fn ]; then
-          target="$(readlink "$fn")"
-          if [ ''${target:0:3} = ../ ]; then
-            ln -s "$(readlink -f "$fn")" $out/
-          else
-            cp -pd $fn $out/
-          fi
-        else
-          ln -s $fn $out/
-        fi
-      done
-
-      # Copy .wants links, but only those that point to units that
-      # we're interested in.
-      for i in ${toString upstreamWants}; do
-        fn=${systemd}/example/systemd/${type}/$i
-        if ! [ -e $fn ]; then echo "missing $fn"; false; fi
-        x=$out/$(basename $fn)
-        mkdir $x
-        for i in $fn/*; do
-          y=$x/$(basename $i)
-          cp -pd $i $y
-          if ! [ -e $y ]; then rm $y; fi
-        done
-      done
-
-      # Symlink all units provided listed in systemd.packages.
-      for i in ${toString cfg.packages}; do
-        for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
-          if ! [[ "$fn" =~ .wants$ ]]; then
-            ln -s $fn $out/
-          fi
-        done
-      done
-
-      # Symlink all units defined by systemd.units. If these are also
-      # provided by systemd or systemd.packages, then add them as
-      # <unit-name>.d/overrides.conf, which makes them extend the
-      # upstream unit.
-      for i in ${toString (mapAttrsToList (n: v: v.unit) units)}; do
-        fn=$(basename $i/*)
-        if [ -e $out/$fn ]; then
-          if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
-            ln -sfn /dev/null $out/$fn
-          else
-            mkdir $out/$fn.d
-            ln -s $i/$fn $out/$fn.d/overrides.conf
-          fi
-       else
-          ln -fs $i/$fn $out/
-        fi
-      done
-
-      # Created .wants and .requires symlinks from the wantedBy and
-      # requiredBy options.
-      ${concatStrings (mapAttrsToList (name: unit:
-          concatMapStrings (name2: ''
-            mkdir -p $out/'${name2}.wants'
-            ln -sfn '../${name}' $out/'${name2}.wants'/
-          '') unit.wantedBy) units)}
-
-      ${concatStrings (mapAttrsToList (name: unit:
-          concatMapStrings (name2: ''
-            mkdir -p $out/'${name2}.requires'
-            ln -sfn '../${name}' $out/'${name2}.requires'/
-          '') unit.requiredBy) units)}
-
-      ${optionalString (type == "system") ''
-        # Stupid misc. symlinks.
-        ln -s ${cfg.defaultUnit} $out/default.target
-
-        ln -s rescue.target $out/kbrequest.target
-
-        mkdir -p $out/getty.target.wants/
-        ln -s ../autovt@tty1.service $out/getty.target.wants/
-
-        ln -s ../local-fs.target ../remote-fs.target ../network.target \
-        ../nss-lookup.target ../nss-user-lookup.target ../swap.target \
-        $out/multi-user.target.wants/
-      ''}
-    ''; # */
-
 in
 
 {
@@ -683,47 +463,6 @@ in
       '';
     };
 
-    systemd.network.enable = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Whether to enable networkd or not.
-      '';
-    };
-
-    systemd.network.links = mkOption {
-      default = {};
-      type = types.attrsOf types.optionSet;
-      options = [ linkOptions ];
-      description = "Definition of systemd network links.";
-    };
-
-    systemd.network.netdevs = mkOption {
-      default = {};
-      type = types.attrsOf types.optionSet;
-      options = [ netdevOptions ];
-      description = "Definition of systemd network devices.";
-    };
-
-    systemd.network.networks = mkOption {
-      default = {};
-      type = types.attrsOf types.optionSet;
-      options = [ networkOptions networkConfig ];
-      description = "Definition of systemd networks.";
-    };
-
-    systemd.network.units = mkOption {
-      description = "Definition of networkd units.";
-      default = {};
-      type = types.attrsOf types.optionSet;
-      options = { name, config, ... }:
-        { options = concreteUnitOptions;
-          config = {
-            unit = mkDefault (makeUnit name config);
-          };
-        };
-    };
-
     systemd.defaultUnit = mkOption {
       default = "multi-user.target";
       type = types.str;
@@ -807,22 +546,6 @@ in
       '';
     };
 
-    services.resolved.enable = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Enables the systemd dns resolver daemon.
-      '';
-    };
-
-    services.timesyncd.enable = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Enables the systemd ntp client daemon.
-      '';
-    };
-
     systemd.tmpfiles.rules = mkOption {
       type = types.listOf types.str;
       default = [];
@@ -886,7 +609,7 @@ in
 
   ###### implementation
 
-  config = mkMerge [ {
+  config = {
 
     warnings = concatLists (mapAttrsToList (name: service:
       optional (service.serviceConfig.Type or "" == "oneshot" && service.serviceConfig.Restart or "no" != "no")
@@ -899,9 +622,6 @@ in
     environment.etc."systemd/system".source =
       generateUnits "system" cfg.units upstreamSystemUnits upstreamSystemWants;
 
-    environment.etc."systemd/network".source =
-      generateUnits "network" cfg.network.units [] [];
-
     environment.etc."systemd/user".source =
       generateUnits "user" cfg.user.units upstreamUserUnits [];
 
@@ -979,11 +699,6 @@ in
                    (v: let n = escapeSystemdPath v.where;
                        in nameValuePair "${n}.automount" (automountToUnit n v)) cfg.automounts);
 
-    systemd.network.units =
-      mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.network.links
-      // mapAttrs' (n: v: nameValuePair "${n}.netdev" (netdevToUnit n v)) cfg.network.netdevs
-      // mapAttrs' (n: v: nameValuePair "${n}.network" (networkToUnit n v)) cfg.network.networks;
-
     systemd.user.units =
          mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services
       // mapAttrs' (n: v: nameValuePair "${n}.socket"  (socketToUnit  n v)) cfg.user.sockets
@@ -1006,15 +721,6 @@ in
     users.extraUsers.systemd-journal-gateway.uid = config.ids.uids.systemd-journal-gateway;
     users.extraGroups.systemd-journal-gateway.gid = config.ids.gids.systemd-journal-gateway;
 
-    users.extraUsers.systemd-network.uid = config.ids.uids.systemd-network;
-    users.extraGroups.systemd-network.gid = config.ids.gids.systemd-network;
-
-    users.extraUsers.systemd-resolve.uid = config.ids.uids.systemd-resolve;
-    users.extraGroups.systemd-resolve.gid = config.ids.gids.systemd-resolve;
-
-    users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync;
-    users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
-
     # Generate timer units for all services that have a ‘startAt’ value.
     systemd.timers =
       mapAttrs (name: service:
@@ -1053,57 +759,6 @@ in
     systemd.services.systemd-remount-fs.restartIfChanged = false;
     systemd.services.systemd-journal-flush.restartIfChanged = false;
 
-  }
-  (mkIf config.systemd.network.enable {
-    systemd.services.systemd-networkd = {
-      wantedBy = [ "multi-user.target" ];
-      before = [ "network-interfaces.target" ];
-      restartTriggers = [ config.environment.etc."systemd/network".source ];
-    };
-
-    systemd.services.systemd-networkd-wait-online = {
-      before = [ "network-online.target" "ip-up.target" ];
-      wantedBy = [ "network-online.target" "ip-up.target" ];
-    };
-
-    systemd.services."systemd-network-wait-online@" = {
-      description = "Wait for Network Interface %I to be Configured";
-      conflicts = [ "shutdown.target" ];
-      requisite = [ "systemd-networkd.service" ];
-      after = [ "systemd-networkd.service" ];
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I";
-      };
-    };
-
-    services.resolved.enable = mkDefault true;
-    services.timesyncd.enable = mkDefault config.services.ntp.enable;
-  })
-  (mkIf config.services.resolved.enable {
-    systemd.services.systemd-resolved = {
-      wantedBy = [ "multi-user.target" ];
-      restartTriggers = [ config.environment.etc."systemd/resolved.conf".source ];
-    };
-
-    environment.etc."systemd/resolved.conf".text = ''
-      [Resolve]
-      DNS=${concatStringsSep " " config.networking.nameservers}
-    '';
-  })
-  (mkIf config.services.timesyncd.enable {
-    systemd.services.systemd-timesyncd = {
-      wantedBy = [ "sysinit.target" ];
-      restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ];
-    };
-
-    environment.etc."systemd/timesyncd.conf".text = ''
-      [Time]
-      NTP=${concatStringsSep " " config.services.ntp.servers}
-    '';
+  };
 
-    systemd.services.ntpd.enable = false;
-  })
-  ];
 }
diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
new file mode 100644
index 00000000000..cba965b1cd2
--- /dev/null
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -0,0 +1,40 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+
+  options = {
+
+    services.timesyncd.enable = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enables the systemd NTP client daemon.
+      '';
+    };
+
+  };
+
+  config = mkIf config.services.timesyncd.enable {
+
+    systemd.additionalUpstreamSystemUnits = [ "systemd-timesyncd.service" ];
+
+    systemd.services.systemd-timesyncd = {
+      wantedBy = [ "sysinit.target" ];
+      restartTriggers = [ config.environment.etc."systemd/timesyncd.conf".source ];
+    };
+
+    environment.etc."systemd/timesyncd.conf".text = ''
+      [Time]
+      NTP=${concatStringsSep " " config.services.ntp.servers}
+    '';
+
+    systemd.services.ntpd.enable = false;
+
+    users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync;
+    users.extraGroups.systemd-timesync.gid = config.ids.gids.systemd-timesync;
+
+  };
+
+}
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index c6f2f072352..ce8d6079faa 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -137,9 +137,7 @@ in
     # Add the mount helpers to the system path so that `mount' can find them.
     system.fsPackages = [ pkgs.dosfstools ];
 
-    environment.systemPackages =
-      [ pkgs.ntfs3g pkgs.fuse ]
-      ++ config.system.fsPackages;
+    environment.systemPackages = [ pkgs.fuse ] ++ config.system.fsPackages;
 
     environment.etc.fstab.text =
       let
diff --git a/nixos/modules/tasks/filesystems/cifs.nix b/nixos/modules/tasks/filesystems/cifs.nix
index 3932b5c9acf..a928fcae415 100644
--- a/nixos/modules/tasks/filesystems/cifs.nix
+++ b/nixos/modules/tasks/filesystems/cifs.nix
@@ -11,7 +11,7 @@ in
 {
   config = {
 
-    system.fsPackages = [ pkgs.cifs_utils ];
+    system.fsPackages = mkIf (any (fs: fs == "cifs") config.boot.supportedFilesystems) [ pkgs.cifs_utils ];
 
     boot.initrd.availableKernelModules = mkIf inInitrd
       [ "cifs" "nls_utf8" "hmac" "md4" "ecb" "des_generic" "sha256" ];
diff --git a/nixos/modules/tasks/filesystems/ntfs.nix b/nixos/modules/tasks/filesystems/ntfs.nix
new file mode 100644
index 00000000000..c40d2a1a80b
--- /dev/null
+++ b/nixos/modules/tasks/filesystems/ntfs.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  config = mkIf (any (fs: fs == "ntfs" || fs == "ntfs-3g") config.boot.supportedFilesystems) {
+
+    system.fsPackages = [ pkgs.ntfs3g ];
+
+  };
+}
diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index fd545a723e7..328d94cbb05 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -107,7 +107,7 @@ in
             ips = interfaceIps i;
           in
           nameValuePair "network-addresses-${i.name}"
-          { description = "Addresss configuration of ${i.name}";
+          { description = "Address configuration of ${i.name}";
             wantedBy = [ "network-interfaces.target" ];
             before = [ "network-interfaces.target" ];
             bindsTo = [ (subsystemDevice i.name) ];
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index a7e8953827a..67047541102 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -9,6 +9,7 @@ with lib;
     # Disable some features that are not useful in a container.
     sound.enable = mkDefault false;
     services.udisks2.enable = mkDefault false;
+    powerManagement.enable = mkDefault false;
 
     networking.useHostResolvConf = true;
 
@@ -20,6 +21,8 @@ with lib;
 
     systemd.services.systemd-remount-fs.enable = false;
 
+    systemd.services.systemd-random-seed.enable = false;
+
   };
 
 }
diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix
index 0195ca5c6dc..9535e3e0d67 100644
--- a/nixos/modules/virtualisation/docker-image.nix
+++ b/nixos/modules/virtualisation/docker-image.nix
@@ -2,7 +2,7 @@
 
 {
   imports = [
-    ../profiles/container.nix
+    ../profiles/docker-container.nix # FIXME, shouldn't include something from profiles/
   ];
 
   boot.postBootCommands =
diff --git a/nixos/modules/virtualisation/google-compute-config.nix b/nixos/modules/virtualisation/google-compute-config.nix
index 9e6be93b6d9..f6bca1aa857 100644
--- a/nixos/modules/virtualisation/google-compute-config.nix
+++ b/nixos/modules/virtualisation/google-compute-config.nix
@@ -1,5 +1,5 @@
-{ config, pkgs, modulesPath, ... }:
+{ config, pkgs, ... }:
 
 {
-  imports = [ "${modulesPath}/virtualisation/google-compute-image.nix" ];
+  imports = [ <nixpkgs/nixos/modules/virtualisation/google-compute-image.nix> ];
 }
diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix
index 2fa749d542e..0208787e779 100644
--- a/nixos/modules/virtualisation/lxc-container.nix
+++ b/nixos/modules/virtualisation/lxc-container.nix
@@ -4,7 +4,7 @@ with lib;
 
 {
   imports = [
-    ../profiles/container.nix
+    ../profiles/docker-container.nix # FIXME, shouldn't include something from profiles/
   ];
 
   # Allow the user to login as root without password.
diff --git a/nixos/tests/gnome3_16.nix b/nixos/tests/gnome3_16.nix
new file mode 100644
index 00000000000..23a66aba50c
--- /dev/null
+++ b/nixos/tests/gnome3_16.nix
@@ -0,0 +1,34 @@
+import ./make-test.nix {
+  name = "gnome3";
+
+  machine =
+    { config, pkgs, ... }:
+
+    { imports = [ ./common/user-account.nix ];
+
+      services.xserver.enable = true;
+
+      services.xserver.displayManager.auto.enable = true;
+      services.xserver.displayManager.auto.user = "alice";
+      services.xserver.desktopManager.gnome3.enable = true;
+
+      environment.gnome3.packageSet = pkgs.gnome3_16;
+
+      virtualisation.memorySize = 512;
+    };
+
+  testScript =
+    ''
+      $machine->waitForX;
+      $machine->sleep(15);
+
+      # Check that logging in has given the user ownership of devices.
+      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
+
+      $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
+      $machine->waitForWindow(qr/Terminal/);
+      $machine->sleep(20);
+      $machine->screenshot("screen");
+    '';
+
+}
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 46d0422f9c6..2ea96ecb7ca 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -64,26 +64,26 @@ import ./make-test.nix ({ networkd, test, ... }:
             $client->fail("systemctl status dhcpcd.service");
 
             # Test vlan 1
-            $client->succeed("ping -c 1 192.168.1.1");
-            $client->succeed("ping -c 1 192.168.1.2");
-            $client->succeed("ping -c 1 192.168.1.3");
-            $client->succeed("ping -c 1 192.168.1.10");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.10");
 
-            $router->succeed("ping -c 1 192.168.1.1");
-            $router->succeed("ping -c 1 192.168.1.2");
-            $router->succeed("ping -c 1 192.168.1.3");
-            $router->succeed("ping -c 1 192.168.1.10");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.10");
 
             # Test vlan 2
-            $client->succeed("ping -c 1 192.168.2.1");
-            $client->succeed("ping -c 1 192.168.2.2");
+            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
+            $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
 
-            $router->succeed("ping -c 1 192.168.2.1");
-            $router->succeed("ping -c 1 192.168.2.2");
+            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
 
             # Test default gateway
-            $router->succeed("ping -c 1 192.168.3.1");
-            $client->succeed("ping -c 1 192.168.3.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.3.1");
+            $client->waitUntilSucceeds("ping -c 1 192.168.3.1");
           '';
       };
       dhcpSimple = {
@@ -109,22 +109,22 @@ import ./make-test.nix ({ networkd, test, ... }:
             $router->waitForUnit("network.target");
 
             # Wait until we have an ip address on each interface
-            $client->succeed("while ! ip addr show dev eth1 | grep '192.168.1'; do true; done");
-            $client->succeed("while ! ip addr show dev eth2 | grep '192.168.2'; do true; done");
+            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+            $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'");
 
             # Test vlan 1
-            $client->succeed("ping -c 1 192.168.1.1");
-            $client->succeed("ping -c 1 192.168.1.2");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
 
-            $router->succeed("ping -c 1 192.168.1.1");
-            $router->succeed("ping -c 1 192.168.1.2");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
 
             # Test vlan 2
-            $client->succeed("ping -c 1 192.168.2.1");
-            $client->succeed("ping -c 1 192.168.2.2");
+            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
+            $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
 
-            $router->succeed("ping -c 1 192.168.2.1");
-            $router->succeed("ping -c 1 192.168.2.2");
+            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
           '';
       };
       dhcpOneIf = {
@@ -147,26 +147,27 @@ import ./make-test.nix ({ networkd, test, ... }:
           ''
             startAll;
 
+            # Wait for networking to come up
             $client->waitForUnit("network-interfaces.target");
             $client->waitForUnit("network.target");
             $router->waitForUnit("network-interfaces.target");
             $router->waitForUnit("network.target");
 
             # Wait until we have an ip address on each interface
-            $client->succeed("while ! ip addr show dev eth1 | grep '192.168.1'; do true; done");
+            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
 
             # Test vlan 1
-            $client->succeed("ping -c 1 192.168.1.1");
-            $client->succeed("ping -c 1 192.168.1.2");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
 
-            $router->succeed("ping -c 1 192.168.1.1");
-            $router->succeed("ping -c 1 192.168.1.2");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
 
             # Test vlan 2
-            $client->succeed("ping -c 1 192.168.2.1");
+            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
             $client->fail("ping -c 1 192.168.2.2");
 
-            $router->succeed("ping -c 1 192.168.2.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
             $router->fail("ping -c 1 192.168.2.2");
           '';
       };
@@ -195,17 +196,18 @@ import ./make-test.nix ({ networkd, test, ... }:
           ''
             startAll;
 
+            # Wait for networking to come up
             $client1->waitForUnit("network-interfaces.target");
             $client1->waitForUnit("network.target");
             $client2->waitForUnit("network-interfaces.target");
             $client2->waitForUnit("network.target");
 
             # Test bonding
-            $client1->succeed("ping -c 2 192.168.1.1");
-            $client1->succeed("ping -c 2 192.168.1.2");
+            $client1->waitUntilSucceeds("ping -c 2 192.168.1.1");
+            $client1->waitUntilSucceeds("ping -c 2 192.168.1.2");
 
-            $client2->succeed("ping -c 2 192.168.1.1");
-            $client2->succeed("ping -c 2 192.168.1.2");
+            $client2->waitUntilSucceeds("ping -c 2 192.168.1.1");
+            $client2->waitUntilSucceeds("ping -c 2 192.168.1.2");
           '';
       };
       bridge = let
@@ -240,6 +242,7 @@ import ./make-test.nix ({ networkd, test, ... }:
           ''
             startAll;
 
+            # Wait for networking to come up
             $client1->waitForUnit("network-interfaces.target");
             $client1->waitForUnit("network.target");
             $client2->waitForUnit("network-interfaces.target");
@@ -248,17 +251,17 @@ import ./make-test.nix ({ networkd, test, ... }:
             $router->waitForUnit("network.target");
 
             # Test bridging
-            $client1->succeed("ping -c 1 192.168.1.1");
-            $client1->succeed("ping -c 1 192.168.1.2");
-            $client1->succeed("ping -c 1 192.168.1.3");
+            $client1->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $client1->waitUntilSucceeds("ping -c 1 192.168.1.2");
+            $client1->waitUntilSucceeds("ping -c 1 192.168.1.3");
 
-            $client2->succeed("ping -c 1 192.168.1.1");
-            $client2->succeed("ping -c 1 192.168.1.2");
-            $client2->succeed("ping -c 1 192.168.1.3");
+            $client2->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $client2->waitUntilSucceeds("ping -c 1 192.168.1.2");
+            $client2->waitUntilSucceeds("ping -c 1 192.168.1.3");
 
-            $router->succeed("ping -c 1 192.168.1.1");
-            $router->succeed("ping -c 1 192.168.1.2");
-            $router->succeed("ping -c 1 192.168.1.3");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
           '';
       };
       macvlan = {
@@ -278,23 +281,28 @@ import ./make-test.nix ({ networkd, test, ... }:
           ''
             startAll;
 
+            # Wait for networking to come up
             $client->waitForUnit("network-interfaces.target");
             $client->waitForUnit("network.target");
             $router->waitForUnit("network-interfaces.target");
             $router->waitForUnit("network.target");
 
             # Wait until we have an ip address on each interface
-            $client->succeed("while ! ip addr show dev eth1 | grep '192.168.1'; do true; done");
-            $client->succeed("while ! ip addr show dev macvlan | grep '192.168.1'; do true; done");
+            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+            $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
 
-            # Test macvlan
-            $client->succeed("ping -c 1 192.168.1.1");
-            $client->succeed("ping -c 1 192.168.1.2");
-            $client->succeed("ping -c 1 192.168.1.3");
+            # Print diagnosting information
+            $router->succeed("ip addr >&2");
+            $client->succeed("ip addr >&2");
 
-            $router->succeed("ping -c 1 192.168.1.1");
-            $router->succeed("ping -c 1 192.168.1.2");
-            $router->succeed("ping -c 1 192.168.1.3");
+            # Test macvlan creates routable ips
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+            $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
+
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
           '';
       };
       sit = let
@@ -323,20 +331,22 @@ import ./make-test.nix ({ networkd, test, ... }:
           ''
             startAll;
 
+            # Wait for networking to be configured
             $client1->waitForUnit("network-interfaces.target");
             $client1->waitForUnit("network.target");
             $client2->waitForUnit("network-interfaces.target");
             $client2->waitForUnit("network.target");
 
+            # Print diagnostic information
             $client1->succeed("ip addr >&2");
             $client2->succeed("ip addr >&2");
 
             # Test ipv6
-            $client1->succeed("ping6 -c 1 fc00::1");
-            $client1->succeed("ping6 -c 1 fc00::2");
+            $client1->waitUntilSucceeds("ping6 -c 1 fc00::1");
+            $client1->waitUntilSucceeds("ping6 -c 1 fc00::2");
 
-            $client2->succeed("ping6 -c 1 fc00::1");
-            $client2->succeed("ping6 -c 1 fc00::2");
+            $client2->waitUntilSucceeds("ping6 -c 1 fc00::1");
+            $client2->waitUntilSucceeds("ping6 -c 1 fc00::2");
           '';
       };
       vlan = let
@@ -364,6 +374,7 @@ import ./make-test.nix ({ networkd, test, ... }:
           ''
             startAll;
 
+            # Wait for networking to be configured
             $client1->waitForUnit("network-interfaces.target");
             $client1->waitForUnit("network.target");
             $client2->waitForUnit("network-interfaces.target");
diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix
index 11ec35a71bd..61bba04cb6a 100644
--- a/pkgs/applications/altcoins/primecoin.nix
+++ b/pkgs/applications/altcoins/primecoin.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec{
     else "install -D bitcoind $out/bin/primecoind";
 
   meta = {
-    description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers.";
+    description = "A new type cryptocurrency which is proof-of-work based on searching for prime numbers";
     longDescription= ''
       Primecoin is an innovative cryptocurrency, a form of digital
       currency secured by cryptography and issued through a
diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 1978fcf1874..b8c8c183753 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -2,13 +2,13 @@
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
 
-let version = "2.5.4";
+let version = "2.6";
 in
   stdenv.mkDerivation {
     name = "abcde-${version}";
     src = fetchurl {
       url = "mirror://debian/pool/main/a/abcde/abcde_${version}.orig.tar.gz";
-      sha256 = "14g5lsgh53hza9848351kwpygc0yqpvvzp3s923aja77f2wpkdl5";
+      sha256 = "0y2cg233n2hixs0ji76dggpzgf52v4c4mnpwiai889ql2piafgk8";
     };
 
     # FIXME: This package does not support MP3 encoding (only Ogg),
diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix
index efab9202025..0f6ebfcedb5 100644
--- a/pkgs/applications/audio/calf/default.nix
+++ b/pkgs/applications/audio/calf/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "calf-${version}";
-  version = "0.0.19";
+  version = "0.0.60";
 
   src = fetchurl {
     url = "mirror://sourceforge/calf/${name}.tar.gz";
-    sha256 = "1v1cjbxv5wg6rsa2nfz1f8r7cykcpx6jm5ccqmzx866dggiff1hi";
+    sha256 = "019fwg00jv217a5r767z7szh7vdrarybac0pr2sk26xp81kibrx9";
   };
 
   buildInputs = [ 
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 5c5416b79e1..25cc33d6cb8 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -2,14 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "cdparanoia-III-10.2";
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz";
     sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80";
   };
 
   preConfigure = "unset CC";
-  
+
+  patches = stdenv.lib.optionals stdenv.isDarwin [ 
+    (fetchurl {
+      url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch";
+      sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd";
+    })
+    (fetchurl {
+      url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff";
+      sha1 = "d7dc121374df3b82e82adf544df7bf1eec377bdb";
+    })
+  ];
+
   meta = {
     homepage = http://xiph.org/paranoia;
     description = "A tool and library for reading digital audio from CDs";
diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix
index 7725ba1e4c8..bbce758be8a 100644
--- a/pkgs/applications/audio/chuck/default.nix
+++ b/pkgs/applications/audio/chuck/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, alsaLib, bison, flex, libsndfile, which }:
 
 stdenv.mkDerivation rec {
-  version = "1.3.4.0";
+  version = "1.3.5.0";
   name = "chuck-${version}";
 
   src = fetchurl {
     url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz";
-    sha256 = "0cwbk8b1i18nkh2nxwzk2prranw83lgglxw7ccnp6b0r2b2yfpmn";
+    sha256 = "0rj2l5k6ncm4jaiq0igwfc2bzryzchk1is1jhk1n7wifxcf3d3k5";
   };
 
   buildInputs = [ bison flex libsndfile which ]
diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
new file mode 100644
index 00000000000..b5436fde7e9
--- /dev/null
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, jack2 }:
+
+stdenv.mkDerivation rec {
+  name = "dirt-git";
+  src = fetchFromGitHub {
+    repo = "Dirt";
+    owner = "tidalcycles";
+    rev = "cfc5e85318defda7462192b5159103c823ce61f7";
+    sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
+  };
+  buildInputs = [ libsndfile libsamplerate liblo jack2 ];
+  configurePhase = ''
+    export DESTDIR=$out
+  '';
+
+  meta = {
+    description = "An unimpressive thingie for playing bits of samples with some level of accuracy";
+    homepage = "https://github.com/tidalcycles/Dirt";
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index e27b95c81e5..d71845ead37 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/applications/audio/drumkv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "drumkv1-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "1y3imsh059y9sihr92f3drwmcby4x3krmhly111ahwkydb94kphw";
+    sha256 = "082ml6g63n6s3w704fjkma8085g2l10az3f6r78y9hpgpw3042jw";
   };
 
   buildInputs = [ jack2 libsndfile lv2 qt4 ];
diff --git a/pkgs/applications/audio/gnaural/default.nix b/pkgs/applications/audio/gnaural/default.nix
index c9746590566..93abad7aa77 100644
--- a/pkgs/applications/audio/gnaural/default.nix
+++ b/pkgs/applications/audio/gnaural/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib;
     { description = "Auditory binaural-beat generator";
       homepage = http://gnaural.sourceforge.net/;
-      licenses = licenses.gpl2;
+      license = licenses.gpl2;
       maintainers = [ maintainers.emery ];
       platforms = platforms.linux;
     };
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index b96872c7ef0..94c2cd81002 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -1,28 +1,28 @@
 {stdenv, fetchurl, id3lib, groff, zlib}:
 
+let version = "0.1.12"; in
 stdenv.mkDerivation rec {
-  name = "id3v2-0.1.11";
+  name = "id3v2-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/id3v2/${name}.tar.gz";
-    sha256 = "00r6f9yzmkrqa62dnkm8njg5cjzhmy0l17nj1ba15nrrm0mnand4";
+    sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1";
   };
 
-  patches = [ ./id3v2-0.1.11-track-bad-free.patch ];
-
   nativeBuildInputs = [ groff ];
   buildInputs = [ id3lib zlib ];
 
-  configurePhase = ''
-    export makeFlags=PREFIX=$out
-  '';
+  makeFlags = "PREFIX=$(out)";
+  buildFlags = "clean all";
 
   preInstall = ''
-    mkdir -p $out/bin $out/man/man1
+    mkdir -p $out/{bin,share/man/man1}
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "A command line editor for id3v2 tags";
     homepage = http://id3v2.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch b/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch
deleted file mode 100644
index 3222fc7f41c..00000000000
--- a/pkgs/applications/audio/id3v2/id3v2-0.1.11-track-bad-free.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://sourceforge.net/tracker/index.php?func=detail&aid=1252035&group_id=4193&atid=304193
-
-diff -up id3v2-0.1.11/id3v2.cpp~ id3v2-0.1.11/id3v2.cpp
---- id3v2-0.1.11/id3v2.cpp~	2004-05-04 21:30:15.000000000 +0300
-+++ id3v2-0.1.11/id3v2.cpp	2008-01-03 21:22:02.000000000 +0200
-@@ -423,7 +423,7 @@ int main( int argc, char *argv[])
-         {
-           // check if there is a total track number and if we only have 
-           // the track number for this file.  In this case combine them.
--          char *currentTrackNum, *newTrackNum;
-+          char *currentTrackNum, *newTrackNum = NULL;
- 
-           if (pFrame != NULL) 
-           {
diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix
new file mode 100644
index 00000000000..b855bd29660
--- /dev/null
+++ b/pkgs/applications/audio/jaaa/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl, alsaLib, libclthreads, libclxclient, libX11, libXft, libXrender, fftwFloat, freetype, fontconfig, jack2, xlibs, zita-alsa-pcmi }:
+
+stdenv.mkDerivation rec {
+  name = "jaaa-${version}";
+  version = "0.8.4";
+
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "0jyll4rkb6vja2widc340ww078rr24c6nmxbxdqvbxw409nccd01";
+  };
+
+  buildInputs = [
+    alsaLib libclthreads libclxclient libX11 libXft libXrender fftwFloat jack2 zita-alsa-pcmi
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${xlibs.xproto}/include"
+    "-I${libX11}/include"
+    "-I${libXft}/include"
+    "-I${freetype}/include"
+    "-I${fontconfig}/include"
+    "-I${libXrender}/include"
+    "-I${xlibs.renderproto}/include"
+    "-I${alsaLib}/include"
+    "-I${zita-alsa-pcmi}/include"
+  ];
+
+  patchPhase = ''
+    cd source/
+    sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.cc')
+    sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.cc')
+    sed -i "s@clthreads.h@${libclthreads}/include@g" $(find . -name '*.h')
+    sed -i "s@clxclient.h@${libclxclient}/include@g" $(find . -name '*.h')
+  '';
+
+  buildlPhase = ''
+    make PREFIX="$out"
+  '';
+
+  installPhase = ''
+    echo zita= ${zita-alsa-pcmi}
+    make PREFIX="$out" install
+    install -Dm644 ../README "$out/README"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html;
+    description = "JACK and ALSA Audio Analyser";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix
index 58a83dafe69..918b743fef7 100644
--- a/pkgs/applications/audio/mikmod/default.nix
+++ b/pkgs/applications/audio/mikmod/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, libmikmod, ncurses }:
+{ stdenv, fetchurl, libmikmod, ncurses, alsaLib }:
 
 stdenv.mkDerivation rec {
   name = "mikmod-3.2.6";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/mikmod/mikmod/3.2.6/mikmod-3.2.6.tar.gz";
+    url = "mirror://sourceforge/mikmod/${name}.tar.gz";
     sha256 = "0wr61raj10rpl64mk3x9g3rwys898fbzyg93c6mrz89nvc74wm04";
   };
 
diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix
index 2dd4c19f0e0..4616d3f7c64 100644
--- a/pkgs/applications/audio/mopidy-mopify/default.nix
+++ b/pkgs/applications/audio/mopidy-mopify/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/dirkgroenen/mopidy-mopify;
-    description = "A mopidy webclient based on the Spotify webbased interface.";
+    description = "A mopidy webclient based on the Spotify webbased interface";
     license = licenses.gpl3;
     maintainers = [ maintainers.Gonzih ];
   };
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index a0bb8789658..7d4768d2332 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,33 +1,31 @@
-{ stdenv, fetchurl, makeWrapper, cmake, qt4, pkgconfig, alsaLib, portaudio, jack2, libsndfile}:
+{ stdenv, fetchurl, makeWrapper, cmake, qt5, pkgconfig, alsaLib, portaudio, jack2
+, lame, libsndfile, libvorbis }:
 
 stdenv.mkDerivation rec {
-  name = "musescore-1.3";
+  name = "musescore-${version}";
+  version = "2.0.0";
 
   src = fetchurl {
-    url = "http://ftp.osuosl.org/pub/musescore/releases/MuseScore-1.3/mscore-1.3.tar.bz2";
-    sha256 = "a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683";
+    url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
+    sha256 = "1a4fz9pqwz59brfa7qn61364hyd07lsq3lflkzn1w2q21d7xd20w";
   };
 
-  buildInputs = [ makeWrapper cmake qt4 pkgconfig alsaLib portaudio jack2 libsndfile ];
+  buildInputs = [
+    makeWrapper cmake qt5 pkgconfig alsaLib portaudio jack2 lame libsndfile libvorbis
+  ];
 
-  configurePhase = ''
-    cd mscore;
-    mkdir build;
-    cd build;
-    cmake -DCMAKE_INSTALL_PREFIX=$out -DQT_PLUGINS_DIR=$out/lib/qt4/plugins -DCMAKE_BUILD_TYPE=Release ..'';
-
-  preBuild = ''make lrelease;'';
-
-  postInstall = ''
-    wrapProgram $out/bin/mscore --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins
+  patchPhase = ''
+    sed s,"/usr/local",$out, -i Makefile
   '';
 
+  preBuild = "make lrelease";
+
   meta = with stdenv.lib; {
     description = "Qt-based score editor";
     homepage = http://musescore.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.vandenoever ];
+    maintainers = [ maintainers.vandenoever ];
     repositories.git = https://github.com/musescore/MuseScore;
   };
 }
diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix
index d273c238177..d665b83340c 100644
--- a/pkgs/applications/audio/pamixer/default.nix
+++ b/pkgs/applications/audio/pamixer/default.nix
@@ -1,20 +1,16 @@
-{ stdenv, fetchgit, pulseaudio, boost }:
-
-let
-  tag = "1.1";
-in
+{ stdenv, fetchurl, boost, pulseaudio }:
 
 stdenv.mkDerivation rec {
 
-  name = "pamixer-${tag}";
+  name = "pamixer-${version}";
+  version = "1.2.1";
 
-  src = fetchgit {
-    url = git://github.com/cdemoulins/pamixer;
-    rev = "refs/tags/${tag}";
-    sha256 = "03r0sbfj85wp6yxa87pjg69ivmk0mxxa2nykr8gf2c607igmb034";
+  src = fetchurl {
+    url = "https://github.com/cdemoulins/pamixer/archive/${version}.tar.gz";
+    sha256 = "1ad6b46hh02hs1978pgihrm2bnq4z2v0imrfm3wy74xdkr6xjxy4";
   };
 
-  buildInputs = [ pulseaudio boost ];
+  buildInputs = [ boost pulseaudio ];
 
   installPhase = ''
     mkdir -p $out/bin
@@ -22,17 +18,19 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Like amixer but for pulseaudio";
-    longDescription = "Features:
-      - Get the current volume of the default sink, the default source or a selected one by his id
-      - Set the volume for the default sink, the default source or any other device
-      - List the sinks
-      - List the sources
-      - Increase / Decrease the volume for a device
-      - Mute or unmute a device";
+    description = "Pulseaudio command line mixer";
+    longDescription = ''
+      Features:
+        - Get the current volume of the default sink, the default source or a selected one by his id
+        - Set the volume for the default sink, the default source or any other device
+        - List the sinks
+        - List the sources
+        - Increase / Decrease the volume for a device
+        - Mute or unmute a device
+    '';
     homepage = https://github.com/cdemoulins/pamixer;
     license = licenses.gpl3;
+    maintainers = with maintainers; [ _1126 ];
     platforms = platforms.linux;
-    maintainers = [ maintainers._1126 ];
   };
 }
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
new file mode 100644
index 00000000000..bb863d2501c
--- /dev/null
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -0,0 +1,40 @@
+# Based on Richard Wallace's post here: http://comments.gmane.org/gmane.linux.distributions.nixos/14734
+
+{ fetchurl, stdenv, pythonPackages, gtk3, libnotify, gst_all_1 }:
+pythonPackages.buildPythonPackage rec {
+  name = "pithos-${version}";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "https://github.com/pithos/pithos/archive/${version}.tar.gz";
+    sha256 = "67b83927d5111067aefbf034d23880f96b1a2d300464e8491efa80e97e67f50f";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "/usr/share" "$out/share"
+  '';
+
+  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad libnotify ];
+
+  pythonPath = with pythonPackages; [ pygobject3 dbus pylast ];
+
+  propogatedBuildInputs = pythonPath;
+
+  postInstall = ''
+    wrapProgram "$out/bin/pithos" --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pandora player";
+
+    longDescription = ''
+      Pandora Internet Radio player for GNOME
+    '';
+
+    homepage = http://pithos.github.io/ ;
+
+    license = licenses.gpl3;
+
+    maintainers = with maintainers; [ obadz ];
+  };
+}
diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index 0622194d2c2..1a447be56b4 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -28,11 +28,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-0.8.2";
+  name = "qmmp-0.8.4";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "1vwjy3bv1gj6k5kqkhw2q7aspashw6x4lxccl28iydjfzk7d7cd4";
+    sha256 = "1ld69xypyak3lzwmfvzbxsyd4fl841aaq0gmkfa7jpavbdlggydf";
   };
 
   buildInputs =
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index a5d0e7e621e..a8ff526fad9 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation  rec {
   name = "qsynth-${version}";
-  version = "0.3.8";
+  version = "0.3.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/qsynth/${name}.tar.gz";
-    sha256 = "0wmq61cq93x2l00xwr871373mj3dwamz1dg6v62x7s8m1612ndrw";
+    sha256 = "08kyn6cl755l9i1grzjx8yi3f8mgiz4gx0hgqad1n0d8yz85087b";
   };
 
   buildInputs = [ alsaLib fluidsynth jack2 qt4 ];
diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix
index 0ae0c1ef3c8..763501a7465 100644
--- a/pkgs/applications/audio/qtractor/default.nix
+++ b/pkgs/applications/audio/qtractor/default.nix
@@ -1,20 +1,22 @@
 { alsaLib, autoconf, automake, dssi, fetchurl, gtk, jack2
 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile
-, libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }:
+, libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd
+, sord, sratom, stdenv, suil }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.5";
+  version = "0.6.6";
   name = "qtractor-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qtractor/${name}.tar.gz";
-    sha256 = "0znhm0p9azknmhga6m0qp01qaiahlnfzxya1jf9r05jn9hx5lzf0";
+    sha256 = "1n70hs4bx4hq3cp2p35jq5vlcans4fk2c35w72244vlqlajx05c0";
   };
 
   buildInputs =
     [ alsaLib autoconf automake dssi gtk jack2 ladspaH
       ladspaPlugins liblo libmad libsamplerate libsndfile libtool
-      libvorbis pkgconfig qt4 rubberband
+      libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom
+      suil
     ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 28473ca365b..10f0a4cec41 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/applications/audio/samplv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "samplv1-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "0fbkdb2dqw7v6n8j1h6pjz2019ylli9rmz8awywv2ycm8blr5pf0";
+    sha256 = "18jh953a0480fnsflbm4j04xz02h7fqwk77v8hnv54vwwp5a1h08";
   };
 
   buildInputs = [ jack2 libsndfile lv2 qt4 ];
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 83ce2fd66fa..37fc45983d9 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/applications/audio/synthv1/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "synthv1-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "07570mi7rjwkkvfzdw1jcbhpkpxpjp69xj7wfzng92rk2gz7yi8m";
+    sha256 = "0v9zpa49cdj8ixpppgxz95dbn62v8mamxz6fpl7sdnzfn2l8jr4g";
   };
 
   buildInputs = [ qt4 jack2 lv2 ];
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 60e66b9f591..6e03bcb27fc 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -15,11 +15,11 @@ let
   quazipQt4 = quazip.override { qt = qt4; };
 in stdenv.mkDerivation rec {
   name = "tomahawk-${version}";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchurl {
     url = "http://download.tomahawk-player.org/${name}.tar.bz2";
-    sha256 = "1bmkkpqhflpm42sn6zf7hxv3936h3p0kdiqzmj88jm7qfgw2wbaj";
+    sha256 = "0kjzkq21g3jl1lvadsm7gf0zvpbsv208kqf76wg2hnbm4k1a02wj";
   };
 
   cmakeFlags = [
diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix
index 279820a723f..b7b0fba2d54 100644
--- a/pkgs/applications/audio/vkeybd/default.nix
+++ b/pkgs/applications/audio/vkeybd/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation  rec {
     sed -e "s@/usr/local@$out@" -i Makefile
   '';
 
-  makeFlags = [ "TKLIB=-ltk8.5" "TCLLIB=-ltcl8.5" ];
+  makeFlags = [ "TKLIB=-l${tk.libPrefix}" "TCLLIB=-l${tcl.libPrefix}" ];
 
   postInstall = ''
     wrapProgram $out/bin/vkeybd --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}"
diff --git a/pkgs/applications/audio/xmp/default.nix b/pkgs/applications/audio/xmp/default.nix
index 7f21d389cf5..6bec03bd71b 100644
--- a/pkgs/applications/audio/xmp/default.nix
+++ b/pkgs/applications/audio/xmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libxmp }:
 
 stdenv.mkDerivation rec {
-  name = "xmp-4.0.7";
+  name = "xmp-4.0.10";
 
   meta = with stdenv.lib; {
     description = "Extended module player";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/xmp/${name}.tar.gz";
-    sha256 = "0qgzzaxhshz5l7s21x89xb43pbbi0zap6a4lk4s7gjp1qca2agcw";
+    sha256 = "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n";
   };
 
   buildInputs = [ pkgconfig alsaLib libxmp ];
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 5277bf6f68c..5164c80695b 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "0f37xjkay3800fbx0iwjca005b1hrjbhszrzn0xg662vf8mj44nv";
+    sha256 = "0vfk90jwn3r21703yizrfc4bmiz70fh8kd8w892s14d3k0kvhcwv";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 41be00bdb63..8964d6c6480 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -98,6 +98,22 @@ in {
         };
   };
 
+  eclipse_scala_sdk_40 = buildEclipse {
+    name = "eclipse-scala_sdk-4.0.0";
+    description = "Eclipse IDE for Scala Developers";
+    src =
+      if stdenv.system == "x86_64-linux" then
+        fetchurl { # tested
+          url = http://downloads.typesafe.com/scalaide-pack/4.0.0.vfinal-luna-211-20150305/scala-SDK-4.0.0-vfinal-2.11-linux.gtk.x86_64.tar.gz;
+          sha256  = "b65c5e8160e72c8389537e9e427138e6daa2065f9df3a943a86e40dd1543dd83";
+        }
+      else
+        fetchurl { # untested
+          url = http://downloads.typesafe.com/scalaide-pack/4.0.0.vfinal-luna-211-20150305/scala-SDK-4.0.0-vfinal-2.11-linux.gtk.x86.tar.gz;
+          sha256 = "f422aea5903c97d212264a5a43c6ebc638aecbd4ce5e6078d92618725bc5d31e";
+        };
+  };
+
   eclipse_cpp_36 = buildEclipse {
     name = "eclipse-cpp-3.6.2";
     description = "Eclipse IDE for C/C++ Developers";
diff --git a/pkgs/applications/editors/emacs-24/darwin-new-sections.patch b/pkgs/applications/editors/emacs-24/darwin-new-sections.patch
deleted file mode 100644
index dfd72fe3f51..00000000000
--- a/pkgs/applications/editors/emacs-24/darwin-new-sections.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-http://bazaar.launchpad.net/~naesten/emacs/nextstep-stuff/revision/108961
-
-diff -ru emacs-24.3-orig/src/unexmacosx.c emacs-24.3/src/unexmacosx.c
---- emacs-24.3-orig/src/unexmacosx.c	2013-01-01 21:37:17.000000000 +0100
-+++ emacs-24.3/src/unexmacosx.c	2014-08-09 18:39:52.000000000 +0200
-@@ -838,7 +838,7 @@
- 	  if (!(sectp->addr <= (unsigned long)my_edata
- 		&& my_size <= sectp->size))
- 	    unexec_error ("my_edata is not in section %s", SECT_DATA);
--	  if (!unexec_write (sectp->offset, (void *) sectp->addr, my_size))
-+          if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size))
- 	    unexec_error ("cannot write section %s", SECT_DATA);
- 	  if (!unexec_copy (sectp->offset + my_size, old_file_offset + my_size,
- 			    sectp->size - my_size))
-@@ -880,6 +880,27 @@
- 	  if (!unexec_write (header_offset, sectp, sizeof (struct section)))
- 	    unexec_error ("cannot write section %.16s's header", sectp->sectname);
- 	}
-+      else if (strncmp (sectp->sectname, "__bss", 5) == 0
-+	       || strncmp (sectp->sectname, "__pu_bss", 8) == 0)
-+	{
-+	  sectp->flags = S_REGULAR;
-+	  
-+	  /* These sections are produced by GCC 4.6+.
-+
-+	     FIXME: We possibly ought to clear uninitialized local
-+	     variables in statically linked libraries like for
-+	     SECT_BSS (__bss) above, but setting up the markers we
-+	     need in lastfile.c would be rather messy.  See
-+	     darwin_output_aligned_bss () in gcc/config/darwin.c for
-+	     the root of the problem, keeping in mind that the
-+	     sections are numbered by their alignment in GCC 4.6, but
-+	     by log2(alignment) in GCC 4.7.  */
-+
-+	  if (!unexec_write (sectp->offset, (void *) sectp->addr, sectp->size))
-+	    unexec_error ("cannot copy section %.16s", sectp->sectname);
-+	  if (!unexec_write (header_offset, sectp, sizeof (struct section)))
-+	    unexec_error ("cannot write section %.16s's header", sectp->sectname);
-+	}
-       else if (strncmp (sectp->sectname, "__la_symbol_ptr", 16) == 0
- 	       || strncmp (sectp->sectname, "__nl_symbol_ptr", 16) == 0
- 	       || strncmp (sectp->sectname, "__got", 16) == 0
-@@ -891,6 +912,7 @@
- 	       || strncmp (sectp->sectname, "__program_vars", 16) == 0
- 	       || strncmp (sectp->sectname, "__mod_init_func", 16) == 0
- 	       || strncmp (sectp->sectname, "__mod_term_func", 16) == 0
-+	       || strncmp (sectp->sectname, "__static_data", 16) == 0
- 	       || strncmp (sectp->sectname, "__objc_", 7) == 0)
- 	{
- 	  if (!unexec_copy (sectp->offset, old_file_offset, sectp->size))
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 83774206b5c..01895647a6b 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -2,24 +2,36 @@
 , pkgconfig, gtk, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
 , alsaLib, cairo
-, withX ? !stdenv.isDarwin, withGTK ? true
+, withX ? !stdenv.isDarwin
+, withGTK3 ? false, gtk3 ? null
+, withGTK2 ? true, gtk2
 }:
 
 assert (libXft != null) -> libpng != null;	# probably a bug
 assert stdenv.isDarwin -> libXaw != null;	# fails to link otherwise
+assert withGTK2 -> withX || stdenv.isDarwin;
+assert withGTK3 -> withX || stdenv.isDarwin;
+assert withGTK2 -> !withGTK3 && gtk2 != null;
+assert withGTK3 -> !withGTK2 && gtk3 != null;
+
+let
+  toolkit =
+    if withGTK3 then "gtk3"
+    else if withGTK2 then "gtk2"
+    else "lucid";
+in
 
 stdenv.mkDerivation rec {
-  name = "emacs-24.4";
+  name = "emacs-24.5";
 
   builder = ./builder.sh;
 
   src = fetchurl {
     url    = "mirror://gnu/emacs/${name}.tar.xz";
-    sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7";
+    sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx";
   };
 
   patches = stdenv.lib.optionals stdenv.isDarwin [
-    ./darwin-new-sections.patch
     ./at-fdcwd.patch
   ];
 
@@ -28,17 +40,16 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isLinux dbus
     ++ stdenv.lib.optionals withX
       [ x11 libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
-        imagemagick gtk gconf ]
+        imagemagick gconf ]
+    ++ stdenv.lib.optional (withX && withGTK2) [ gtk2 ]
+    ++ stdenv.lib.optional (withX && withGTK3) [ gtk3 ]
     ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
 
   configureFlags =
-    ( if withX && withGTK then
-        [ "--with-x-toolkit=gtk" "--with-xft"]
-      else (if withX then
-        [ "--with-x-toolkit=lucid" "--with-xft" ]
-      else
-        [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
-          "--with-gif=no" "--with-tiff=no" ] ) );
+    if withX
+      then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
+      else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
+             "--with-gif=no" "--with-tiff=no" ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX)
     "-I${cairo}/include/cairo";
diff --git a/pkgs/applications/editors/emacs-24/macport-24.3.nix b/pkgs/applications/editors/emacs-24/macport-24.3.nix
index d9b32351040..191969eef5b 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.3.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.3.nix
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
     sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx";
   };
 
-  patches = [ ./darwin-new-sections.patch ];
-
   buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
 
   postUnpack = ''
diff --git a/pkgs/applications/editors/emacs-24/macport-24.4.nix b/pkgs/applications/editors/emacs-24/macport-24.4.nix
index 802faf44c64..b79ac6150ed 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.4.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.4.nix
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
     sha256 = "0qzzqnql0z0a2p3ciccy8gq79v0s7s717lchcprn3wlaqcrk2g1p";
   };
 
-  patches = [ ./darwin-new-sections.patch ];
-
   buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
 
   postUnpack = ''
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
new file mode 100644
index 00000000000..db0d05584e1
--- /dev/null
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -0,0 +1,101 @@
+{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
+}:
+
+stdenv.mkDerivation rec {
+  emacsName = "emacs-24.5";
+  name = "${emacsName}-mac-5.7";
+
+  #builder = ./builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
+    sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx";
+  };
+
+  macportSrc = fetchurl {
+    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
+    sha256 = "1a86l3556h24x9ml6r8n6xbrxymb9gr38sicny3f0m281myhlsvv";
+  };
+
+  buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
+
+  postUnpack = ''
+    mv $emacsName $name
+    tar xzf $macportSrc
+    mv $name $emacsName
+  '';
+
+  preConfigure = ''
+    substituteInPlace Makefile.in --replace "/bin/pwd" "pwd"
+    substituteInPlace lib-src/Makefile.in --replace "/bin/pwd" "pwd"
+
+    patch -p1 < patch-mac
+
+    # The search for 'tputs' will fail because it's in ncursesw within the
+    # ncurses package, yet Emacs' configure script only looks in ncurses.
+    # Further, we need to make sure that the -L option occurs before mention
+    # of the library, so that it finds it within the Nix store.
+    sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
+    ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
+    sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
+    sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
+
+    configureFlagsArray=(
+      LDFLAGS=-L${ncurses}/lib
+      --with-xml2=yes
+      --with-gnutls=yes
+      --with-mac
+      --enable-mac-app=$out/Applications
+    )
+    makeFlagsArray=(
+      CFLAGS=-O3
+      LDFLAGS="-O3 -L${ncurses}/lib"
+    );
+  '';
+
+  postInstall = ''
+    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
+    ;; nixos specific load-path
+    (when (getenv "NIX_PROFILES") (setq load-path
+                          (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
+                             (split-string (getenv "NIX_PROFILES"))))
+                    load-path)))
+
+    ;; make tramp work for NixOS machines
+    (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
+    EOF
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "GNU Emacs 24, the extensible, customizable text editor";
+    homepage    = http://www.gnu.org/software/emacs/;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jwiegley ];
+    platforms   = platforms.darwin;
+
+    longDescription = ''
+      GNU Emacs is an extensible, customizable text editor—and more.  At its
+      core is an interpreter for Emacs Lisp, a dialect of the Lisp
+      programming language with extensions to support text editing.
+
+      The features of GNU Emacs include: content-sensitive editing modes,
+      including syntax coloring, for a wide variety of file types including
+      plain text, source code, and HTML; complete built-in documentation,
+      including a tutorial for new users; full Unicode support for nearly all
+      human languages and their scripts; highly customizable, using Emacs
+      Lisp code or a graphical interface; a large number of extensions that
+      add other functionality, including a project planner, mail and news
+      reader, debugger interface, calendar, and more.  Many of these
+      extensions are distributed with GNU Emacs; others are available
+      separately.
+
+      This is "Mac port" addition to GNU Emacs 24. This provides a native
+      GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later
+      already contain the official GUI support via the NS (Cocoa) port for
+      Mac OS X 10.4 and later. So if it is good enough for you, then you
+      don't need to try this.
+    '';
+  };
+}
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
index 90c32f0e2bc..7d987e73b91 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
     install -d "$out/bin"
     install bin/cask "$out/bin"
 
+    # We also need to install cask's templates in order for 'cask
+    # init' to work properly.
+    install -d "$out/templates"
+    install templates/* "$out/templates"
+
     # In order to work with cask's hard coded file paths (during bootstrap),
     # we have to create these links.
     ln -s "$out/share/emacs/site-lisp/"* "$out"
diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix
index 820e959a357..1a145e1b648 100644
--- a/pkgs/applications/editors/emacs-modes/icicles/default.nix
+++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.emacswiki.org/emacs/Icicles";
-    description = "Enhance Emacs minibuffer input with cycling and powerful completion.";
+    description = "Enhance Emacs minibuffer input with cycling and powerful completion";
     license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = with stdenv.lib.maintainers; [ simons ];
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 0d6851a79e8..b99265cf0dd 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -63,9 +63,11 @@ let
       item=${desktopItem}
 
       makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
-        --prefix PATH : "$out/libexec/${name},${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
-        --prefix JDK_HOME : "$jdk" \
-        --prefix ${hiName}_JDK : "$jdk"
+        --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
+        --set JDK_HOME "$jdk" \
+        --set ${hiName}_JDK "$jdk" \
+        --set ANDROID_JAVA_HOME "$jdk" \
+        --set JAVA_HOME "$jdk"
 
       ln -s "$item/share/applications" $out/share
     '';
@@ -210,50 +212,50 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.1.0";
-    build = "135.1740770";
+    version = "1.2.0.8";
+    build = "141.1845774";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "1r2hrld3yfaxq3mw2xmzhvrrhc7w5xlv3d18rv758hy9n40c2nr1";
+      sha256 = "1l201qv1aya1l9jrybgqclv2v2fgzdpcb6qsnxszcq3npplisw9h";
     };
   };
 
   clion = buildClion rec {
-    name = "clion-${build}";
-    version = "eap";
-    build = "141.102.4";
-    description  = "C/C++ IDE. New. Intelligent. Cross-platform.";
+    name = "clion-${version}";
+    version = "1.0";
+    build = "141.353";
+    description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
-      sha256 = "0qjm8wxqn171wfd7yqf5ys1g4mwl0iyhlbry29jkgkikxp7h9dym";
+      sha256 = "0xjdx13ljp1vy51a7rsj25wg3bsvry4kxq5cdng8zrc1g2y1fqw5";
     };
   };
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "14.1";
-    build = "IC-141.177.4";
+    version = "14.1.2";
+    build = "IC-141.713.2";
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "05irkxhmx6pisvghjalw8hcf9v3n4wn0n0zc92ahivzxlicylpr6";
+      sha256 = "1skxbax7gsxxf7519qasxwp9q0v9ff755ibqr1w47dv2al47kjzq";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "14.1";
-    build = "IU-141.177.4";
+    version = "14.1.2";
+    build = "IU-141.713.2";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "10zv3m44ci7gl7163yp4wxnjy7c0g5zl34c2ibnx4c6ds6l4di2p";
+      sha256 = "1ddy0f83rs3yx3w8v49cmlhkc8qxapdh702g26gzlapbpvfw58ay";
     };
   };
 
@@ -271,25 +273,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "4.0.5";
-    build = "139.1547";
+    version = "4.0.6";
+    build = "139.1659";
     description = "PyCharm 4.0 Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "16na04sp9q7z10kjx8wpf9k9bv9vgv7rmd9jnrn72nhwd7bp0n1i";
+      sha256 = "16lf2slssfgbds6zyp2rs0ssrg8aw5d2w7b755iqimiyfhyyv83s";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "4.0.5";
-    build = "139.1547";
+    version = "4.0.6";
+    build = "139.1659";
     description = "PyCharm 4.0 Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "17cxznv7q47isym6l7kbp3jdzdgj02jayygy42x4bwjmg579v1gg";
+      sha256 = "0wavw41nzqnx75y3k3l5kq09i5d9j8hb4r6a0y3nxzqvmdfza55r";
     };
   };
 
diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index e7b96bd4b7d..11137d1a962 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -11,10 +11,10 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.4.0";
+  version = "2.4.1";
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.gz";
-    sha256 = "1gbm9bcv4k55y01r5q8a8a9s3yrrgq3z5jxxiij3wl404r8gnxjh";
+    sha256 = "1li99ycnva40hiavm9lf34gjny74mj469x6ismrfm6wv3dgfn33a";
   };
   buildInputs = [ ncurses ] ++ optional enableNls gettext;
   configureFlags = ''
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
new file mode 100644
index 00000000000..a4dc3fe367a
--- /dev/null
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -0,0 +1,36 @@
+# Note: this relies on dyre patched for NIX_GHC which is done in
+# haskell-ng only.
+#
+# To use this for hacking of your Yi config file, drop into a shell
+# with env attribute.
+{ stdenv, makeWrapper
+, haskellPackages
+, extraPackages ? (s: [])
+}:
+let
+  yiEnv = haskellPackages.ghcWithPackages
+    (self: [ self.yi ] ++ extraPackages self);
+in
+stdenv.mkDerivation {
+  name = "yi-custom";
+  version = "0.0.0.1";
+  unpackPhase = "true";
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    makeWrapper ${haskellPackages.yi}/bin/yi $out/bin/yi \
+      --set NIX_GHC ${yiEnv}/bin/ghc
+  '';
+
+  # For hacking purposes
+  env = yiEnv;
+
+  meta = with stdenv.lib; {
+    description = "Allows Yi to find libraries and the compiler easily";
+    # This wrapper and wrapper only is under PD
+    license = licenses.publicDomain;
+    maintainers = with maintainers; [ fuuzetsu ];
+  };
+
+}
diff --git a/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE b/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE
deleted file mode 100644
index cf1ab25da03..00000000000
--- a/pkgs/applications/editors/yi/yi-custom-cabal/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org>
diff --git a/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal b/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal
deleted file mode 100644
index d9ffbb8e481..00000000000
--- a/pkgs/applications/editors/yi/yi-custom-cabal/yi-custom.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
-name:           yi-custom
-version:        0.0.0.1
-category:       Yi
-synopsis:       Convenience wrapper for nix
-description:    Convenience wrapper for nix
-license:        PublicDomain
-license-file:   LICENSE
-author:         Mateusz Kowalczyk
-maintainer:     fuuzetsu@fuuzetsu.co.uk
-Cabal-Version:  >= 1.10
-build-type:     Simple
-
-library
-  hs-source-dirs: .
-  default-language: Haskell2010
-  build-depends: base, yi
-  ghc-options: -threaded
diff --git a/pkgs/applications/editors/yi/yi-custom.nix b/pkgs/applications/editors/yi/yi-custom.nix
deleted file mode 100644
index 3dbd4611998..00000000000
--- a/pkgs/applications/editors/yi/yi-custom.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-# This is a manually-written expression over an in-tree cabal file.
-# It's awkward but this way allows the package user to pass in
-# extraPackages without much extra hassle on their end, similarly how
-# the XMonad service handles it: the difference is that we don't have
-# anything like XMONAD_GHC…
-#
-# The idea is that the user changes their configs using any libraries
-# he likes and then builds it using this expression. Once that's done,
-# ‘reload’ and similar functions should all work as long as the user
-# doesn't need new libraries at which point they should add them to
-# extraPackages and rebuild from the expression.
-{ cabal, yi, extraPackages, makeWrapper, ghcWithPackages }:
-let
-  w = ghcWithPackages (self: [ yi ] ++ extraPackages self);
-  wrappedGhc = w.override { ignoreCollisions = true; };
-in
-cabal.mkDerivation (self: rec {
-  pname = "yi-custom";
-  version = "0.0.0.1";
-  src = ./yi-custom-cabal;
-  isLibrary = true;
-  buildDepends = [ yi ];
-  buildTools = [ makeWrapper ];
-  noHaddock = true;
-  doCheck = false;
-
-  postInstall = ''
-    makeWrapper ${yi}/bin/yi $out/bin/yi \
-      --set NIX_GHC ${wrappedGhc}/bin/ghc \
-      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${self.ghc.version}
-  '';
-  meta = {
-    homepage = "http://haskell.org/haskellwiki/Yi";
-    description = "Wrapper over user-specified Haskell libraries for use in Yi config";
-    license = self.stdenv.lib.licenses.publicDomain;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
-  };
-
-})
\ No newline at end of file
diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix
index a63375adfd1..f9ef27d999d 100644
--- a/pkgs/applications/editors/yi/yi.nix
+++ b/pkgs/applications/editors/yi/yi.nix
@@ -30,7 +30,7 @@ cabal.mkDerivation (self: {
   configureFlags = "-fpango -fvty";
   noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.8";
   meta = {
-    homepage = "http://haskell.org/haskellwiki/Yi";
+    homepage = http://haskell.org/haskellwiki/Yi;
     description = "The Haskell-Scriptable Editor";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 8e36ec9b168..f3141a30bf1 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -2,7 +2,7 @@
   pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.6.1";
+  name = "qgis-2.8.1";
 
   buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "1avw9mnhrcxsdalqr2yhyif1cacl4dsgcpfc31axkv7vj401djnl";
+    sha256 = "19acb74e4e2739238b87bf64f2750e10e366e9d61d070a4b8ca341ce01ca9741";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index c2f963f001b..af499c51f97 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, cmake, python, libX11, qt4 }:
+{ stdenv, fetchFromGitHub, cmake, python, libX11, qt4 }:
 
+let version = "6.1"; in
 stdenv.mkDerivation {
-  name = "apitrace-09519af205";
+  name = "apitrace-${version}";
 
-  src = fetchgit {
-    url = git://github.com/apitrace/apitrace.git;
-    rev = "09519af2056879ce0ea59f7085ac4b282c7d01d0";
-    sha256 = "1ka34fhl85k90r7kvp89awlqb6prkbqx0kg1whb3535rnvficxdv";
+  src = fetchFromGitHub {
+    sha256 = "1v38111ljd35v5sahshs3inhk6nsv7rxh4r0ck8k0njkwzlx2yqk";
+    rev = version;
+    repo = "apitrace";
+    owner = "apitrace";
   };
 
   buildInputs = [ cmake python libX11 qt4 ];
@@ -18,7 +20,9 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = https://apitrace.github.io;
-    description = "A set of tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
+    description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
+    license = with licenses; mit;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 8aefbb9429c..0589de8726a 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -9,12 +9,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.6.3";
+  version = "1.6.4";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "13gj5z9dz1847wlbn2cqpkvr64ds8yrn5hacs5wvbqmh0z9v6aw5";
+    sha256 = "0ald6qqg7abgr8hj2qk45260cqh3fddzqbxc1p7ll0ac2vl0bxy5";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/digikam/2.nix b/pkgs/applications/graphics/digikam/2.nix
index c239827633f..e2ca03fe044 100644
--- a/pkgs/applications/graphics/digikam/2.nix
+++ b/pkgs/applications/graphics/digikam/2.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon, qimageblitz, qca2, eigen,
 lcms, jasper, libgphoto2, kdepimlibs, gettext, soprano, libjpeg, libtiff,
 liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost,
-shared_desktop_ontologies, marble, mysql }:
+shared_desktop_ontologies, marble, libmysql }:
 
 stdenv.mkDerivation rec {
   name = "digikam-2.9.0";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qt4 kdelibs phonon qimageblitz qca2 eigen lcms libjpeg libtiff
     jasper libgphoto2 kdepimlibs gettext soprano liblqr1 lensfun qjson libkdcraw
-    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble mysql.lib ];
+    opencv libkexiv2 libkipi boost shared_desktop_ontologies marble libmysql ];
 
   # Make digikam find some FindXXXX.cmake
   KDEDIRS="${marble}:${qjson}";
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 5b6d745f0e9..ad636772237 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,11 +2,11 @@
 , libXinerama, curl, libexif }:
 
 stdenv.mkDerivation rec {
-  name = "feh-2.12";
+  name = "feh-2.12.1";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "0ckhidmsms2l5jycp0qf71jzmb3bpbhjq3bcgfpvfvszah7pmq30";
+    sha256 = "18b6yjk88ybqxsa5knk6qwi2xy7fclbzl5cpzwg0wmkr3phfq9lh";
   };
 
   buildInputs = [ makeWrapper x11 imlib2 libjpeg libpng libXinerama curl libexif ];
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 1e51aa136fe..fc1b5795d40 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, xulrunner }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.9";
+  version = "2.0.10";
   name = "pencil-${version}";
 
   src = fetchurl {
     url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
-    sha256 = "a109d28a695919d2da979de6a6d0baeb4e2820ff795aecd75ba08322f21ed3ee";
+    sha256 = "b5dcb12986108bf3eb13cdd1ee1fc1f8d1a88c7fadf2a5c44e7a59a254f2b0dd";
   };
 
   buildPhase = "";
diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix
new file mode 100644
index 00000000000..3ccbf7a404d
--- /dev/null
+++ b/pkgs/applications/graphics/screencloud/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, fetchFromGitHub, cmake, qt4, quazip, qt-mobility, qxt, python, pycrypto, glib }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "screencloud-${version}";
+  version = "1.2.0";
+
+  # API Keys. According to the author of the AUR package, these are only used
+  # for tracking usage.
+  consumerKey = "23e747012c68601f27ab69c6de129ed70552d55b6";
+  consumerSecret = "4701cb00c1bd357bbcae7c3d713dd216";
+  
+  src = fetchFromGitHub {
+    owner = "olav-st";
+    repo = "screencloud";
+    rev = "v${version}";
+    sha256 = "1s0dxa1sa37nvna5nfqdsp294810favj68qb7ghl78qna7zw0cim";
+  };
+
+  buildInputs = [ cmake qt4 quazip qt-mobility qxt python pycrypto ];
+
+  patchPhase = ''
+    # Required to make the configure script work. Normally, screencloud's
+    # CMakeLists file sets the install prefix to /opt by force. This is stupid
+    # and breaks nix, so we force it to install where we want. Please don't
+    # write CMakeLists files like this, as things like this are why we can't
+    # have nice things.
+    substituteInPlace "CMakeLists.txt" --replace "set(CMAKE_INSTALL_PREFIX \"/opt\")" ""
+  '';
+
+  enableParallelBuilding = true;
+
+  # We need to append /opt to our CMAKE_INSTALL_PREFIX, so we tell the Nix not
+  # to add the argument for us.
+  dontAddPrefix = true;
+
+  cmakeFlags = [
+    "-DQXT_QXTCORE_INCLUDE_DIR=${qxt}/include/QxtCore"
+    "-DQXT_QXTCORE_LIB_RELEASE=${qxt}/lib/libQxtCore.so"
+    "-DQXT_QXTGUI_INCLUDE_DIR=${qxt}/include/QxtGui"
+    "-DQXT_QXTGUI_LIB_RELEASE=${qxt}/lib/libQxtGui.so"
+    "-DCONSUMER_KEY_SCREENCLOUD=${consumerKey}"
+    "-DCONSUMER_SECRET_SCREENCLOUD=${consumerSecret}"
+  ];
+
+  sourceRoot = "screencloud-v${version}-src/screencloud";
+
+  preConfigure = ''
+    # This needs to be set in preConfigure instead of cmakeFlags in order to
+    # access the $prefix environment variable.
+    export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/opt $cmakeFlags"
+  '';
+
+  # There are a number of issues with screencloud's installation. We need to add
+  # pycrypto to the PYTHONPATH so that the SFTP plugin will work properly; and
+  # we need to move the libPythonQt library into a folder where it can actually
+  # be found.
+  postInstall = ''
+    patchShebangs $prefix/opt/screencloud/screencloud.sh
+    substituteInPlace "$prefix/opt/screencloud/screencloud.sh" --replace "/opt" "$prefix/opt"
+    sed -i "2 i\export PYTHONPATH=$(toPythonPath ${pycrypto}):\$PYTHONPATH" "$prefix/opt/screencloud/screencloud.sh"
+    mkdir $prefix/bin
+    mkdir $prefix/lib
+    ln -s $prefix/opt/screencloud/screencloud.sh $prefix/bin/screencloud
+    ln -s $prefix/opt/screencloud/libPythonQt.so $prefix/lib/libPythonQt.so
+  '';
+
+  meta = {
+    homepage = https://screencloud.net/;
+    description = "Client for Screencloud, an easy to use screenshot sharing tool";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ forkk ];
+  };
+}
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index 162a6748c06..f614eb0a1b5 100644
--- a/pkgs/applications/graphics/xournal/default.nix
+++ b/pkgs/applications/graphics/xournal/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     homepage = http://xournal.sourceforge.net/;
     description = "note-taking application (supposes stylus)";
     maintainers = [ stdenv.lib.maintainers.guibert ];
+    license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix
deleted file mode 100644
index c664c248171..00000000000
--- a/pkgs/applications/kde-apps-14.12/default.nix
+++ /dev/null
@@ -1,324 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, debug ? false }:
-
-with stdenv.lib; with autonix;
-
-let kf5Orig = kf5; in
-
-let
-
-  kf5 = kf5Orig.override { inherit debug qt5; };
-
-  mirror = "mirror://kde";
-
-  renames =
-    (builtins.removeAttrs
-      (import ./renames.nix {})
-      ["Backend" "CTest"])
-    // {
-      "KDE4" = "kdelibs";
-      "Kexiv2" = "libkexiv2";
-      "Kdcraw" = "libkdcraw";
-      "Kipi" = "libkipi";
-      "LibKMahjongg" = "libkmahjongg";
-      "LibKonq" = "kde-baseapps";
-    };
-
-  mkDerivation = drv: kf5.mkDerivation (drv // {
-    preHook = (drv.preHook or "") + ''
-      addQt4Plugins() {
-        if [[ -d "$1/lib/qt4/plugins" ]]; then
-            propagatedUserEnvPkgs+=" $1"
-        fi
-
-        if [[ -d "$1/lib/kde4/plugins" ]]; then
-            propagatedUserEnvPkgs+=" $1"
-        fi
-      }
-
-      envHooks+=(addQt4Plugins)
-    '';
-  });
-
-  scope =
-    # packages in this collection
-    (mapAttrs (dep: name: kdeApps."${name}") renames) //
-    # packages from KDE Frameworks 5
-    kf5.scope //
-    # packages from nixpkgs
-    (with pkgs;
-      {
-        ACL = acl;
-        Akonadi = kde4.akonadi;
-        Alsa = alsaLib;
-        Automoc4 = automoc4;
-        Avahi = avahi;
-        BISON = bison;
-        Baloo = kde4.baloo;
-        Boost = boost156;
-        Canberra = libcanberra;
-        Cdparanoia = cdparanoia;
-        CUPS = cups;
-        DBusMenuQt = libdbusmenu_qt;
-        DjVuLibre = djvulibre;
-        ENCHANT = enchant;
-        EPub = ebook_tools;
-        Eigen2 = eigen2;
-        Eigen3 = eigen;
-        Exiv2 = exiv2;
-        FAM = fam;
-        FFmpeg = ffmpeg;
-        Flac = flac;
-        FLEX = flex;
-        Freetype = freetype;
-        GMP = gmp;
-        Gettext = gettext;
-        Gpgme = gpgme;
-        Gphoto2 = libgphoto2;
-        Grantlee = grantlee;
-        GSL = gsl;
-        HUNSPELL = hunspell;
-        HUpnp = herqq;
-        Jasper = jasper;
-        KActivities = kde4.kactivities;
-        LCMS2 = lcms2;
-        Ldap = openldap;
-        LibAttica = attica;
-        LibGcrypt = libgcrypt;
-        LibSSH = libssh;
-        LibSpectre = libspectre;
-        LibVNCServer = libvncserver;
-        Libical = libical;
-        MusicBrainz3 = libmusicbrainz;
-        NetworkManager = networkmanager;
-        OggVorbis = libvorbis;
-        OpenAL = openal;
-        OpenEXR = openexr;
-        Poppler = poppler_qt4;
-        Prison = prison;
-        PulseAudio = pulseaudio;
-        PythonLibrary = python;
-        Qalculate = libqalculate;
-        QCA2 = qca2;
-        QImageBlitz = qimageblitz;
-        QJSON = qjson;
-        Qt4 = qt4;
-        Samba = samba;
-        Sasl2 = cyrus_sasl;
-        SharedDesktopOntologies = shared_desktop_ontologies;
-        SndFile = libsndfile;
-        Speechd = speechd;
-        TIFF = libtiff;
-        Taglib = taglib;
-        TelepathyQt4 = telepathy_qt;
-        TunePimp = libtunepimp;
-        UDev = udev;
-        USB = libusb;
-        Xscreensaver = xscreensaver;
-        Xsltproc = libxslt;
-      }
-    );
-
-  qt5Only = tgt:
-    let qt4Deps = [ "KDE4" "Phonon" ];
-    in mapAttrs (name: if name == tgt then removePkgDeps qt4Deps else id);
-
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (qt5Only "kmix")
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-        (blacklist ["artikulate"]) # build failure, wrong boost?
-        (blacklist ["kde-dev-scripts" "kde-dev-utils"]) # docbook errors
-        (blacklist ["kdewebdev"]) # unknown build failure
-      ];
-
-  l10nPkgQt4 = orig:
-    let drvName = builtins.parseDrvName orig.name; in
-    mkDerivation {
-      name = "${drvName.name}-qt4-${drvName.version}";
-      inherit (orig) src;
-      buildInputs = [ kdeApps.kdelibs ];
-      nativeBuildInputs = with pkgs; [ cmake gettext perl ];
-      preConfigure = ''
-        cd 4/
-      '';
-    };
-
-  l10nPkgQt5 = orig:
-    let drvName = builtins.parseDrvName orig.name; in
-    mkDerivation {
-      name = "${drvName.name}-qt5-${drvName.version}";
-      inherit (orig) src;
-      buildInputs = with kf5; [ kdoctools ki18n ];
-      nativeBuildInputs = with pkgs; [ cmake kf5.extra-cmake-modules gettext perl ];
-      preConfigure = ''
-        cd 5/
-      '';
-    };
-
-  l10nPkg = name: orig: symlinkJoin orig.name [(l10nPkgQt4 orig) (l10nPkgQt5 orig)];
-
-  removeL10nPkgs = filterAttrs (n: v: !(hasPrefix "kde-l10n") n);
-
-  postResolve = super:
-    (removeL10nPkgs super) // {
-
-      ark = with pkgs; super.ark // {
-        buildInputs = (super.ark.buildInputs or []) ++ [ makeWrapper ];
-        postInstall = ''
-          wrapProgram $out/bin/ark --prefix PATH : "${unzipNLS}/bin"
-        '';
-      };
-
-      ffmpegthumbs = with pkgs; super.ffmpegthumbs // {
-        nativeBuildInputs = super.ffmpegthumbs.nativeBuildInputs ++ [pkgconfig];
-      };
-
-      kalzium = with pkgs; super.kalzium // {
-        nativeBuildInputs = super.kalzium.nativeBuildInputs ++ [pkgconfig];
-      };
-
-      kde-runtime = with pkgs; super.kde-runtime // {
-        buildInputs =
-          super.kde-runtime.buildInputs ++ [libcanberra];
-        nativeBuildInputs =
-          super.kde-runtime.nativeBuildInputs ++ [pkgconfig];
-        NIX_CFLAGS_COMPILE =
-          (super.kde-runtime.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
-        meta = { priority = 10; };
-      };
-
-      kde-workspace = with pkgs; super.kde-workspace // {
-        buildInputs = with xlibs;
-          super.kde-workspace.buildInputs
-          ++
-          [
-            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms
-            xcbutilrenderutil
-          ];
-        nativeBuildInputs =
-          super.kde-workspace.nativeBuildInputs
-          ++ [ pkgconfig ];
-        meta = { priority = 10; };
-      };
-
-      kdelibs = with pkgs; super.kdelibs // {
-        buildInputs =
-          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz pcre ];
-
-        nativeBuildInputs =
-          super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];
-
-        NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-        propagatedBuildInputs =
-          super.kdelibs.propagatedBuildInputs ++ [ qt4 soprano phonon strigi ];
-
-        propagatedNativeBuildInputs =
-          super.kdelibs.propagatedNativeBuildInputs
-          ++ [ automoc4 cmake perl shared_mime_info ];
-
-        patches = [ ./kdelibs/polkit-install.patch ];
-
-        cmakeFlags = [
-          "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-          "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-          "-DHUPNP_ENABLED=ON"
-          "-DWITH_SOLID_UDISKS2=ON"
-          "-DKDE_DEFAULT_HOME=.kde"
-        ];
-      };
-
-      kdepim = with pkgs; super.kdepim // {
-        buildInputs =
-          super.kdepim.buildInputs ++ [ gpgme libassuan ];
-        nativeBuildInputs =
-          super.kdepim.nativeBuildInputs ++ [ pkgconfig ];
-      };
-
-      kdepimlibs = with pkgs; super.kdepimlibs // {
-        nativeBuildInputs =
-          super.kdepimlibs.nativeBuildInputs ++ [ pkgconfig ];
-      };
-
-      kdesdk-thumbnailers = with pkgs; super.kdesdk-thumbnailers // {
-        nativeBuildInputs =
-          super.kdesdk-thumbnailers.nativeBuildInputs
-          ++ [gettext];
-      };
-
-      kgpg = with pkgs; super.kgpg // {
-        buildInputs = super.kgpg.buildInputs ++ [boost];
-      };
-
-      kmix = with pkgs; super.kmix // {
-        nativeBuildInputs = super.kmix.nativeBuildInputs ++ [pkgconfig];
-        cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
-      };
-
-      kmousetool = with pkgs; super.kmousetool // {
-        buildInputs = with xlibs;
-          super.kmousetool.buildInputs
-          ++ [libXtst libXt];
-      };
-
-      kremotecontrol = with pkgs; super.kremotecontrol // {
-        buildInputs = super.kremotecontrol.buildInputs ++ [xlibs.libXtst];
-      };
-
-      krfb = super.krfb // {
-        buildInputs =
-          super.krfb.buildInputs
-          ++ [pkgs.xlibs.libXtst kde4.telepathy.common_internals];
-      };
-
-      libkdcraw = with pkgs; super.libkdcraw // {
-        buildInputs = super.libkdcraw.buildInputs ++ [scope.KDE4 libraw];
-        nativeBuildInputs = super.libkdcraw.nativeBuildInputs ++ [pkgconfig];
-      };
-
-      libkexiv2 = with pkgs; super.libkexiv2 // {
-        buildInputs = super.libkexiv2.buildInputs ++ [exiv2 scope.KDE4];
-      };
-
-      libkface = with pkgs; super.libkface // {
-        buildInputs = super.libkface.buildInputs ++ [scope.KDE4 opencv];
-      };
-
-      libkipi = with pkgs; super.libkipi // {
-        buildInputs = super.libkipi.buildInputs ++ [scope.KDE4];
-      };
-
-      libksane = with pkgs; super.libksane // {
-        buildInputs = super.libksane.buildInputs ++ [scope.KDE4 saneBackends];
-      };
-
-    };
-
-  l10nManifest =
-    filterAttrs
-      (n: v: hasPrefix "kde-l10n" n)
-      (importManifest ./manifest.nix { inherit mirror; });
-
-  kdeApps = generateCollection ./. {
-    inherit mkDerivation;
-    inherit mirror preResolve postResolve renames scope;
-  };
-
-in kdeApps // (mapAttrs l10nPkg l10nManifest)
diff --git a/pkgs/applications/kde-apps-14.12/dependencies.nix b/pkgs/applications/kde-apps-14.12/dependencies.nix
deleted file mode 100644
index ee820b7ac74..00000000000
--- a/pkgs/applications/kde-apps-14.12/dependencies.nix
+++ /dev/null
@@ -1,1676 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  amor = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  analitza = {
-    buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ark = {
-    buildInputs = [ "BZip2" "KDE4" "LibArchive" "LibKonq" "LibLZMA" "QJSON" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  artikulate = {
-    buildInputs = [ "KDE4" "KDeclarative" "QtGStreamer" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  audiocd-kio = {
-    buildInputs = [ "Cdparanoia" "Flac" "KDE4" "Libkcddb" "Libkcompactdisc" "OggVorbis" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  blinken = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bomber = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  bovo = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  cantor = {
-    buildInputs = [ "Analitza" "KDE4" "LibSpectre" "LuaJIT" "PythonLibs" "Qalculate" "R" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  cervisia = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  dolphin-plugins = {
-    buildInputs = [ "KDE4" "LibKonq" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  dragon = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ffmpegthumbs = {
-    buildInputs = [ "FFmpeg" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  filelight = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  granatier = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  gwenview = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KIO" "Kdcraw" "Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5OpenGL" "Qt5QUIET" "Qt5Script" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  jovie = {
-    buildInputs = [ "KDE4" "Qt4" "Speechd" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  juk = {
-    buildInputs = [ "KDE4" "Taglib" "TunePimp" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kaccessible = {
-    buildInputs = [ "KDE4" "Qt4" "Speechd" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kajongg = {
-    buildInputs = [ "KDE4" "Twisted" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kalgebra = {
-    buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Xml" "Readline" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kalzium = {
-    buildInputs = [ "KDE4" "KDEWIN32" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kamera = {
-    buildInputs = [ "Gphoto2" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kanagram = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5OPTIONAL_COMPONENTS" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapman = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapptemplate = {
-    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "RBKCONFIG_COMPILER4" "RBUIC4" "XSLTPROC_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kate = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5ItemModels" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5OPTIONAL_COMPONENTS" "KF5Parts" "KF5Plasma" "KF5Service" "KF5TextEditor" "KF5ThreadWeaver" "KF5Wallet" "KF5WindowSystem" "KF5XmlGui" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5Widgets" "SIP" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  katomic = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kblackbox = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kblocks = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbounce = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbreakout = {
-    buildInputs = [ "KDE4" "KDEGames" "KDeclarative" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbruch = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcachegrind = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcalc = {
-    buildInputs = [ "GMP" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcharselect = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcolorchooser = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcron = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-base-artwork = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-baseapps = {
-    buildInputs = [ "Baloo" "BalooWidgets" "GLIB2" "KActivities" "KDE4" "KFileMetaData" "LibTidy" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-dev-scripts = {
-    buildInputs = [ "ECM" "KDE4" "KF5DocTools" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-dev-utils = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ar = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-bg = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-bs = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ca = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ca_valencia = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-cs = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-da = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-de = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-el = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-en_gb = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-es = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-et = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-eu = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fi = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-fr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ga = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-gl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-he = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hi = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-hu = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ia = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-id = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-is = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-it = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ja = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-kk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-km = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ko = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-lt = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-lv = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-mr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nb = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nds = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-nn = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pt = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-pt_br = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ro = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ru = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sl = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-sv = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-tr = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-ug = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-uk = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-wa = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-zh_cn = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-l10n-zh_tw = {
-    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-runtime = {
-    buildInputs = [ "Alsa" "BZip2" "Exiv2" "GLIB2" "Gpgme" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "LibAttica" "LibGcrypt" "LibLZMA" "LibSSH" "NepomukCore" "NetworkManager" "OpenEXR" "PulseAudio" "QCA2" "QGpgme" "QNtrack" "SLP" "Samba" "SharedMimeInfo" "Soprano" ];
-    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "WINDRES_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kde-wallpapers = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-workspace = {
-    buildInputs = [ "Akonadi" "Boost" "DBusMenuQt" "Fontconfig" "Freetype" "GLIB2" "JPEG" "KActivities" "KDE4" "KDeclarative" "KdepimLibs" "NepomukCore" "OpenGL" "OpenGLES" "PCIUTILS" "PNG" "Prison" "PythonLibrary" "QImageBlitz" "QJSON" "Qalculate" "Qt4" "RAW1394" "Sensors" "Soprano" "Strigi" "UDev" "USB" "Wayland" "X11" "X11_XCB" "XCB" "Xmms" "ZLIB" "libgps" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeartwork = {
-    buildInputs = [ "Eigen3" "KDE4" "KDE4Workspace" "Kexiv2" "OpenGL" "Xscreensaver" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeedu-data = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-mobipocket = {
-    buildInputs = [ "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-strigi-analyzer = {
-    buildInputs = [ "KDE4" "OpenEXR" "Strigi" "TIFF" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdegraphics-thumbnailers = {
-    buildInputs = [ "KDE4" "Kdcraw" "Kexiv2" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs = {
-    buildInputs = [ "ACL" "AGG" "ASPELL" "Automoc4" "Avahi" "BZip2" "Blitz" "BlueZ" "Carbon" "DBusMenuQt" "DNSSD" "DocBookXML" "DocBookXSL" "ENCHANT" "Eigen2" "FAM" "FFmpeg" "Flac" "Flex" "GIF" "GObject" "GSSAPI" "GStreamer" "Grantlee" "HSPELL" "HUNSPELL" "HUpnp" "IOKit" "JPEG" "Jasper" "KDE4" "KDE4Internal" "LCMS" "LibArt" "LibAttica" "LibXml2" "Libintl" "OpenEXR" "OpenSSL" "PCRE" "PNG" "QCA2" "QImageBlitz" "Qt4" "SharedDesktopOntologies" "SharedMimeInfo" "Soprano" "Sqlite" "Strigi" "UDev" "USB" "Xine" "Xmms" "ZLIB" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "LibXslt" "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdenetwork-filesharing = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdenetwork-strigi-analyzers = {
-    buildInputs = [ "Boost" "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdepim = {
-    buildInputs = [ "Akonadi" "Baloo" "Boost" "Git" "Grantlee" "KDE4" "KdepimLibs" "LibKGAPI2" "Prison" "QGpgme" "QJSON" "Sasl2" "Xsltproc" "ZLIB" ];
-    nativeBuildInputs = [ "DBLATEX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdepim-runtime = {
-    buildInputs = [ "AccountsQt" "Akonadi" "Boost" "KDE4" "KdepimLibs" "LibKFbAPI" "LibKGAPI2" "Libkolab" "Libkolabxml" "QJSON" "Qt4" "Sasl2" "SharedMimeInfo" "SignOnQt" "Xsltproc" ];
-    nativeBuildInputs = [ "_testrunner" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdepimlibs = {
-    buildInputs = [ "Akonadi" "Boost" "Gpgme" "KDE4" "Ldap" "LibXml2" "Libical" "Prison" "QJSON" "Sasl2" "SharedMimeInfo" "Xsltproc" ];
-    nativeBuildInputs = [ "LibXslt" "PERL_EXECUTABLE" "_testrunner" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kdesdk-kioslaves = {
-    buildInputs = [ "KDE4" "SVN" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesdk-strigi-analyzers = {
-    buildInputs = [ "KDE4" "Strigi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesdk-thumbnailers = {
-    buildInputs = [ "GettextPO" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebdev = {
-    buildInputs = [ "KDE4" "KdepimLibs" "LibTidy" "RUBY" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdf = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdiamond = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kfloppy = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kfourinline = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgamma = {
-    buildInputs = [ "KDE4" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgeography = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kget = {
-    buildInputs = [ "Boost" "KDE4" "KDE4Workspace" "KTorrent" "LibMms" "NepomukCore" "NepomukWidgets" "QCA2" "QGpgme" "SharedDesktopOntologies" "Soprano" "Sqlite" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgoldrunner = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kgpg = {
-    buildInputs = [ "Gpgme" "KDE4" "KdepimLibs" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khangman = {
-    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Svg" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kig = {
-    buildInputs = [ "BoostPython" "ECM" "KF5Archive" "KF5ConfigWidgets" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5IconThemes" "KF5ItemModels" "KF5KDELibs4Support" "KF5Parts" "KF5TextEditor" "KF5XmlGui" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kigo = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  killbots = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiriki = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiten = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjumpingcube = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klettres = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klickety = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  klines = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmag = {
-    buildInputs = [ "KDE4" "QAccessibilityClient" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmahjongg = {
-    buildInputs = [ "KDE4" "KDEGames" "LibKMahjongg" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmines = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmix = {
-    buildInputs = [ "Alsa" "Canberra" "ECM" "GLIB2" "KDE4" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5XmlGui" "Phonon" "PulseAudio" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmousetool = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmouth = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmplot = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knavalbattle = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knetwalk = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kolf = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kollision = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kolourpaint = {
-    buildInputs = [ "KDE4" "QImageBlitz" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kompare = {
-    buildInputs = [ "KDE4" "LibKompareDiff2" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  konquest = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  konsole = {
-    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Konq" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Test" "Qt5Widgets" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kopete = {
-    buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "Qt5QUIET" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpat = {
-    buildInputs = [ "KDE4" "KDEGames" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kppp = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kqtquickcharts = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krdc = {
-    buildInputs = [ "KDE4" "LibNXCL" "LibVNCServer" "TelepathyQt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kremotecontrol = {
-    buildInputs = [ "KDE4" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kreversi = {
-    buildInputs = [ "KDE4" "KDEGames" "KDeclarative" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krfb = {
-    buildInputs = [ "KDE4" "KTp" "LibVNCServer" "TelepathyQt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kruler = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksaneplugin = {
-    buildInputs = [ "KDE4" "KSane" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kscd = {
-    buildInputs = [ "Alsa" "KDE4" "MusicBrainz3" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kshisen = {
-    buildInputs = [ "KDE4" "KDEGames" "LibKMahjongg" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksirk = {
-    buildInputs = [ "KDE4" "KDEGames" "QCA2" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksnakeduel = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksnapshot = {
-    buildInputs = [ "KDE4" "Kipi" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kspaceduel = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksquares = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kstars = {
-    buildInputs = [ "AstrometryNet" "CFitsio" "Eigen3" "INDI" "KDE4" "OpenGL" "PyKDE4" "QJSON" "WCSLIB" "Xplanet" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksudoku = {
-    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksystemlog = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kteatime = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktimer = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktouch = {
-    buildInputs = [ "KDE4" "KDeclarative" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktuberling = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kturtle = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktux = {
-    buildInputs = [ "KDE4" "KDE4Workspace" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kubrick = {
-    buildInputs = [ "KDE4" "KDEGames" "OpenGL" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kuser = {
-    buildInputs = [ "KDE4" "KdepimLibs" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwalletmanager = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwordquiz = {
-    buildInputs = [ "KDE4" "LibKdeEdu" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkcddb = {
-    buildInputs = [ "KDE4" "MusicBrainz5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkcompactdisc = {
-    buildInputs = [ "Alsa" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdcraw = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdeedu = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkdegames = {
-    buildInputs = [ "KDE4" "KDeclarative" "OpenAL" "SndFile" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkeduvocdocument = {
-    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkexiv2 = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkface = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkipi = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkmahjongg = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkomparediff2 = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libksane = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  lokalize = {
-    buildInputs = [ "HUNSPELL" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  lskat = {
-    buildInputs = [ "KDE4" "KDEGames" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  marble = {
-    buildInputs = [ "KDE4" "Phonon" "Protobuf" "PyQt4" "PythonLibrary" "QextSerialPort" "Qt4" "Qt5Concurrent" "Qt5Core" "Qt5Designer" "Qt5Network" "Qt5PrintSupport" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" "QtLocation" "SIP" "SharedMimeInfo" "ZLIB" "libgps" "liblocation" "libshp" "libwlocate" "quazip" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  mplayerthumbs = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  okteta = {
-    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qca-qt5" "Qt5" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5QUIET" "Qt5Script" "Qt5ScriptTools" "Qt5Test" "Qt5Widgets" "Qt5Xml" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  okular = {
-    buildInputs = [ "ActiveApp" "CHM" "DjVuLibre" "EPub" "Freetype" "JPEG" "KActivities" "KDE4" "Kexiv2" "LibKScreen" "LibSpectre" "Poppler" "QCA2" "QImageBlitz" "QMobipocket" "TIFF" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen-icons = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  pairs = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  palapeli = {
-    buildInputs = [ "KDE4" "KDEGames" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "QVORONOI_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  parley = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Multimedia" "Qt5Svg" "Qt5Test" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  picmi = {
-    buildInputs = [ "KDE4" "KDEGames" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  poxml = {
-    buildInputs = [ "Gettext" "GettextPO" "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  print-manager = {
-    buildInputs = [ "CUPS" "KDE4" "KDE4Internal" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  rocs = {
-    buildInputs = [ "Boost" "Grantlee" "KDE4" "Qt4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  step = {
-    buildInputs = [ "Eigen2" "GSL" "KDE4" "Qalculate" "Qt4" ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  superkaramba = {
-    buildInputs = [ "KDE4" "PythonLibs" "QImageBlitz" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  svgpart = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sweeper = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  umbrello = {
-    buildInputs = [ "KDE4" "LibXml2" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  zeroconf-ioslave = {
-    buildInputs = [ "KDE4" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/applications/kde-apps-14.12/dependencies.sh b/pkgs/applications/kde-apps-14.12/dependencies.sh
deleted file mode 100755
index e00c7770ab8..00000000000
--- a/pkgs/applications/kde-apps-14.12/dependencies.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch
deleted file mode 100644
index d2ecac663ec..00000000000
--- a/pkgs/applications/kde-apps-14.12/kdelibs/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/applications/kde-apps-14.12/manifest.nix b/pkgs/applications/kde-apps-14.12/manifest.nix
deleted file mode 100644
index 88069b6702a..00000000000
--- a/pkgs/applications/kde-apps-14.12/manifest.nix
+++ /dev/null
@@ -1,5665 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "pairs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fsaycjsmkm1g92j3syc2a8nwdgfgs99g-pairs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/pairs-14.12.1.tar.xz";
-      sha256 = "13byliibd6fwa8bsgka8hc64jkprmgsnqh9sks36w7ic22f32qhx";
-      name = "pairs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4ggxl3vnlngg1p6irixa42as7gyp3c8k-kgamma-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgamma-14.12.1.tar.xz";
-      sha256 = "1ad2c1l2lbc2pdybavnnj834ww82rbm91k0wjgz25xc3l3gkrg9i";
-      name = "kgamma-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n68cvnv9h371cx7q5jqfqs2bdj1rqvyi-ktux-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktux-14.12.1.tar.xz";
-      sha256 = "00x5jm26w1a214chdg1fkzki1z3h1dbw5qagal4lkcb98fi5sbcq";
-      name = "ktux-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n8ayxw5rwzlyc015ff1lzwnd2wa3ss4x-analitza-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/analitza-14.12.1.tar.xz";
-      sha256 = "0jgmjda5n5935v37jgaichk5hif67mzlyvxqmr19wwmbiqfbazx8";
-      name = "analitza-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hz00x8miy3gw4gm2ylw0v90d8xnxxqml-kubrick-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kubrick-14.12.1.tar.xz";
-      sha256 = "0c2ixhd3763pzy92z1ck638wggmq3h4jvnax5ralfhhvn9r2f5bj";
-      name = "kubrick-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fv5vdi5m80l7hzkhkidyk5rd1srghl8x-ksirk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksirk-14.12.1.tar.xz";
-      sha256 = "1sdd117xhn9jclqiczh1cr8apy0akwncmbj82gwm7i1qx31i55fx";
-      name = "ksirk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9wa79ygill8gb5n281cybrmj4zv627h9-katomic-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/katomic-14.12.1.tar.xz";
-      sha256 = "1mjzm4v80cva7kfakjpjkd4sw4fdcyin5f2srck7fl0pnqdpnhqz";
-      name = "katomic-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/w4b045lmp2viqrvifkm11n282l5khwbd-jovie-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/jovie-14.12.1.tar.xz";
-      sha256 = "1xkmybfgn6mbrp6lx8ri0dzmz1nsvg9cxlxan4n5bzwd3zjpycjd";
-      name = "jovie-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ky4vpsb0mm22raiq0r6jfxjsdr5c0vmv-kdeartwork-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdeartwork-14.12.1.tar.xz";
-      sha256 = "0jrdyy787wnqx31nrgmf7amhy5ix9w7anfnqrdn4w8yydpvghhqw";
-      name = "kdeartwork-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l5xwmjgcw6rbmmhy2m5z55hxcf9d12hv-kapman-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kapman-14.12.1.tar.xz";
-      sha256 = "0bkpcjdcax6b3dp236ybaakpxz5b1vkrmmxpczvg6hf2cqwmlsv5";
-      name = "kapman-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/aixz1c1q6rnpqxm805xdirlqg47kw1kr-libkomparediff2-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkomparediff2-14.12.1.tar.xz";
-      sha256 = "0fjqsa83sqd7gcpm818yirnm077g6q616rh9676dzwv0cmc334zx";
-      name = "libkomparediff2-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kx7kv61rc3ddz7gmm5k5cwp9zh3k70nk-kde-wallpapers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-wallpapers-14.12.1.tar.xz";
-      sha256 = "1q28rb8a4rw6v5wvwri3aslc8xwbn0324b07lnkvn58alpmdga8v";
-      name = "kde-wallpapers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c21hgh72czi1nqr3lci8lynvsd3qkvzh-ark-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ark-14.12.1.tar.xz";
-      sha256 = "1fimg9f4l373l31kr59fvvsavssvn3ljdrxrgnl6a66v1gwgjsdp";
-      name = "ark-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b867ygwgvr9g8j54s3gya7c2wpr9gwf8-kdesdk-thumbnailers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-thumbnailers-14.12.1.tar.xz";
-      sha256 = "1p3abcnidk07jgr9qn03zfnhqci27683gz25wy271v6gl7b0wp6c";
-      name = "kdesdk-thumbnailers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hp6x10injwcygbd5zqvkkg2k85n62drw-kde-l10n-wa-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-wa-14.12.1.tar.xz";
-      sha256 = "0aq5n0n0saqkllkwpf9a5scjpsv4bxzx89z2a048kh76i8h9zr5p";
-      name = "kde-l10n-wa-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j8x84jy2x4fw72a2mj7zgzkbd2v430np-kde-l10n-it-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-it-14.12.1.tar.xz";
-      sha256 = "13z9gmaziyvw112phzxc7893lz6wh8q92gb3fj3hmdmzj0vfqv4r";
-      name = "kde-l10n-it-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yccjbanz6ijsf5rdd0n53cwygbv5jm4m-kde-l10n-km-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-km-14.12.1.tar.xz";
-      sha256 = "0fdns3fifr4ypz5mi798xc18miwlb7lqz22f18gnrza22vnzwi09";
-      name = "kde-l10n-km-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mzfjypmyhmp3s7mnxk0mwf57s3l440c2-kde-l10n-pt-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt-14.12.1.tar.xz";
-      sha256 = "13pzz23zf9nnl3a65nrpmwlpnkvr490vfs7yfvvr5w0nrqfwzhp6";
-      name = "kde-l10n-pt-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pjdp04f6m3ghqr23lyzxw7w0fgg5i6ll-kde-l10n-ru-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ru-14.12.1.tar.xz";
-      sha256 = "1a5ygssdwkm9iqakl1w4pza70g1gwh7mzi6jzhbd4jsn740ykw0r";
-      name = "kde-l10n-ru-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4j1r5xz2fslwv0di0dn9x8n49hrxizg4-kde-l10n-de-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-de-14.12.1.tar.xz";
-      sha256 = "1iavp7xr2qv8i97sl1kpl9kasi21br91l3mdah382ayhaz5khnlb";
-      name = "kde-l10n-de-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dz1zi3jrw92cgci5zc8nia3xzq1zykdf-kde-l10n-uk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-uk-14.12.1.tar.xz";
-      sha256 = "1228lpwggkwz9rwnmrmrw4f72hcbng40g1q1bfhjzw078s7j6nxr";
-      name = "kde-l10n-uk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ylf7xmqdh9yrz37yaq4f8nddap1gfanc-kde-l10n-ja-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ja-14.12.1.tar.xz";
-      sha256 = "191whr3i7qkqj2wjzjqgagb1vs391x9sp688w56ynjjmh58vrvq1";
-      name = "kde-l10n-ja-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b6n06i5p82k6fq4p4rpl7bf0cyklazxb-kde-l10n-kk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-kk-14.12.1.tar.xz";
-      sha256 = "01ivq7g550i9ik18xnibn7xl5mmm237wrsksjm0xni18s89wwz8b";
-      name = "kde-l10n-kk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ysarksjh5lcm2yhbphrsqhyzmlp6qclr-kde-l10n-pl-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pl-14.12.1.tar.xz";
-      sha256 = "0ni41lp6l4l3pa1xf6kkim2k5qcvapm2g65nh5hryiwx9dpgkimv";
-      name = "kde-l10n-pl-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zpq7ayj7ihr1xw4ihcnckqvnagl28lk0-kde-l10n-sv-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sv-14.12.1.tar.xz";
-      sha256 = "1r84629cv7c0lkfxii0q133cl710rgiqp5iylb3w32h7c1ji4x19";
-      name = "kde-l10n-sv-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/g5pcas9cz1yq6qz9883l2djfpb77li8a-kde-l10n-ca-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca-14.12.1.tar.xz";
-      sha256 = "1xprgp7l1h7wkfjh6v3yya9xw3r60vhsyk3ly38vcwxy5b6fjigd";
-      name = "kde-l10n-ca-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/v6hb004qp3i0p4vp1yslnmz4clb66p8d-kde-l10n-da-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-da-14.12.1.tar.xz";
-      sha256 = "0b38wgm8f23l9ya9h67m6zm785fmqi7737xfphjmrjh2i13gxpbl";
-      name = "kde-l10n-da-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/33f2k043b8gi64mr4wwrs6pwp5b9bq7h-kde-l10n-he-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-he-14.12.1.tar.xz";
-      sha256 = "0ynvsrczdraf55gaiwbv9nzwy548zkkbdh475frqfmalzh9b7jww";
-      name = "kde-l10n-he-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7hlk5vyd3pl9rdp22ybsj868w6s7sfz0-kde-l10n-lv-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lv-14.12.1.tar.xz";
-      sha256 = "0x3rlallirrzgn8gfyssyvaj3zaji672n6hfacp2djpfzbfwqq6l";
-      name = "kde-l10n-lv-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b2v25j4hlsl7lqb77wk7sj1j5z9q7ldm-kde-l10n-hu-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hu-14.12.1.tar.xz";
-      sha256 = "061kyzz24f6bink3sm4p7q959977ril3m86lm8fa1ddnccw7ya46";
-      name = "kde-l10n-hu-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8a3pmbwm8k7g951yi5d3mv57y9vxn84z-kde-l10n-sr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sr-14.12.1.tar.xz";
-      sha256 = "16kcpilb4mp4cfgklc4dr6y389hlmzvwx8wp0y3i2w1r18nwd8m8";
-      name = "kde-l10n-sr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l4fy9j1aix7fyisan5f2pa4273misph2-kde-l10n-is-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-is-14.12.1.tar.xz";
-      sha256 = "14r5wrkr39cipx40hqqcx12cvv0vql829689yiy97ypcg4bqndma";
-      name = "kde-l10n-is-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vk6fz8gixl7wv6w20h4inn984839lkkk-kde-l10n-mr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-mr-14.12.1.tar.xz";
-      sha256 = "1nvaxd38c4f9kkhkrv4bb1aczi1iv1bp16kmm47s1y6kzb93zq9h";
-      name = "kde-l10n-mr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca_valencia-14.12.1.tar.xz";
-      sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq";
-      name = "kde-l10n-ca_valencia-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0f4agkrcrb1cn6sdgdpj1bwln6f2ra5i-kde-l10n-gl-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-gl-14.12.1.tar.xz";
-      sha256 = "1xjh19c7rjd5k3v3c7g0ljz1kz5vv3zhji4rm84j30z12cks3nhh";
-      name = "kde-l10n-gl-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3nk8pxfypvnwbcszm33fn3j7f0kmgdji-kde-l10n-cs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-cs-14.12.1.tar.xz";
-      sha256 = "1qg9y5173374fpf6yk4v8mlsqdjzp8inirp08qx0lh33jd6rpddb";
-      name = "kde-l10n-cs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/i5vsmw062i49ki35qqyi0ix6x5fl4jvg-kde-l10n-en_GB-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-en_GB-14.12.1.tar.xz";
-      sha256 = "04b7amh2247ksr414m3x7bc4p22xm6kxncsax9ggapx613flb2zc";
-      name = "kde-l10n-en_GB-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p2jc4kci6k5kn1ihy9yv5inp4p4g01n9-kde-l10n-sk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sk-14.12.1.tar.xz";
-      sha256 = "0ic2y081699mv16hpkb3ivdvd4ph51wz3md5bz65pfz404gn7krf";
-      name = "kde-l10n-sk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4kbdmqqmv1slh4z56rifg8sw0a9980m4-kde-l10n-ga-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ga-14.12.1.tar.xz";
-      sha256 = "0794p0dqa1nnkwwc2ipslzhaakcx3r4b6s03hf7m14r58wmvws28";
-      name = "kde-l10n-ga-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hdyxfm2wnigh8wb3ay8y8v7psjrbijy7-kde-l10n-sl-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sl-14.12.1.tar.xz";
-      sha256 = "0nv2yrk99dkvb49ww6l6za0czy89p1nsilm56f4mdgbvrgzwk9zp";
-      name = "kde-l10n-sl-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ln3d7jpln9kl947fhgknbhg0rh6lnxds-kde-l10n-nb-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nb-14.12.1.tar.xz";
-      sha256 = "0zj66ydg5pwlx3hwwdxz6i8m330wz0w2l2p4fvf4kjvy49cafrmd";
-      name = "kde-l10n-nb-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vw8kpmpiyrrqch5wb4164yv0jhkdkpkk-kde-l10n-ko-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ko-14.12.1.tar.xz";
-      sha256 = "08q0d0q2cm2bmdwwmyavzb07wlbnf5lpl071gjm146kzk0y1kmpg";
-      name = "kde-l10n-ko-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/87kmgghdnkmzvdbk611qmv2nav8m2f0p-kde-l10n-ro-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ro-14.12.1.tar.xz";
-      sha256 = "0xprq9jw94i38aaq1drkv1qpgf3rf75745zlagzb430jr1a285lb";
-      name = "kde-l10n-ro-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/h8wfla9jsbhfjvjfnca6yjwpcc90nb5m-kde-l10n-ug-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ug-14.12.1.tar.xz";
-      sha256 = "1am6yr3qq4l2wgpphxhqfj8ydndvjxmc3cl4gz6zlkddaw4pv5kr";
-      name = "kde-l10n-ug-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mja592hds8ajqsx96wb1zxph1n0pxqb0-kde-l10n-hr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hr-14.12.1.tar.xz";
-      sha256 = "0hjhzf77mckh9xqqxn54w47lsn3fwl2p4rfk22ijlliglrylpajv";
-      name = "kde-l10n-hr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9vay8airc00fg0d91lpp84l21akqxn27-kde-l10n-pa-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pa-14.12.1.tar.xz";
-      sha256 = "0sr6pygs0lk1ar2zn6966ngaf9vjfy207i1bgg6gr3559v5wkx8x";
-      name = "kde-l10n-pa-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/sx4w67x5xq87ragvsysg4jwcpvrk674p-kde-l10n-id-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-id-14.12.1.tar.xz";
-      sha256 = "018yvdp7l9qjaj7niyjas87dhna1xr0mikpdycw5dbwchpizlr53";
-      name = "kde-l10n-id-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l9cx18xxg7ly9nrsfi1lj9vxzg19h9sq-kde-l10n-bs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bs-14.12.1.tar.xz";
-      sha256 = "0ybh9wyhym05rlc3s0kl9lh07y96nyl3p4lifj13lcqi975mgnp9";
-      name = "kde-l10n-bs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/59bsq0cq07hc9apbfdmaa66jg5n8wlwg-kde-l10n-pt_BR-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt_BR-14.12.1.tar.xz";
-      sha256 = "1wbgns7pq0jxjffgvr6hgfg3san1k2c7wppsvn2cpjiph0v4azz9";
-      name = "kde-l10n-pt_BR-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9xiaf2c0lbxy65vrx6hdh884ky6h2s79-kde-l10n-bg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bg-14.12.1.tar.xz";
-      sha256 = "0m404hxz8dskbdsni021703vdn4lvwpf88hwrdrfnhcv06jazjiq";
-      name = "kde-l10n-bg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/m8ahg0qxpv2hskl9dl7dgch10adxfia5-kde-l10n-nds-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nds-14.12.1.tar.xz";
-      sha256 = "09r79l4ngcsnya6kqj5hj69xq00bf4ndxgkkplwiq137zqamqcfl";
-      name = "kde-l10n-nds-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mq5v891rzj692h61aak71g71iy963ayw-kde-l10n-zh_TW-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_TW-14.12.1.tar.xz";
-      sha256 = "1azwmzg47pk4b23hpnpic3c8phnfz4iy3n6lv50sz98b9whkmf0s";
-      name = "kde-l10n-zh_TW-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gprdva58d383n4ka677pdbpaz8l05w8i-kde-l10n-nn-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nn-14.12.1.tar.xz";
-      sha256 = "1xp44glwk6nnnavw0lrl7ssl5miqfd7b093chfz35g2g92nyaa3g";
-      name = "kde-l10n-nn-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jhv6zy04igavcq0dxsg9kk3vfh2063m9-kde-l10n-ia-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ia-14.12.1.tar.xz";
-      sha256 = "1kjjg4z4y0fh4kyzy9vzxlw47xkiirh207d7x0b94nksxzbqwg67";
-      name = "kde-l10n-ia-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hy0v61dnnmpbj84a4imvgxqx3y0fd5qg-kde-l10n-tr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-tr-14.12.1.tar.xz";
-      sha256 = "1kdxps75gv2vlf98f958llkk161z2y908bg1fdq4rgdh1n3bylkh";
-      name = "kde-l10n-tr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jmjbgfmqvcqd1sxdj0a7c73a9yqyzvpz-kde-l10n-ar-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ar-14.12.1.tar.xz";
-      sha256 = "121dblyh53fb3qirg7s9givqcn0xswdj2hrnqc8s2x2qas74v6a9";
-      name = "kde-l10n-ar-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b9dqgb7nsfgyzhr4vw7fnl287spyjigg-kde-l10n-zh_CN-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_CN-14.12.1.tar.xz";
-      sha256 = "0cyi0g55xln8smnlnhl0vfpi0jrihnfp3vrv6j2gz30zzfgkw9dp";
-      name = "kde-l10n-zh_CN-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0ycvh7sgyhjqffzq5ff5mjnv0y4f8pxy-kde-l10n-es-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-es-14.12.1.tar.xz";
-      sha256 = "11i4xmsigmi9mqbc5x9l96vsrfh6709fbbfpqa6b28a5jif9anmr";
-      name = "kde-l10n-es-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9rbki0767k1hirpx7530lqcw74bfy2b1-kde-l10n-et-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-et-14.12.1.tar.xz";
-      sha256 = "0c8vhbi1bi29krh1sway8z0536cn507i1lp8jffb4mk953mm5y9n";
-      name = "kde-l10n-et-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pq8r37pcg05p9rc5prcy9r2f5mby7m0z-kde-l10n-fr-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fr-14.12.1.tar.xz";
-      sha256 = "1s2glywjbrr2q6ssmalblschrgny4rk3q3aws2ffrrlkanx0qyva";
-      name = "kde-l10n-fr-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k0amn3lcd7xcssqh8fs46swa9jmksv9x-kde-l10n-fa-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fa-14.12.1.tar.xz";
-      sha256 = "0pj3klcdlash8wgvz75nw009jz63rblv038yhrh1qsidjw4vsl85";
-      name = "kde-l10n-fa-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/cqbsi6sr0mcl3pnzlk0w52disg2xgm1i-kde-l10n-lt-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lt-14.12.1.tar.xz";
-      sha256 = "0k4m1ixlnmmgbznhgvbmfss0c1fynd492sylcvbsrnqcawq3fqdz";
-      name = "kde-l10n-lt-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8pw7v2ccr5vgl6ic7dnlm5xcqgkbvxyr-kde-l10n-nl-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nl-14.12.1.tar.xz";
-      sha256 = "0m0hwib0v5j2bmgkgwjzhbhqnyk8gcm46969rr2qf51snrvynlax";
-      name = "kde-l10n-nl-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vplfymrx36jk65b0xjmzh2g4l9ky7dfm-kde-l10n-eu-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-eu-14.12.1.tar.xz";
-      sha256 = "0wcax8gnnk6rwpfl6ph8z5i013rmh08pr159nxpakdsvbcn5ma5v";
-      name = "kde-l10n-eu-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca@valencia-14.12.1.tar.xz";
-      sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq";
-      name = "kde-l10n-ca_valencia-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p9a3lyi934i4pc5p8433firhkcs0ybn3-kde-l10n-el-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-el-14.12.1.tar.xz";
-      sha256 = "022kr5cvlz8hxj3s74my680ghp23lj8amykzgr5z9i996q2hs6ps";
-      name = "kde-l10n-el-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9f3cb3yksriwphrnkmn1knrq0108ka4p-kde-l10n-fi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fi-14.12.1.tar.xz";
-      sha256 = "1sxs5z3dkx7hb8l7ilrhzvl2ip02fsb24iqgh0gadqwdfj46gwjn";
-      name = "kde-l10n-fi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pfswxr29nz9qylmb7n83cnap95khz248-kde-l10n-hi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hi-14.12.1.tar.xz";
-      sha256 = "0a5ilahwh6wpxg4mb3wqg079qfvcxg7zqblwyx6mdwh4d2ly5y1f";
-      name = "kde-l10n-hi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ychwcs2gn4mgmhza315nmf2z35c0ibb7-granatier-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/granatier-14.12.1.tar.xz";
-      sha256 = "0lifihkssp0g30kv3iigbpr9ghdwwykmzfiv4qwsxaxadil9qqlm";
-      name = "granatier-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c1n1s1hbj8q4smgxnd4kka9qidh0rvvw-kamera-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kamera-14.12.1.tar.xz";
-      sha256 = "1avmsy622rnyyvsx9zwspqx9g4mb5wzc74mvcjrivi3c3mcz2ng6";
-      name = "kamera-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/bl5csvnm20xxaqz5p7d3ymnkbd0df1p1-kfloppy-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kfloppy-14.12.1.tar.xz";
-      sha256 = "1ky8n0zk07d3cnap8f3zw5qck2kw4l0dql0fnbk3s58r982af2fd";
-      name = "kfloppy-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/v157pqk6clf9yn21cdbvxxvh0sn892rd-kdepimlibs-4.14.4.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepimlibs-4.14.4.tar.xz";
-      sha256 = "04c53ms91r8bpxgn305zzvagi30jli7217kvgdy4z4il6wnvns8r";
-      name = "kdepimlibs-4.14.4.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7amx4gdg85lw28amb0v3nd92hk71lphs-libkipi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkipi-14.12.1.tar.xz";
-      sha256 = "01bpjh40p5cwli018sgyn6jgis1l83icikabcw6vxkp8vsn3q6yg";
-      name = "libkipi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jyx0msd02v7iikj7czv3y8ckw79rahpa-khangman-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/khangman-14.12.1.tar.xz";
-      sha256 = "1574cdbq5lyq4hl84xwia5z15az4zzh6zvasxvaa5bz94cjkpyns";
-      name = "khangman-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0wy6dhhq6gn6h58vi324yiqa2f5ni5py-konsole-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/konsole-14.12.1.tar.xz";
-      sha256 = "0i7mccspglppz0sx2zqfn0861h6ibxkwrcscivqk7yxpq44nb58j";
-      name = "konsole-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yg7gb0aidvcxh4i1z0ja8nvs23vhdf22-killbots-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/killbots-14.12.1.tar.xz";
-      sha256 = "0i006gjysfbf9wn0qgbv47fvx8z4v49ikcaqg9y83pl72shnsa1j";
-      name = "killbots-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s16w00cgm430r315d2v2a041hivc5a1q-kturtle-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kturtle-14.12.1.tar.xz";
-      sha256 = "0sn74w413xx5y3kh0fqf7f47pklz4v22nnv6x11kpkcyx1xmghh9";
-      name = "kturtle-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j2qlvd878dlxkaps9v61dw9k1n6nmh4p-kajongg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kajongg-14.12.1.tar.xz";
-      sha256 = "0690jlsnj3s2l51nmx3an75q0m6xv0rssdmshrmbxgp2cqx5b455";
-      name = "kajongg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8v0k2n5pkvv6wg3q957zqclasmsw2a7c-bomber-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/bomber-14.12.1.tar.xz";
-      sha256 = "0g4cb3jwva9saddf9m2j4k3y1gybh2bv8dxzfb1xqy5cv20qlrfc";
-      name = "bomber-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c61iqdbq71kb6wvnzfq7436hni8anrrn-kruler-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kruler-14.12.1.tar.xz";
-      sha256 = "0rag54kg5jzgj32fnf4xmawb0hnk52rhjf7i2y5f3156x3iraxxx";
-      name = "kruler-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/r2c1gika9sw2m5i1mmj3b47n7g19715k-kmag-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmag-14.12.1.tar.xz";
-      sha256 = "1wlz3n3z9qcsqvs7rz3a76bh6rkrq0g9p797axcsfp7wzjfilj5c";
-      name = "kmag-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rqrykz2vvj59w1563dgcjpi8fmkwdnm5-kwalletmanager-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kwalletmanager-14.12.1.tar.xz";
-      sha256 = "16pd2iym8v9xxdmazn2i7vq61c9m805h9a7awy8wha8bfdinazvi";
-      name = "kwalletmanager-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/x147kkpbjm9mmdbapxs040cvb8fci9ab-krfb-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/krfb-14.12.1.tar.xz";
-      sha256 = "15kxapi1mwjpbj995k8rxla0h1wwvhd406pbwkpak3a9szljsv72";
-      name = "krfb-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ar6s1pn0lfgs1iw6q5akr0l5dcrd1x2a-libkcddb-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkcddb-14.12.1.tar.xz";
-      sha256 = "1vb8rmb1j0nh2dh8ch19v1qpdxhc4c0am7k11lld45kamg3az0gd";
-      name = "libkcddb-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dbf3r79p85w5v6jihmqndcb631kqpb7m-klettres-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klettres-14.12.1.tar.xz";
-      sha256 = "1bj5s3js6v3641s2kgrl6a5bgr25g9lgbvsfzqrp0pil2nx1g6h1";
-      name = "klettres-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xwj5di67f0swj1w0c2235vrbany8ffgn-klines-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klines-14.12.1.tar.xz";
-      sha256 = "1hxjqpc1z47dj1ryp116hdzkla4h1awnlmyzq7yjhki2viw32n3f";
-      name = "klines-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/aj1drn165rirvr5wjmqfnzsfknnb32gj-ksystemlog-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksystemlog-14.12.1.tar.xz";
-      sha256 = "15a92f873vybp3m9icjshbqs8nl6xm4cl9ca3cghmdlcqrn7f92x";
-      name = "ksystemlog-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y8p216blw2zrld7mj5c1ji9nwqhrbqsf-klickety-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klickety-14.12.1.tar.xz";
-      sha256 = "071y9khz57mrw12dvwxhs03jn56j06hw38hcf8d4r4wksbwr3j87";
-      name = "klickety-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5c1isv8y9s4k7153i5y41jdps6zsp8gl-lokalize-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/lokalize-14.12.1.tar.xz";
-      sha256 = "1ala2pfqh0a0kqxiyfpp11rcn805g6gcn0m9qjbmdqhl9wviij9h";
-      name = "lokalize-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/d315k9787k4c5ww7zp0341cybnwwsy2j-kdegraphics-thumbnailers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-thumbnailers-14.12.1.tar.xz";
-      sha256 = "198m7iw621azbcp4abv3izq5p29yz9s2apr6ivxpp1iqzpz2x70g";
-      name = "kdegraphics-thumbnailers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6v8hm7rgdvfkvakv1jfq3g7jk3zq7x3z-kde-base-artwork-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-base-artwork-14.12.1.tar.xz";
-      sha256 = "0zd298ii8a3lnfh6lxgw6nmf91kx3days1nqk5arilkbrf7b4952";
-      name = "kde-base-artwork-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xaibvsd6g0xnwpnayb0jxhah9hmb3xin-artikulate-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/artikulate-14.12.1.tar.xz";
-      sha256 = "021hyprapc6fjhls55yn69sndm13krfriwj1vmq5mvqxzr0aid2k";
-      name = "artikulate-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s6j8nymsygqkh4vfgkgqwcg6xigda53d-kaccessible-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kaccessible-14.12.1.tar.xz";
-      sha256 = "0gp49jxkscdqd35xqmzhr17smiwyxgx8xbr7hkvbm10dzn9kx6x7";
-      name = "kaccessible-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wxk5v878fibdxxd9m9f6phyc99a56psc-konquest-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/konquest-14.12.1.tar.xz";
-      sha256 = "006an4bpfsnzcpm086xjyryd1xlzw0yz2knbzkvsdf3jr9kpmnrr";
-      name = "konquest-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p3yhp4gg9pfbmnlb6jqk6xhaz2yllx9w-superkaramba-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/superkaramba-14.12.1.tar.xz";
-      sha256 = "10dlnn4knlvkz38c98613x9px85a8dhlfwpp4231r3v5va03xszj";
-      name = "superkaramba-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ga54jhkjav5i83vmir8j6l51d3gv1cs1-kdesdk-kioslaves-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-kioslaves-14.12.1.tar.xz";
-      sha256 = "06f8xxzldsqmch9acmfd95lr48rm94d6qll62bj5zi0bs5qjygbw";
-      name = "kdesdk-kioslaves-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xhdgix591fkzqdzw0pch0vv8wk2kkhz5-cantor-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/cantor-14.12.1.tar.xz";
-      sha256 = "100yscp21w7amqmwzh4zsk7kmyn5pf3swlkwipz857wi3wajkm75";
-      name = "cantor-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pvk5701kz79m2bn13n45ffwy0zjng838-kdegraphics-mobipocket-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-mobipocket-14.12.1.tar.xz";
-      sha256 = "0qa0bpfvgbq3x3wlgi1cp3v8xn1wayyjrc07ffdr63w1gfi10mg1";
-      name = "kdegraphics-mobipocket-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yd2zzjmb762dkjbkhjxdsnbg38k53f65-kde-runtime-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-runtime-14.12.1.tar.xz";
-      sha256 = "0cy2dhxw2cvbgqrknb3iy97rip2dcd7nrq3pj649mpq9a3r3cg17";
-      name = "kde-runtime-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hxk0628k5s042wcxwd1v7vy951bsjqxp-kiriki-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kiriki-14.12.1.tar.xz";
-      sha256 = "00j95hcyrnw2li2abkwqsd0dp8ph4wlqzy0d3gzfnkal19j2x2m2";
-      name = "kiriki-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6a5bi2hpxmry12zq6qkwk2hzlv5h7qkz-kwordquiz-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kwordquiz-14.12.1.tar.xz";
-      sha256 = "1c03ab89lnnin81lvq3mbcw2d10k3rjlk2fpplcbbnsryq35bivi";
-      name = "kwordquiz-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ykssldwmik1x7njph3rmzh9d14n7f0mi-kate-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kate-14.12.1.tar.xz";
-      sha256 = "0c3diy846drf5nihvhzhpsp8pl2kviyn6ian61myy2147smkany5";
-      name = "kate-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3k84f0vl6l7l65hmbbdlfp2zg348kcmi-parley-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/parley-14.12.1.tar.xz";
-      sha256 = "0awzpa9bl1j9gzy3596dhpsg3pqbmmdh87n52z7cjyk8sw0ikk19";
-      name = "parley-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/clfp83sn2pg1jr82j79szwkx0aysl9a3-libkdegames-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdegames-14.12.1.tar.xz";
-      sha256 = "0af15lbsjc7w5p3s3nxsb08cvyg7dncjmpw7z1vhgqykzmwpyp56";
-      name = "libkdegames-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ghjddljclnsn3z0rflrrxanbkzxn46m5-libkcompactdisc-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkcompactdisc-14.12.1.tar.xz";
-      sha256 = "10zpv05wmqs1lrby95d5bgvwiqcmkd3ndrdsr6cpayg2lw9nq86d";
-      name = "libkcompactdisc-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k78l2m24w71dbczia8bnwi3fhpqghj6b-kmplot-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmplot-14.12.1.tar.xz";
-      sha256 = "0p0iv3m2648vyr1imzwdfs73rc2q39nl8r7w31z5dhm65rq2zi27";
-      name = "kmplot-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/lpdpdbbbgfyib95cq1m1db5fdym6wjxz-kuser-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kuser-14.12.1.tar.xz";
-      sha256 = "1zgik2i9z0n58m3fm8g0kgjm9aqa6v1f3331r8nrjir9vd9vr8g7";
-      name = "kuser-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p1lzq3dbil7klabykd2995j65qwqfldd-kspaceduel-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kspaceduel-14.12.1.tar.xz";
-      sha256 = "1zihp0nc6gs4xymyykldjw22zrxm8qznjaya4z1fw07hwndijvia";
-      name = "kspaceduel-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/agnpfa5vjjfq79j3x2nf3nfwvvxjl28i-gwenview-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/gwenview-14.12.1.tar.xz";
-      sha256 = "04g3qkz1g27ph6ha1zrbqpr827vhx9n2nigr0dy95a61qw1m0jww";
-      name = "gwenview-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wfnbykydc5zl9d678mpw7hpc1nscynmg-oxygen-icons-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/oxygen-icons-14.12.1.tar.xz";
-      sha256 = "1z27id29s98h20dg27wr28w2qpb25ii1xsrgjk6r33nhj2y39jmg";
-      name = "oxygen-icons-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/q4fxwbxh1rl3icjzhcyij7wwbchc0xzn-kppp-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kppp-14.12.1.tar.xz";
-      sha256 = "0lvcanlskjgra2wn3k1j5jx9vy5k0g381ycg79fazkczsr8is5wf";
-      name = "kppp-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9ny33z3srhnwz8p9fd7i6klmm9y9j08k-kmouth-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmouth-14.12.1.tar.xz";
-      sha256 = "0a3fhlgy8z84n83v59safl71v29px9783dndlqgh1dk8lmki7dmd";
-      name = "kmouth-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/iwj5hwmm9p278b7yi510fh38710w96rr-kig-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kig-14.12.1.tar.xz";
-      sha256 = "0qs89kpms9ch2r9xj4scvjscn7b7bh5k1nxaln1z654mgp1rl4f8";
-      name = "kig-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/z8w5hn03zzpbpg7mjdmykylcbvhcd2ac-libkexiv2-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkexiv2-14.12.1.tar.xz";
-      sha256 = "0qpfccasra3ffq5iz7dpxpzcyk13ywjdaz32n1wfsylfv158w9sg";
-      name = "libkexiv2-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ixgf55ccq4gyyazhnbrrrg1qhpgh048s-kcron-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcron-14.12.1.tar.xz";
-      sha256 = "0czcxajsdx7xal9cvy9cd4drhvaivx68mhymj5k3n90cka7qda2x";
-      name = "kcron-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vjc105v5nsibh4pfvrvsjck78f2645lx-ksnapshot-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksnapshot-14.12.1.tar.xz";
-      sha256 = "02g48b3i7xglrgp1nxvpbsrq7kqg81s4mf6k9rhfn312n45g1arg";
-      name = "ksnapshot-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/543lrxwg6zz77yz58ihn3dvf9rhy3xzg-marble-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/marble-14.12.1.tar.xz";
-      sha256 = "13plghz8d5a8gdkq3nr7m0bvp2p0smqnj987bmsi1cldvliwiijl";
-      name = "marble-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2ssmxyy2vhlipyrh6cs5qgms20cicmhy-kpat-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kpat-14.12.1.tar.xz";
-      sha256 = "02bh34553r7k0vf7sb5nsr6zgmh1xfgyjfyfc22yvknpmz2zz8wb";
-      name = "kpat-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n8504ljfha2rq1r0lrpz0gyyh59rpjln-poxml-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/poxml-14.12.1.tar.xz";
-      sha256 = "1r0iqqszmqmjnkq41xv87sc601fm8s94ga9pn37alni7f7qddfrs";
-      name = "poxml-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/m7ia6872rxwbpx88zidqanf1wqni1az6-umbrello-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/umbrello-14.12.1.tar.xz";
-      sha256 = "0kr60kdfg2pl049n4rkksfs6160jijxdwymx60gj44h8w2dxrx6c";
-      name = "umbrello-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qlj342akja4fh4yp2fib4v4bm3kn2bmg-krdc-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/krdc-14.12.1.tar.xz";
-      sha256 = "0jqq60spxb64m9y37q2wd7w1z3h0c0hcjvd6wi694v0zhblg5622";
-      name = "krdc-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/39r333hqffzycjszw3wbash4p8cs4vrc-ktimer-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktimer-14.12.1.tar.xz";
-      sha256 = "1p4y1kx3w6rqwjnhpjx17246w8gp7l8q2212x7khs8karnfyvxh2";
-      name = "ktimer-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p9al8bnc7cy61ccnbmw5vzbvg36rq3yl-kremotecontrol-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kremotecontrol-14.12.1.tar.xz";
-      sha256 = "0rvf73bj6l7cgbjcpn2bgy00zpdw4sj5zcchgl42xldl75zzr6mc";
-      name = "kremotecontrol-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qsdvwqqp7pwbh2vdi5p3w56snysf94f8-kde-dev-utils-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-utils-14.12.1.tar.xz";
-      sha256 = "1wpiarm8h4y5yjrdrxkmndps06h08vql70n63aai8crdvgwixdqy";
-      name = "kde-dev-utils-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6ic12j8bm99jckl82p347717mrhl5v6r-knavalbattle-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/knavalbattle-14.12.1.tar.xz";
-      sha256 = "1jd4b2kmlknh1xz055xysasfs90810m8sg4iwyzqv2j5kj8i4x4l";
-      name = "knavalbattle-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/72jv9b0id1ql2pbz8vdcm77n7s7br3vk-libksane-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libksane-14.12.1.tar.xz";
-      sha256 = "0a4hp2d0h26nkggmkiswywlw0aj5wkk8c6s9wy2h7m7qcmyq4gk0";
-      name = "libksane-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j4y0bpk9zir6270cmxmfxn10bphgbdw8-libkdcraw-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdcraw-14.12.1.tar.xz";
-      sha256 = "0svalln7g862d6f5k76vdggqc1h1x9gagm6v56yzr9dypz81y40m";
-      name = "libkdcraw-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xl2fn6zcfr99ir7l10y8dd79ns4msgyp-blinken-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/blinken-14.12.1.tar.xz";
-      sha256 = "1fvgq57qhx305qxmhzm628p283dyk9nnp33q5vgcxxfw726mi5pq";
-      name = "blinken-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1v6hadh7m1i58hc62c6z2qs2ycsi02rw-step-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/step-14.12.1.tar.xz";
-      sha256 = "15wlgig9b932ck1hwdld0q8nh74rh820wj4nc6ifys83wv43jnzh";
-      name = "step-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0invqcgsx7scwmihagccpgdfq3aa52w8-kdegraphics-strigi-analyzer-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-strigi-analyzer-14.12.1.tar.xz";
-      sha256 = "03lajpwia7fmlnr9l0g44knwghz8b2i70i659nkvypw6qd89cccr";
-      name = "kdegraphics-strigi-analyzer-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rjsmd2babmjdbwvr5n5gv1f9wcag4iln-kde-baseapps-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-baseapps-14.12.1.tar.xz";
-      sha256 = "0l31842mmriirkcqsdmj7s31yjwr5im8di7z7dfjgjqy0j1q1jzc";
-      name = "kde-baseapps-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/h2hcdrv66b95ajbj5wrz1aspq4fr85pd-kde-dev-scripts-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-scripts-14.12.1.tar.xz";
-      sha256 = "0g3i26vm3n2jc69mpwy94b60ff9c6fsr4yrl1h4f3408f4g4sjj4";
-      name = "kde-dev-scripts-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8kf7fxqm2avmamkdidsglx7rvl30cj1n-kollision-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kollision-14.12.1.tar.xz";
-      sha256 = "1l2c34l95kj4f8y156yirc35vfb2yblnkkjq1bfkmiavsb6vzhd5";
-      name = "kollision-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/82jk65vx3xpg2ydn3fzg6v2w07xgihhc-kgoldrunner-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgoldrunner-14.12.1.tar.xz";
-      sha256 = "0sgr2034mr5gmmg81qp9sqjw2sn2cgdw8bl9dq2iid43czih5zbw";
-      name = "kgoldrunner-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y7m9zzkm4wz23myj568sdjpn86f6m4iy-kolf-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kolf-14.12.1.tar.xz";
-      sha256 = "0arxis9q9qzbv35qq52pl4j5xzqhdwypjhxwdiqammqksdnln8lw";
-      name = "kolf-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8ipl9g3hgm04x1xpvyy8ahlbvjq6birx-okular-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/okular-14.12.1.tar.xz";
-      sha256 = "1my3d91lm6wz8gh9g7pw4rrdxkc22vr9v02b22qqvxb2z8mdq5cb";
-      name = "okular-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jl34m0f1m497dpwnmmw2svy9ig9x7x5q-libkmahjongg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkmahjongg-14.12.1.tar.xz";
-      sha256 = "00s4akfgr33n1bg2bds1fxccnig9hybm95qq95ii6ky4jyjc6b78";
-      name = "libkmahjongg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ab28gj1xwh9calkkf87xqnh84x8cjq08-kbreakout-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbreakout-14.12.1.tar.xz";
-      sha256 = "1cvqjch9ymjii7xmlg1clscbv6245m5bnf77dxz6nkzsrcy4khbx";
-      name = "kbreakout-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8bfm6nbnd3clpdy108yab44vv7552c1i-kgpg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgpg-14.12.1.tar.xz";
-      sha256 = "0cfhmlp200dbhdkckf7xvfbfsz985zw7vp6vin4w378dzyw55lmb";
-      name = "kgpg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/lfsycaw8n7kjsbnkga24cfqmpr0rpff8-kscd-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kscd-14.12.1.tar.xz";
-      sha256 = "0ag9i649ah627b5xsacvz1q05pijfrbwrg34bpcc61px9zsgk18l";
-      name = "kscd-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5avv44x780sz0v874cl781k7camn6xcj-kcalc-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcalc-14.12.1.tar.xz";
-      sha256 = "0qsfllwhn1gd675k5fxbfcfflnn86cbh3nzn70bc2lmxmwrlzbj2";
-      name = "kcalc-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qbgn1hkh15gv93wbrfg2bh14zsfgxfva-kfourinline-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kfourinline-14.12.1.tar.xz";
-      sha256 = "0mhykajapvbcrasadyjjjz7sps3vmmw1hhijfjbswkb62ikmwc6k";
-      name = "kfourinline-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s1m8hz32vjf2v38p2rkznrx4mgn6rzr3-picmi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/picmi-14.12.1.tar.xz";
-      sha256 = "0nrg4qza4h99k59w92v3qy68xlkdslqrlqi62fg94i88rl9l6ypq";
-      name = "picmi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9mqr7imp19hgjl7bn5sbp2d3xmgrr3p1-kdewebdev-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdewebdev-14.12.1.tar.xz";
-      sha256 = "0iv2r5vxkk8bg8p2zpq2dqnq0vvwhmjls0gdg30gyc4w04a7jcqr";
-      name = "kdewebdev-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/nx62f1snc9d786yi1vsh0vzixkgrv9gr-kmines-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmines-14.12.1.tar.xz";
-      sha256 = "13f070kh0rfs5pmw3lnlwxwvx2ph2q8n1vm9lvr6kw1ablngiacm";
-      name = "kmines-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/syf2l3yk3wga82cyak82janjsjhgvbd5-filelight-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/filelight-14.12.1.tar.xz";
-      sha256 = "1dzcgric6rxhxhi84lgbsmkfk6s6b96px8019njnp744jys2ikv8";
-      name = "filelight-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5nkk3cqvi177qd3mq0n687r5swcrixfd-amor-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/amor-14.12.1.tar.xz";
-      sha256 = "0p0fgp3j6x1f83kxdvmkcy4ladhg206m261fbpa92zyxp2ylnl0a";
-      name = "amor-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6pbb85yp6xhd3x5w0a5ql6ms10yj1pj3-kdiamond-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdiamond-14.12.1.tar.xz";
-      sha256 = "12frpi62f4w86ygxa68dvx1nj8n7w7lsgizfdyc6lix6l5vfzn7x";
-      name = "kdiamond-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/89l402jmb83ji7xvkz82kz024l012yaz-kteatime-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kteatime-14.12.1.tar.xz";
-      sha256 = "0my0fjiblkkfy2148axc7gp1nsx5lr2y8zn6d2labai2f6dy1bpf";
-      name = "kteatime-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gjxwckkx3mikzkpxs7vzk830nj42fj6q-juk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/juk-14.12.1.tar.xz";
-      sha256 = "0wzjrk5w5y0f6bc98pr7xni1j8krdyjsk3agcwkhb4d4c0aa5gka";
-      name = "juk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kdk1frzcpvc11ln0vamc6m0m7h1xfnj5-mplayerthumbs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/mplayerthumbs-14.12.1.tar.xz";
-      sha256 = "0z9iw1syv61y4fb4dlr9n8w78ri7wpznys5bd5sn0hxbkwnavs6b";
-      name = "mplayerthumbs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/v34rq3l61yyxsml99xp18adg85ki53r1-kget-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kget-14.12.1.tar.xz";
-      sha256 = "1jr15bcc09pypihva7pjsq6rlj0kqqhqvprxdggmwa7fnyyjxrg4";
-      name = "kget-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8l4frnslphg2rbpmaikwi0j7w4hfw56r-libkface-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkface-14.12.1.tar.xz";
-      sha256 = "198z0n286qnngrln24s1dfghkddz5zy7qr8af0jkywxdj3j2ks3a";
-      name = "libkface-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ygwdm76ijc39y3blkfl7s6g21328dk1p-kcolorchooser-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcolorchooser-14.12.1.tar.xz";
-      sha256 = "1yw1cxg2caddncnhqyck1fh7g43svgcb8pb15wp5rz7qqs0p65mf";
-      name = "kcolorchooser-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2iwy70md4cqg461x92sbxwbfzmj4y1xz-dragon-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/dragon-14.12.1.tar.xz";
-      sha256 = "0wqmjb7zl883mcmx4x8ss0x64r79wrphfxkyva6sifcy596y2wxh";
-      name = "dragon-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5n1arbyl0fjp5b5xdlgyha4nwpxbczyz-kjumpingcube-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kjumpingcube-14.12.1.tar.xz";
-      sha256 = "1h7nypr5b8b5az7c2gszihlhq9k2dn92cabjmif9rlkrvl6nahcy";
-      name = "kjumpingcube-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fxh9hhx7z5bv151xrxw26h91pz09lw9z-kapptemplate-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kapptemplate-14.12.1.tar.xz";
-      sha256 = "00df6ckfaglnnxizzqmci10h8hiqjv0fgi8xb3x4d3aszb049k1y";
-      name = "kapptemplate-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/16zwzi9y1215imff1phggjza00j9y4br-ksquares-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksquares-14.12.1.tar.xz";
-      sha256 = "0b1av02srxfd9ji51f2pcb5phmlqdz2lzik1n97yzn6f0xh19h9y";
-      name = "ksquares-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gfficdhz1w80xmvn9842jx1fwpd81lqi-bovo-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/bovo-14.12.1.tar.xz";
-      sha256 = "08in3ppksxp7zdgrv5lvjxzlvc6srfjcicagqbj2r8nrfmngjlim";
-      name = "bovo-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pafvmq1gg81mjpwyf388k311qwf7pgcj-ksaneplugin-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksaneplugin-14.12.1.tar.xz";
-      sha256 = "00bsd58kfvhp36rbwsmbk3yqjx8gca3r42q5z3fvd0jpf7y8xxip";
-      name = "ksaneplugin-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n25f8hphjdbwbk9z488i4bjmfai5vzsx-rocs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/rocs-14.12.1.tar.xz";
-      sha256 = "033irmbjs6d8q7zdvz7vzx61d0gmgxb96cypwlwjmww1czgy9zcg";
-      name = "rocs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ikirdy65sp1w2w38p28nkzic0zhw5iyp-kompare-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kompare-14.12.1.tar.xz";
-      sha256 = "1js49gfffbv6nplr907dkcq3j6xi6h1276n0fbkpd7y31cca6mi7";
-      name = "kompare-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4zh8mah5lsisbnv07nas6wqv6xvsqzy4-kalzium-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kalzium-14.12.1.tar.xz";
-      sha256 = "180qq9h046hax0jl13iy9mzbzhn66y41p8cj5447qgrnjbdk5qa8";
-      name = "kalzium-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1pbw74v9j5r9x36b2r7yq5k8n9fbcvwz-ksudoku-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksudoku-14.12.1.tar.xz";
-      sha256 = "1majccia02g7icqh8pad3m91nj94j228s66v25szlwacg2zc86zr";
-      name = "ksudoku-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2ifpmknn9aw760hsz4j7cf7kc6x704hl-cervisia-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/cervisia-14.12.1.tar.xz";
-      sha256 = "1xgvk1qar2mg5awkwsc0wzyzmskgv9r6bgbczyy0fjjd9xh0mp75";
-      name = "cervisia-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3qpkmwxn855x58k5za6r67rniyzkj006-kcharselect-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcharselect-14.12.1.tar.xz";
-      sha256 = "0rb4dr7ygiks45c73nwab9wg9zdn1xgq93yhkpp23bkfq9ca7z4f";
-      name = "kcharselect-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mvjdshn07gw1jn31y7igfzrzdmkpw98d-kbruch-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbruch-14.12.1.tar.xz";
-      sha256 = "180gbax6lrn5qr1l7x1c3i0i2kh1by4j80bif66jxwra505by50z";
-      name = "kbruch-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y0pg73qfkvfdrk3r7xz7yfgzl2s24vg5-knetwalk-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/knetwalk-14.12.1.tar.xz";
-      sha256 = "00b2zkiv3i99k6ri3xljas2fc2ihri84cmckgwrzvpxbdha8wpj8";
-      name = "knetwalk-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7vjjf69hw3kkwxmnlxfcg44wh7yy1s5i-palapeli-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/palapeli-14.12.1.tar.xz";
-      sha256 = "1zdbhn7dfrzb18k3rjgm934gjib5kazkgblsl15jxlzw2yfy458i";
-      name = "palapeli-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mk87jrnhqgcarmc658k4f2fpm1181i3g-okteta-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/okteta-14.12.1.tar.xz";
-      sha256 = "1mw32cjj2kw36frki26nycwi48p1s0wi2v9h85v9dwgk6235i7d8";
-      name = "okteta-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1mbdk8jijasnkhrzavpv89mzbfrz9b6n-ksnakeduel-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksnakeduel-14.12.1.tar.xz";
-      sha256 = "14ryx9ydwi23lhf5xr5mn77ixzkirwdg43mrh2cc0rnq440mzalv";
-      name = "ksnakeduel-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/nky571v70dk45hy9jfvii63amga1qx55-kdelibs-4.14.4.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdelibs-4.14.4.tar.xz";
-      sha256 = "0h255hhl46r7ax9hm9sr7qddljwzfky2ssh695ml3svfwg52mihl";
-      name = "kdelibs-4.14.4.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6sfiw6s55wnsnsyh0sas9s3f8fbpwnw4-kdesdk-strigi-analyzers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-strigi-analyzers-14.12.1.tar.xz";
-      sha256 = "1bsf1dgb2039jjzqy6pr66yw08kxbn5xpna0bfmrbiw4pprlmbi4";
-      name = "kdesdk-strigi-analyzers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hcxrbw696pca5z4p95ws7373x55bi9lj-svgpart-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/svgpart-14.12.1.tar.xz";
-      sha256 = "18r6n6wh8yg5wmd5wyc8sf6k994ghfknanlp7l1pcqwqa6wfv6rx";
-      name = "svgpart-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dazj5495njhw8bdyizpx0af9r20bvj5a-kdenetwork-filesharing-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-filesharing-14.12.1.tar.xz";
-      sha256 = "0id8qmr432ygkfmcq3mfr3zv0w58393w0z5pd86k8nnkz43nh208";
-      name = "kdenetwork-filesharing-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/11nyk47q1i4qh92kdzw3l6gi5nqhja5b-ffmpegthumbs-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ffmpegthumbs-14.12.1.tar.xz";
-      sha256 = "1q6ayhxrsq3y5yvrawsvr88pzl7vcz5ms6dq0sgd4mad83kwl5yj";
-      name = "ffmpegthumbs-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5y3gdnaa0a8nhpd5a2abp3ixcdnmg9im-kmix-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmix-14.12.1.tar.xz";
-      sha256 = "1zk1c1m1zihb4wih2330a95gd1skakwsx0vccxp8np3nsh71z3fa";
-      name = "kmix-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6h2dlw28xi87axxdglbkjz2jyjl78ijv-audiocd-kio-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/audiocd-kio-14.12.1.tar.xz";
-      sha256 = "1wi3mwx9v7lh71ciar29c1bprwh2lgq46yq3kx5gq7wz20cx54hh";
-      name = "audiocd-kio-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/awrjks0ihywpqygz8aqwrxn53yd8sljb-lskat-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/lskat-14.12.1.tar.xz";
-      sha256 = "19q5qzfh1dczkdz612hw21849h438dhl21ghbfm5hi5m04vmn8rc";
-      name = "lskat-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kk2rlvdl5hm4b0ms3i5pvs1r6lh5ipbh-kmahjongg-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmahjongg-14.12.1.tar.xz";
-      sha256 = "1pbq9f6zb96v98sz94kz979z5scpqzvc5fp4nxs2dg1rx1la8qxl";
-      name = "kmahjongg-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.15.tar.xz" ".tar";
-    store = "/nix/store/pmn8vgwjdszsl46pra65vn5i7pxfj7g4-kde-workspace-4.11.15.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-workspace-4.11.15.tar.xz";
-      sha256 = "1y7df6mar72lzy1dan7v5wwgf2w669b0hkrdb6ai1s3whmqr611a";
-      name = "kde-workspace-4.11.15.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1l6fwf3bb28myf3k3hsiv27gk8ar6gz1-libkdeedu-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdeedu-14.12.1.tar.xz";
-      sha256 = "03jic27ghfz2gpbn2nb69qiiip4vgy3y4as8qx328cl39l5vh8d4";
-      name = "libkdeedu-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wvgsj2m324xic0rjr6kyi7pfwqnfpmzq-ktouch-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktouch-14.12.1.tar.xz";
-      sha256 = "07z1nkyc4hxjd39pczkv1z6dxdjn3334wnv778mdrf98lm77vjxd";
-      name = "ktouch-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wgjmvym6jg44xr5mzgw3pb77w1ya8s2h-kblocks-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kblocks-14.12.1.tar.xz";
-      sha256 = "0qk5g5karl29g4hbpl7lfgahv71as3mj6j604cpd2wiwma05qa2s";
-      name = "kblocks-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5ppmqjmqizw31x1yjnzmicybln433l9a-kqtquickcharts-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kqtquickcharts-14.12.1.tar.xz";
-      sha256 = "026am7l64m721vv3l79z6v3avxq94z1vrzx1ifwf8p001inf4ydy";
-      name = "kqtquickcharts-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1nwklpfvdggaxadjc3396j8qgwdl619h-sweeper-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/sweeper-14.12.1.tar.xz";
-      sha256 = "0c3kqnjwi5q24k7b05dr5mygd3ps0r1s9cbs49r9zikswz7gky1d";
-      name = "sweeper-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gcj1qvbh1m7hbbyfdsl1nypc07nzy0yn-kopete-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kopete-14.12.1.tar.xz";
-      sha256 = "1pkgzlq7scz0pvmn2dis128rh2hdfxhbg6imn4mwrizmlpaycb98";
-      name = "kopete-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/w5dhnrmkm982i7kw1j9j5rf09z22cka9-kbounce-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbounce-14.12.1.tar.xz";
-      sha256 = "1x726x5x6cpdnig0wmam7zzigj33afwswdmxxgspnpimkybwpy0f";
-      name = "kbounce-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/cxxfxxpmnk70i9cx0cgx7k6jdg32s73f-kanagram-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kanagram-14.12.1.tar.xz";
-      sha256 = "07lz09armwr4j594pn30d617ngxcn8n3yxikm79ck5020gx4wvgx";
-      name = "kanagram-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5jhzsqxdfzh1zw1d103np2rm34jdj945-zeroconf-ioslave-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/zeroconf-ioslave-14.12.1.tar.xz";
-      sha256 = "12ri1dbbzc9dwx2n843979yvh93a9yrzpprk9jdmjr1hkna8rgmy";
-      name = "zeroconf-ioslave-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zcxv7zv41p63pij7d37wdp4hcll77ldc-libkeduvocdocument-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkeduvocdocument-14.12.1.tar.xz";
-      sha256 = "0nqjcddjmapgadlkv97banjk5fh7p355hfxcbspksyndsgplz1hv";
-      name = "libkeduvocdocument-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dv7j6rb4688zzlp36l45f2h0vzykvybj-kmousetool-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmousetool-14.12.1.tar.xz";
-      sha256 = "0k38qj2hv9k846fba4sxdg1biplbdn5hfmfhx5qmc6g6h8xrs2dr";
-      name = "kmousetool-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dqi11m0gnkyrfppdlibvgv2gbycpjqm6-kolourpaint-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kolourpaint-14.12.1.tar.xz";
-      sha256 = "15vkd7i35myfi9m11p52g8x7dlkvf06fa400r9vbw321fza2gyjc";
-      name = "kolourpaint-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zl0qg5scvgmzsq6c7l4s2rs4dh6v243h-kgeography-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgeography-14.12.1.tar.xz";
-      sha256 = "04g2sw2r1i8kc85n9igk15kmk3hc8gdci52lxk4ca04bxcif7061";
-      name = "kgeography-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1cknwl7y4djaq1cwjj3g38k8w8gi6zwc-dolphin-plugins-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/dolphin-plugins-14.12.1.tar.xz";
-      sha256 = "0sjfm5ry54h56vbbch11js50a70pvwbkinyxxgyvs6g260ngpkx2";
-      name = "dolphin-plugins-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rbc1h7c1v7bdzgwxqw5xs2x19rn4z9q4-kreversi-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kreversi-14.12.1.tar.xz";
-      sha256 = "1011262n5zh6hji7xxgq3k2hkgh0hqhpvk9krw22plda4nww2xwc";
-      name = "kreversi-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/rwsx6c3s4nc7vkcfk0c39jbp7f5f0rvp-kdepim-runtime-4.14.4.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepim-runtime-4.14.4.tar.xz";
-      sha256 = "08axhahiqv77cr6ssvh1cadqjvv1064w5l94wxadnyq3vz8kl6kz";
-      name = "kdepim-runtime-4.14.4.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5caacq7s0yh79mqykwj5wydj3b5gyl83-kdf-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdf-14.12.1.tar.xz";
-      sha256 = "1cvd7ydk277crv1wiw7sn72mv9lf5pqk56gylfmzr63mr7dyj5iz";
-      name = "kdf-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8dl8yv38wpv199jjgw3kdl8rajxnnc77-kiten-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kiten-14.12.1.tar.xz";
-      sha256 = "0518zbvgn3w00b7lxfivrgrp8xrpb09rf9cf9zdxdl2z37gxmvmv";
-      name = "kiten-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1widcjdd8hzy1dnabg9px06yjc0k7ncf-kdenetwork-strigi-analyzers-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-strigi-analyzers-14.12.1.tar.xz";
-      sha256 = "1xdb3hm7iad2wvbwqaa5bbqzgg6xdbbv68xfjajpx8k9cn20kh9r";
-      name = "kdenetwork-strigi-analyzers-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k4y83g821js66c35bc6x2r8m1924vd4f-kcachegrind-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcachegrind-14.12.1.tar.xz";
-      sha256 = "01fa9b73ymym5qyd5lirb4cf6c37x02a1a9ls2qgzswflm557d49";
-      name = "kcachegrind-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/plbszpr250pr7x41578a4b5n329wgl4l-kstars-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kstars-14.12.1.tar.xz";
-      sha256 = "08px9765vl6hpmy39wyhlbm4d3y5wh82w33g2fppx4d9bxmpz166";
-      name = "kstars-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/shap58rcwhg13766v7zm28nxr6rn09gw-kdepim-4.14.4.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepim-4.14.4.tar.xz";
-      sha256 = "0jpbc84xv07j2qynkn4mhmwlldbmjg6v7dqc1028kfk7sbcahhf2";
-      name = "kdepim-4.14.4.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c4m2nwfbjwqgc9ydq6macg4zkmrsd7v6-ktuberling-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktuberling-14.12.1.tar.xz";
-      sha256 = "1ghymw6ljvkd9wi4j0f1n8gjkhxfkqvmb8n36lasrfr27v57z68v";
-      name = "ktuberling-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rnz72ryzp7mcxk83l71rw7br3k6hamr9-kblackbox-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kblackbox-14.12.1.tar.xz";
-      sha256 = "0cxyzlsvhw9rg3b9c558zbqr3ijbzyx5as9g92ald8w7qjja5jnv";
-      name = "kblackbox-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c3gmynlqgyhdx3nghhwgk8i85qqysjsj-kalgebra-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kalgebra-14.12.1.tar.xz";
-      sha256 = "0pn4scp7y7ih60jaq39kanwgsc2aslb41v9xw8322kk8q4gyc8g4";
-      name = "kalgebra-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/53ksfs7gxzr33sgdbfxk4ydjzzl2c7y3-kdeedu-data-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdeedu-data-14.12.1.tar.xz";
-      sha256 = "0hyqwkva7bgi43fgad4caz8q4pcb9kx5czpc3d8nksk5q28a1llg";
-      name = "kdeedu-data-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ggvs29ryi85ig0r9z3jq259kvyq1k1h0-kigo-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kigo-14.12.1.tar.xz";
-      sha256 = "100rrip6w08ld2xgwdm2dryk8qa92dssdz0a0iykgklddq6dvxr1";
-      name = "kigo-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p445xkdbm1dqqb3p2x10rag6xccidp9c-print-manager-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/print-manager-14.12.1.tar.xz";
-      sha256 = "1ad9a23cfivyzfgajg1bn10n2glp2ks8yqkl5f0xk5alyldzbir6";
-      name = "print-manager-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1hx5ws8bbzh0lnmjp0x8ln1s7rv3x62a-kshisen-14.12.1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kshisen-14.12.1.tar.xz";
-      sha256 = "1b0csn1ngpcwcl8iwv02hy1gb6hk13453khzgya6ckixk5szcdy7";
-      name = "kshisen-14.12.1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/w24lqbmni5n7w2xdmw1khzixg9f2p64m-lskat-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/lskat-14.12.2.tar.xz";
-      sha256 = "0c5zg0lkzcgf7ff1hqy6rh8cq5z4935p7rmm463pl933djpbl5bn";
-      name = "lskat-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1w6n38dac3mslyfl5blf1cas013m9h8g-kpat-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kpat-14.12.2.tar.xz";
-      sha256 = "1rhs752b3ncbpbmrc9zknww0dsihh3lvwvh629v1s6xc0vqvcar4";
-      name = "kpat-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/738qaln8qxvsdnqiy6adk9sh28rfjkgy-kdesdk-strigi-analyzers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-strigi-analyzers-14.12.2.tar.xz";
-      sha256 = "08db2nhkw265i2dfbka5q6vm7bxbjywk1p52hhjc57a2qvqfb5ww";
-      name = "kdesdk-strigi-analyzers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fl2nm7vv3k36vyf2wml8pv4sskh53ycr-zeroconf-ioslave-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/zeroconf-ioslave-14.12.2.tar.xz";
-      sha256 = "0jx35018amdcgmxi9c7alc4c80qywzakqdrzyq5i7jxjcl3y1ly0";
-      name = "zeroconf-ioslave-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jrmw028qjd86q4mjyasx64iyssaj7wk7-kmix-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmix-14.12.2.tar.xz";
-      sha256 = "1jx2mkrdx5jgrjr02snb199xradpxaw42dw8y7icbpmkihxmxry1";
-      name = "kmix-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g87b5njzgp7jrydvwvc2xwpnwv0p33kd-kmag-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmag-14.12.2.tar.xz";
-      sha256 = "0bcrr67v6h9vc69341b662z7dbgxm3yrazfkfsdlxp1ahqspl6w5";
-      name = "kmag-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/35izrbqhb52zlfs2x1qsjc0k1l2d1pkk-mplayerthumbs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/mplayerthumbs-14.12.2.tar.xz";
-      sha256 = "1kwpd3j64zm78qwn42q3kgipywdlcpvibng06x032yv6i8wmi6m1";
-      name = "mplayerthumbs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hqsma0ww8philxqp1hk22sk3lf711y4i-kbreakout-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbreakout-14.12.2.tar.xz";
-      sha256 = "12y03rbm13pg1c8xpgclklin5vjzsidyaiamhh5bqpqsxsqcnh5n";
-      name = "kbreakout-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cixkkb370365vic33rl9n9846ll44rqx-kreversi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kreversi-14.12.2.tar.xz";
-      sha256 = "05zkwswpy5sw9ab3gc012pgvl0wq8f2lb0qhdr96rvxgp8m273j5";
-      name = "kreversi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xmvafr9hszzwndqazdzsn9i90cwi0afs-jovie-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/jovie-14.12.2.tar.xz";
-      sha256 = "0yfn5n3n3knacvpr3cqiii0hldbxc6m09k1g53hlksay61s2r56v";
-      name = "jovie-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yhs96yv9mv61pp521mpay8i0dgqlmm1y-kde-l10n-sr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sr-14.12.2.tar.xz";
-      sha256 = "07f8x34q8bdcsvc3a76zpd0sjxnq5ja6ghl3d9a0a4ix0hyyv8zd";
-      name = "kde-l10n-sr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l2499bc6hfv5x284cs4bjvqbmbxr0aij-kde-l10n-hi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hi-14.12.2.tar.xz";
-      sha256 = "12ky5zmds18n2sgivrnpds8qjkd64397ia9h8h9s5s9l3cwgipb2";
-      name = "kde-l10n-hi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kpcnzwp6wg76slwd2zdmzmg09iydims6-kde-l10n-tr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-tr-14.12.2.tar.xz";
-      sha256 = "1d326cxhfx0434x45lq9wgn5csvmclgd6fmyqzwlax88vm57gg62";
-      name = "kde-l10n-tr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/p36g7i6w8hgsz3wdax3ldxzv3djmw258-kde-l10n-pl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pl-14.12.2.tar.xz";
-      sha256 = "0knjhk0941qf28l4izz2ssfri88s09k0vxd3d6xblg51r6m0b2sk";
-      name = "kde-l10n-pl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iyab41x341l7b1acprqv7azbdbxbd0lw-kde-l10n-km-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-km-14.12.2.tar.xz";
-      sha256 = "108pcxflcbhisixivg6153sm8rrbdrrh6rbvxib307dh1q1sl7ix";
-      name = "kde-l10n-km-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sqlfyy4bhzgnv75msvyv2m7sx8vwhb0g-kde-l10n-eu-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-eu-14.12.2.tar.xz";
-      sha256 = "0x8dihag23ljyw50qpg3bqyhfg8p4f6k1daz2102wkqdbwhzk1ch";
-      name = "kde-l10n-eu-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/63qi174y5jw1cs3q0wzb5jk4j64q4zqp-kde-l10n-nds-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nds-14.12.2.tar.xz";
-      sha256 = "1nyz71cpin9cqffjaca9wv9s5v9n358agb1ncamg5iqj176cxvrl";
-      name = "kde-l10n-nds-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/f4jmy4xgm9a50a4r6nlvjz61ihw3w14j-kde-l10n-et-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-et-14.12.2.tar.xz";
-      sha256 = "1a4kih4lb4sqwasvqhqj06r37rj00vjlhwihlr7jk8z373yg6kk3";
-      name = "kde-l10n-et-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/j4jf2n3bikb23kzg55i538jjhz7gn2jx-kde-l10n-ko-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ko-14.12.2.tar.xz";
-      sha256 = "0vv4xdis64nc66i81fnilnkl8max6wm07kzwiqahdnrbrza8vqab";
-      name = "kde-l10n-ko-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ha5w0palyj9b7ajwd5xdqppgjnx1vsv0-kde-l10n-kk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-kk-14.12.2.tar.xz";
-      sha256 = "0bvghaggmzm8a12gl2z6ykgf8qabiagjmmddiqihbnvdi27ia78c";
-      name = "kde-l10n-kk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9cjm0q29zj5p7if67m6ax4vp9bsp1xmq-kde-l10n-hu-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hu-14.12.2.tar.xz";
-      sha256 = "0s2h123kbylc9ijxv6yfj5l593zgy5ar843rn82jjpvfbq3qj11n";
-      name = "kde-l10n-hu-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca@valencia-14.12.2.tar.xz";
-      sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv";
-      name = "kde-l10n-ca_valencia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l1nsi3pqrb0wv2v650sa8xax75kpinxx-kde-l10n-fr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fr-14.12.2.tar.xz";
-      sha256 = "01lkgx857vmxl90si1b55gyz27iqdbk7qkn5v40n356zzaicrxva";
-      name = "kde-l10n-fr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qmf7y72b47pnq0b0gmxhw3slsgmy2awf-kde-l10n-sk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sk-14.12.2.tar.xz";
-      sha256 = "0diajsp56l6dg96m9nij834dmky1gh48wd8ji5zs37fvpmdc96r0";
-      name = "kde-l10n-sk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/var4wc2isqx94ay6lq8fnnynb1566sgm-kde-l10n-es-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-es-14.12.2.tar.xz";
-      sha256 = "01ha5db71rzkr3a0mlq80ag0fagivvjh26ck0y8da101lgl01i4r";
-      name = "kde-l10n-es-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3h7wyirznwm4zh6flqq1j2hacayvm423-kde-l10n-ca-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca-14.12.2.tar.xz";
-      sha256 = "1gcypc9l95iry45vh4pl1i7hwrdnm4lgnwnfnw1l7016lhgfjr8m";
-      name = "kde-l10n-ca-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca_valencia-14.12.2.tar.xz";
-      sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv";
-      name = "kde-l10n-ca_valencia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mi03yzrjslab56mj7qw22d2lzl2kk4pj-kde-l10n-cs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-cs-14.12.2.tar.xz";
-      sha256 = "0rb6wnw0944zpllm4cac063r7hl5rq28x3b5a6has0cz4mqk9jw9";
-      name = "kde-l10n-cs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9lw0j1h2pwvl1zpcl8cjba2xqc7lwkp9-kde-l10n-ar-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ar-14.12.2.tar.xz";
-      sha256 = "0nkv2pj4f3hjrv25l8kqm9cqv0j7h3crrzyqzq026zzz6znlq190";
-      name = "kde-l10n-ar-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ix18mmzjf395q3wj2qcbpm1z9jvywm4k-kde-l10n-nl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nl-14.12.2.tar.xz";
-      sha256 = "0izpvjmlh8yk1nnzpxa59n6lv4fk7575j8nwjapy0ynrknps4fff";
-      name = "kde-l10n-nl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xa7h417v8b57fzimvggiyfx7hys197kz-kde-l10n-de-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-de-14.12.2.tar.xz";
-      sha256 = "1y54csccymc7hpbsm8kjw4v9ypgvxqcqahwvan2x84fvn7p80inb";
-      name = "kde-l10n-de-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/44rprv2vwz090i48pnykzws4blyryxw8-kde-l10n-fa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fa-14.12.2.tar.xz";
-      sha256 = "04qxb6qaj1cb174m6svd83m34fv8hwws8v4a20igkh09b5bl3dsx";
-      name = "kde-l10n-fa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5051arszznb40q77d34zcwnaaxwv5wx1-kde-l10n-wa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-wa-14.12.2.tar.xz";
-      sha256 = "08il92kssd4d1zdkks4777pk8l2n3k4abv589x8rja4rlmpxrscq";
-      name = "kde-l10n-wa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hvcw01d444zkmyw1zpds2mnw7xmx4wca-kde-l10n-nb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nb-14.12.2.tar.xz";
-      sha256 = "1q461np49d0n0zhby9dd8knf7y3w9vi1r49bzlqwd1y4hb3alnms";
-      name = "kde-l10n-nb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xqqsvrfab53ybxfm0hq63bnlqpn6pz62-kde-l10n-uk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-uk-14.12.2.tar.xz";
-      sha256 = "0avr2c9drnkv7ndz9mqjayf6pivk6hbghmj6rli91lvqavjp6vlb";
-      name = "kde-l10n-uk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kc6d1lkncc3djfn8zybhz6xzz7nzickb-kde-l10n-ug-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ug-14.12.2.tar.xz";
-      sha256 = "17jizdwkfh3gfi9ykpszqw49fzswgps7xlbq9j8pjflyk36rya9i";
-      name = "kde-l10n-ug-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/35mka79zjlplbis7b6dhiz48wls25gc6-kde-l10n-zh_TW-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_TW-14.12.2.tar.xz";
-      sha256 = "0h3nfp51w7r601d6rpi55nzrmpywp3dalwqjwx4a6rnlawf3s2hr";
-      name = "kde-l10n-zh_TW-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qs4xzws3s0vamj17m98fxcqqvp8hyyw7-kde-l10n-fi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fi-14.12.2.tar.xz";
-      sha256 = "1q8j8v7i7lz3qk22adr1cj0bs6qw36540bj0vdzpa3390fn3i2ra";
-      name = "kde-l10n-fi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yz0rzw7m437glx49xdxp4zz7ic51g5nq-kde-l10n-el-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-el-14.12.2.tar.xz";
-      sha256 = "0wcbzs0s1nqafa0hi0abb17yw3jnxcq2mxyk4h5p9g7q7pkvh6s8";
-      name = "kde-l10n-el-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fcqsn91fsip4bi7y763y07i3ii4ji8zs-kde-l10n-bg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bg-14.12.2.tar.xz";
-      sha256 = "099af2qdxjy8whfaw0hzmlywb7l7bmpssga90xyahr7nh6l8vwnz";
-      name = "kde-l10n-bg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nbb6gg7pc3yzjxs3gj7l0363i5d1bq1h-kde-l10n-lt-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lt-14.12.2.tar.xz";
-      sha256 = "1lkjmcj77mmk6lvh1h51k8i9nn33b0q9vgbampj33qgax1d7a4mk";
-      name = "kde-l10n-lt-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/92dr7l2vrh1j4bxj2zy21prpfb1v9ba6-kde-l10n-pa-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pa-14.12.2.tar.xz";
-      sha256 = "1fagcrjjm7s0kpkfflkjx6rbgzprf7qidpbgwzw3jjf501vfdpkn";
-      name = "kde-l10n-pa-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2iqdi982l5gbh3ajibgznzxg6ryjn49p-kde-l10n-hr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hr-14.12.2.tar.xz";
-      sha256 = "11dabhhz676ria4nwvkx49igzm481fl9996j3p6rzd4kbhrksgq0";
-      name = "kde-l10n-hr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rfkj26fa9pi0mraxd8mgnh758dhp0m7n-kde-l10n-bs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bs-14.12.2.tar.xz";
-      sha256 = "1x4m0cksbiy25s8pynskmasy7kkzm8i8mp5dvsx3wsh0msf4pg1i";
-      name = "kde-l10n-bs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sw87zcl7ddd68wlws5689h7r7g5bbcgl-kde-l10n-ga-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ga-14.12.2.tar.xz";
-      sha256 = "0ayambdzdfnky6bwnk5ghnch18y4ran6inrb8v4i1c407zn74ydx";
-      name = "kde-l10n-ga-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/id89acc90qgfqjcidjfsx1sn62yk7c56-kde-l10n-zh_CN-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_CN-14.12.2.tar.xz";
-      sha256 = "0876r1bp36w0iljrlhlnxfizapvw0h2qmpjnf5s7vf5iisrvsbrb";
-      name = "kde-l10n-zh_CN-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rki0855bdgqwi8ajwmnl9jdm1hgn18xs-kde-l10n-ru-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ru-14.12.2.tar.xz";
-      sha256 = "0i2fb0fa1drg99m5k5d8sdv04g809c3dz507wlrb9bnmarapahhn";
-      name = "kde-l10n-ru-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xhqd4bxhv3p1mwr4j7h59858dc782ycs-kde-l10n-gl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-gl-14.12.2.tar.xz";
-      sha256 = "1mpzxlk93bf50ajk3m9ly19fdn34rnpznap6bad05zj9wczin9km";
-      name = "kde-l10n-gl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8p2ygqhbbzxmnrjjxyris3281bdklbm9-kde-l10n-da-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-da-14.12.2.tar.xz";
-      sha256 = "1lqs9fpp1dj8r0mpnjy8m7aa9jg8iv30k7wdpxpcf634m2p06911";
-      name = "kde-l10n-da-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gdrvx87d6y9q47alc0s2251dzm04wpdi-kde-l10n-sl-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sl-14.12.2.tar.xz";
-      sha256 = "01yj9wh5zr72vgxman2j49ihhcyxr2yw820g2cz68bbqh829riiq";
-      name = "kde-l10n-sl-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qcs4fdkjrkgva632nqyi1z24h517fvl7-kde-l10n-id-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-id-14.12.2.tar.xz";
-      sha256 = "1cc1yfps29fakra3xfnnzf6blqsydx4r9scsd0w0f8xxk3mr87j7";
-      name = "kde-l10n-id-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/klsqxbpagy7jj2ha51hqr7h9qpd4qg9s-kde-l10n-ja-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ja-14.12.2.tar.xz";
-      sha256 = "0i7x21yvj3ipg96jmfqs7kaixqa82f5s58mpi34vyypcc1ap4731";
-      name = "kde-l10n-ja-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lmg22mpi05l0944ihv9z72jg1i8xs2zc-kde-l10n-pt-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt-14.12.2.tar.xz";
-      sha256 = "123j4h4bhy0xdhazl18yccp17283k98s4f09f24r5b54yzw5cs0k";
-      name = "kde-l10n-pt-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pgw29ki339a22l9c7incm93qvmjhvwif-kde-l10n-mr-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-mr-14.12.2.tar.xz";
-      sha256 = "02z4hq74gxgvcnx0za74zlyx01m407bc3219wiqb88ly5b6g59af";
-      name = "kde-l10n-mr-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4p5v5j7l1j5xvz83jilwmmg22v5pl1y0-kde-l10n-he-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-he-14.12.2.tar.xz";
-      sha256 = "02lmsvdyw878hk55r5dqm065n3f1czgq0icspi25ibxgvhf0nmji";
-      name = "kde-l10n-he-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pzpmizw0hsfczli3wk7mihsad2ziwnjy-kde-l10n-it-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-it-14.12.2.tar.xz";
-      sha256 = "09sfiv36q40sy9w3nqld89lgmpd8kba6xav683a28a1i0ipsjjbc";
-      name = "kde-l10n-it-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/7gphdvwvll05pn6dn3wxydy66d4an0hc-kde-l10n-ia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ia-14.12.2.tar.xz";
-      sha256 = "03jkjrbgp59xiwrbj9hp55y3qhpcyg1gxwv0vcbvxaxpg1zg7s1x";
-      name = "kde-l10n-ia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6xryf5sf70rqzsp6zirfc85hbq8mq93q-kde-l10n-nn-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nn-14.12.2.tar.xz";
-      sha256 = "1wr73m10liqvd7fkq3gqh4y2ibwgm200cbk6dv58xr25jjh1ji2l";
-      name = "kde-l10n-nn-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zjdd8bp4639ylb7wr2h0a6zl4ka4hv5j-kde-l10n-ro-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ro-14.12.2.tar.xz";
-      sha256 = "0p4b7bngb3j2xsixk3s5wks7050famwbh00cgdpq8gd02i01iplc";
-      name = "kde-l10n-ro-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hm9hivcnjbbhxnr2k1p95lfa57y9qpa0-kde-l10n-is-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-is-14.12.2.tar.xz";
-      sha256 = "1fz1azj7z127zpf257hzavsd0r3k7j1gd3wgw5i9prr3n0xp589j";
-      name = "kde-l10n-is-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hp26lgcf3jrgcqsrai43kvimlpq9gs48-kde-l10n-en_GB-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-en_GB-14.12.2.tar.xz";
-      sha256 = "1vmgrbx31683j47na433h2sps961h5av1rkqrmspdpls32g3hjq4";
-      name = "kde-l10n-en_GB-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/y18jr4kswbh1qlhw83xyig9rri07yya3-kde-l10n-sv-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sv-14.12.2.tar.xz";
-      sha256 = "1a702cyyhg5dk9bmfxmpsyj4h9lk2hrm8rcdzwy6lmhvclgc4iqj";
-      name = "kde-l10n-sv-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bcssbybfddwdy45n5sfr8aw2a6xxpn27-kde-l10n-pt_BR-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt_BR-14.12.2.tar.xz";
-      sha256 = "0lvjzcpv6j4i3xavkcbjbz17mxzj59rqiq9gxhvqnk6wihzwr3d1";
-      name = "kde-l10n-pt_BR-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xszl4r8c43w086w15mf61lis5ar4ig24-kde-l10n-lv-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lv-14.12.2.tar.xz";
-      sha256 = "1i8xd2apf8gr657w8jzc2vj4s7izh1kpqnz1n75yk2b8gbr0aiqq";
-      name = "kde-l10n-lv-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5bknljgh37bx5v4c0vnmigasa3xq3cka-ktimer-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktimer-14.12.2.tar.xz";
-      sha256 = "15bar1j2var6i1jawq0nc4zkifl1qghciqyqavx39sm1cxphqirf";
-      name = "ktimer-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xmalh942dl6rygwk4jxpirabx2l8n0j4-ksirk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksirk-14.12.2.tar.xz";
-      sha256 = "0ab8vbk5640jaq6r0f0f5nidf0xx62lb140hq42flmid0hw6ls57";
-      name = "ksirk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hl424krxwgahhhykhwhq2lxmrjdvfrxh-kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-      sha256 = "1802iy6w5wchj2lj6b7yp32nj4pbh1pn44v2pvhafg0nj49rn0iv";
-      name = "kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sv2xx8whd4smmx447iaxg3akivyk74gs-cantor-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/cantor-14.12.2.tar.xz";
-      sha256 = "0hcxr28083qadm7b6pjqh959dvj79dvymkigxv851ainvspr82km";
-      name = "cantor-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ka3asqxgpas752w1h3agc2c1ka3brp19-libkdeedu-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdeedu-14.12.2.tar.xz";
-      sha256 = "0w7wkcr46fp3gidfgm4gp3q26vxp4szfbqmk4624ysrdi85aa6br";
-      name = "libkdeedu-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dw2kr8sgmcrw2p3vy1cqdq2jk93i7rmr-bomber-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/bomber-14.12.2.tar.xz";
-      sha256 = "12ff8rikxb1x7j4b5jg41ph5pgp60vn133npzalq5vsldmrgj3h9";
-      name = "bomber-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iifrjlqyrylq47kvmb7idgig4y05yp69-kopete-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kopete-14.12.2.tar.xz";
-      sha256 = "025pwhvcidszg4mv8hw8hya9xvgw08yvkzigxsk4pjn5vm49y16i";
-      name = "kopete-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/c1s7763fzbnnslcn95spcv0swp6gx3xb-oxygen-icons-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/oxygen-icons-14.12.2.tar.xz";
-      sha256 = "0dc0zkl7ivigcf5vf72gqnijm8p64bq4ibqkr02k8yv7yqq123wz";
-      name = "oxygen-icons-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ff917gin734l0i1w84xdq2s6hjkjjmwp-kmplot-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmplot-14.12.2.tar.xz";
-      sha256 = "1j7fnqi02pqwc0pgv0qgykm2hih5ncg7pbkwyskj5sds8xs86f55";
-      name = "kmplot-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jv7gpjyhacvmdvbdy5j34nrm06zk2aig-kmahjongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmahjongg-14.12.2.tar.xz";
-      sha256 = "0dc9majrsg2fgl8s8wqyhyjl3d40qf4m7wxx9m7076sa2h8hj4g9";
-      name = "kmahjongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/x3c14mkaxp4swyxaa7js7yq1rgrx7gvf-kolf-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kolf-14.12.2.tar.xz";
-      sha256 = "1yiq1sw6a74s8pq7cs4rl8rvawcb3rrw2kbwdgcaqvq0krgnlc8h";
-      name = "kolf-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/habi2k9mvpz6l5lj2i2yfig6ghxrkf5g-bovo-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/bovo-14.12.2.tar.xz";
-      sha256 = "0z20lywx4x4pqdbqqhz0m84vzml6kxn53sl17z0lgnf74zh0vqam";
-      name = "bovo-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qjs07i14179wq2gj40gcj99q0i7fgsmr-audiocd-kio-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/audiocd-kio-14.12.2.tar.xz";
-      sha256 = "1lix6yzradscrr79b4fj5lqs1f6wlrzyr0qwk5mvb9g326p8c4sr";
-      name = "audiocd-kio-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/byi9jaq7vijdfqzbqyyl8plk0mgb6cf2-kaccessible-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kaccessible-14.12.2.tar.xz";
-      sha256 = "1xq40cl7pqm65k9h3yvhn7zjb80z3lpqyp823wm6nz6qld4hr4bg";
-      name = "kaccessible-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/47visnxvfz3h8wa0485wiq5659y5li8k-konquest-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/konquest-14.12.2.tar.xz";
-      sha256 = "1h9ql9alyprh8ykfzfgj3nkch40hdp1vyfkshm5kaab15b657bgy";
-      name = "konquest-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ccx7yrjpgljpv0f61jlczmx738y7skpd-libkdegames-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdegames-14.12.2.tar.xz";
-      sha256 = "1pxq9gzw5m5i8d1v1d34mvmfr138hwfvq5z9pg2h9zw5y3hs9g7s";
-      name = "libkdegames-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/swpywmriiwy1npn7k3gcazisra9gfzqb-dragon-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/dragon-14.12.2.tar.xz";
-      sha256 = "0gd9zr9fj4r2789bi6f836y7m6df08p05vizdy04cf9s2hjkr9wy";
-      name = "dragon-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nsrq6d9bini4804hkkzsny91rfxcgp01-juk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/juk-14.12.2.tar.xz";
-      sha256 = "08brdx7hfm48hmhc0rg0r3c4brb3mkb0r23j2ps0y210pwarkwh0";
-      name = "juk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vjbvvbnqg3fjghc19159ikqm6yii6z30-cervisia-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/cervisia-14.12.2.tar.xz";
-      sha256 = "120a8brfllk6jybn4zpyj0w5bpv2dvibcqbh37qh9ld2h6v9rrr2";
-      name = "cervisia-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1nli1nsr1a3j7wprpjhwmmy418l6ibx4-kdesdk-kioslaves-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-kioslaves-14.12.2.tar.xz";
-      sha256 = "14vk4aqdwny4iidsvznfzss51k1376lp4v65bmqbpwf2kg6mis2s";
-      name = "kdesdk-kioslaves-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/cr9ncrb5lfgi7nyrdqlrh2c3xlj2a5rp-kdelibs-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdelibs-4.14.5.tar.xz";
-      sha256 = "1jizh61vz83za06mb23hhakx99jf2c59c02fz5kld9mnxzzl5fgm";
-      name = "kdelibs-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9vi7j77n4x5qpl4jphl3cc52cc34wymq-kmousetool-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmousetool-14.12.2.tar.xz";
-      sha256 = "06ifiay1mxcfb0bzzcf14xkvd4iwy9va37x3jm0xxhy9641cxq7i";
-      name = "kmousetool-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4v4hcxa9v1hykiypb159p0618nf0dij9-kalgebra-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kalgebra-14.12.2.tar.xz";
-      sha256 = "10iz0vjn8mscgkb0vra8ac0rbdyw45xzz5rydlkczr9w3hxnccyy";
-      name = "kalgebra-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ilynhcqbrfbhafhvmbag1j7nrkiicszs-granatier-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/granatier-14.12.2.tar.xz";
-      sha256 = "16v0pyjby6yyrqm64p4a0lkxf0bb50smkz680b1yp3mcc5nm22mw";
-      name = "granatier-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/64fb2pidpaccqzk5wddvvxma515fk6nl-klines-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klines-14.12.2.tar.xz";
-      sha256 = "10km97mbz9z816ki12jki46mb0h2829l24spiai9pk8mbvkyqx3w";
-      name = "klines-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1g8n4bq8p2dn5mvncb6a046kjmndgfpy-kmines-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmines-14.12.2.tar.xz";
-      sha256 = "04axmsgq3wcim5fs9jgwgbb9z7p0a96qxhm50s5dwk4lv6fhzzv9";
-      name = "kmines-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l32ji88v0j54mhvsqdg7ysqqalnwjx4p-superkaramba-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/superkaramba-14.12.2.tar.xz";
-      sha256 = "0y3ld6hpbjjqkpmrpbxmznv5vjdiyh3rw6dqbygap33qvw6b3d0d";
-      name = "superkaramba-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/67i12gxqd5p15vdl8b5a87xl28fn9aqv-kdiamond-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdiamond-14.12.2.tar.xz";
-      sha256 = "0g3al1p68q4ypdjrnq6sf738w84x3a2l71fpg7qb5kgpaixpspjj";
-      name = "kdiamond-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/inss9axxxz7szp7icfwsrms9jyc4c855-kigo-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kigo-14.12.2.tar.xz";
-      sha256 = "09b5hdfh46mi5qpgq0j02qw2wfrsach6lw9ydg0ybplyfvmp27l5";
-      name = "kigo-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5dh19ycmzai2k5xwgiwmpi05nn60k089-kdenetwork-filesharing-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-filesharing-14.12.2.tar.xz";
-      sha256 = "08parv67kilxh2nzgbmj3q9g6pzncjjr23rl6ylh3vv8p2vr2v5h";
-      name = "kdenetwork-filesharing-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/px8xd5vjs7y6g7h4vyyiksn818waffy0-kajongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kajongg-14.12.2.tar.xz";
-      sha256 = "1863hczxmzrwvkv2y7kj2anf56fpwih70plsa25mkmli6l5x120q";
-      name = "kajongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/670zy2wyah5qw0rp7kmzdv9q3hl2cl25-kdepimlibs-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepimlibs-4.14.5.tar.xz";
-      sha256 = "12p03dljr6sldl4pxww4gb18mrvdi61r85ippmljknr4sq26kd8m";
-      name = "kdepimlibs-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nqwz22sa222dkr9a6mmgyc2k9xahbv8h-ksystemlog-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksystemlog-14.12.2.tar.xz";
-      sha256 = "1j22944ham5x3y8qf7gka81nnq66f81lwrc65zmzvbf7vyj813kq";
-      name = "ksystemlog-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aw9ahw1ywy5m8k8j0a2l5qfg0n2n2yn6-kturtle-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kturtle-14.12.2.tar.xz";
-      sha256 = "087wfff2qpl2shxjwj30lna480skx8j1z4rlvkbyywc645gd0afb";
-      name = "kturtle-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6w3pnklzw2kd761dfg3ya4k0xawnyp27-kppp-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kppp-14.12.2.tar.xz";
-      sha256 = "1hdywnsvpybfc5hcja2msfdim9g37pgggkjp4kkahc9gv62z1m0i";
-      name = "kppp-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bbi9jdxjb1hm2cd6flh08h7ql90m9ppw-kde-base-artwork-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-base-artwork-14.12.2.tar.xz";
-      sha256 = "16jg0pm6wqqsl5g8hf55iacgxjh5x92shmf9263xpc1fiq29770c";
-      name = "kde-base-artwork-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iq6qjaw0n37gq49r4lmkjzyasvghcss5-artikulate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/artikulate-14.12.2.tar.xz";
-      sha256 = "09jvjal3r6bl77aby1wzbpyr4rxqmghc759yrg1rbqca1filzd5w";
-      name = "artikulate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dawjc253wxbw6624zjr0v2yrq9i47v75-libkdcraw-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdcraw-14.12.2.tar.xz";
-      sha256 = "0xj3dhyz7mf65dqiw2zz6mp3xmfaczmr7axhy0h6z1ynbyl1vkcm";
-      name = "libkdcraw-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zb2sqh3qjd53nmqhs9m24kag1f3dxiah-kdeartwork-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdeartwork-14.12.2.tar.xz";
-      sha256 = "1svw3ah03g751iy37i06kw4d6jzgc8yy9cjayf3xp80m37fpjlws";
-      name = "kdeartwork-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dmi1azffqm3c8gjk1d300a0a2jps2j4v-klickety-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klickety-14.12.2.tar.xz";
-      sha256 = "0rlp4bgzg7i892a89zrgaj0m1zwbb2g8ap9np3dpqljaf2la9rg3";
-      name = "klickety-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/f5ycj631mpfnyb8mngzxmvgngyk6lsw8-kspaceduel-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kspaceduel-14.12.2.tar.xz";
-      sha256 = "175n2jbx9m3yhsp10bj1fk9d2vfv2dlqd1qw7l3kmca5nr7ripzb";
-      name = "kspaceduel-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/49b5c3cm0ysi2w89a161ysmirpmckcls-kate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kate-14.12.2.tar.xz";
-      sha256 = "0n6b5jcyb428gx9xflsqjs1jhk51n12yxyfzl6cvg29vai453fff";
-      name = "kate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ddc07v0j09547gnspl7c7fgcrbvv0fk0-kgpg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgpg-14.12.2.tar.xz";
-      sha256 = "1ihxkcx162jp4b2qgpwa65iq90n1bz21l6fli1z530247h7vzlbw";
-      name = "kgpg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jvxwahcgixjygdvvyiprgwhi1c70cb5k-khangman-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/khangman-14.12.2.tar.xz";
-      sha256 = "0piyyqvfawgk3mbm51saigaswcpbk86my5v8mvha220sgzamnj9l";
-      name = "khangman-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/whd0iampjk6i5fm234gcsly38sxh5nb6-kgoldrunner-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgoldrunner-14.12.2.tar.xz";
-      sha256 = "1ijykdnfslp2vp3y0ji0bbf9zj83rbcywvg0kgiza963vzhf7rcw";
-      name = "kgoldrunner-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bvj41rw9x0014q6k67d2f6w8xqwpf9zi-kdesdk-thumbnailers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-thumbnailers-14.12.2.tar.xz";
-      sha256 = "1jyn507y7h2j8cb6nblc2lcf16ld9rn9cvi4xhj4sq9ccz0w7vz1";
-      name = "kdesdk-thumbnailers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kpv805bhwfkn95rnp8hzl42c26h8678l-amor-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/amor-14.12.2.tar.xz";
-      sha256 = "0wqh3csi0isfj3zpmsay5p38sbajfbrhkv6lms5nqr4k81kcpq55";
-      name = "amor-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jfkymr2flr7p986z1larn1i2qndrij8i-ktux-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktux-14.12.2.tar.xz";
-      sha256 = "1pml908z08y0ik4d0rncavrg26lqvchza113kxmyxc7ak95bwypd";
-      name = "ktux-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vn70b248ilfjrxv9sz30c4m1czb5n6fl-rocs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/rocs-14.12.2.tar.xz";
-      sha256 = "1nb0xq051081wps0i3g6p6vawj89vaa27di1hi2nhm1y0hx95m1j";
-      name = "rocs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fxn7qcaa57vxyc2qfnxycfv8hpvqn190-kcachegrind-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcachegrind-14.12.2.tar.xz";
-      sha256 = "17v1ap9jfzlk30xhx9m5456bqky4m0iywvq34r8zpwkbg4a49la9";
-      name = "kcachegrind-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bishs7m7snrvyrvcxhly4p4d148rmfxy-ktouch-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktouch-14.12.2.tar.xz";
-      sha256 = "1c7mi9cs17z72hg9v44yki85lqsnl96vgrckz5qcvca2b4w3bjd3";
-      name = "ktouch-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3l7a1yydrkd824xfjsxla8swzcv7r8rx-svgpart-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/svgpart-14.12.2.tar.xz";
-      sha256 = "1zkc6p8ycpm4pa2p9yq4ajkcnqi8m3mmv8ghdgi2q3a58fvf2zz5";
-      name = "svgpart-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xwq02smnzwz54i165vpgm8aaamcy02xp-kmouth-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmouth-14.12.2.tar.xz";
-      sha256 = "0qmh1kpl1asy5av976461i9fp81qan00jbqvfhi5dnli9zfrfmb9";
-      name = "kmouth-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vv15hxdzvvgj3xhw5pig0kbzm3206j72-kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-      sha256 = "1acfdcg0h9kb6171lqqrnihvgynrp0har6frq0igpkz475crmkid";
-      name = "kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g13aw9ppjbwj5rcyy46ccp9yw81bxa2d-kruler-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kruler-14.12.2.tar.xz";
-      sha256 = "08rwsmjbbaapgn98avagn8i3qmvw5fzq84snxy4a74dzf14aph5z";
-      name = "kruler-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lzky584al80dy5xrwvax7xs974p5s5xq-kollision-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kollision-14.12.2.tar.xz";
-      sha256 = "0v6hq3biiybrdd4lblzcadh5kpy21kjlkb5iqga95h7xxm6vd4dq";
-      name = "kollision-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g6zkyj2i5s910qb9snnabr4ivklvgajn-libkcompactdisc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkcompactdisc-14.12.2.tar.xz";
-      sha256 = "0xi1yrls8nsq9flll9250yfqx076p0xdxrywpiivx3yv64znjz7h";
-      name = "libkcompactdisc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fcm4sghdd7dl98zagm7xfg7lfcbhpi6p-kcharselect-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcharselect-14.12.2.tar.xz";
-      sha256 = "0fsmh3wsiz49wgc2l1p8caclhx03mmf4q7v7l72yf59c3pczh74c";
-      name = "kcharselect-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/r7gzmhlg6wlbhhxyx11n88pnd3qs1nbg-umbrello-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/umbrello-14.12.2.tar.xz";
-      sha256 = "1p9sdwalzi5j59xplzzd96m8dsvzc1r1isbljgj55h8pc3sn1am2";
-      name = "umbrello-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1dqlriz6zxb6ss4gq2ccswn6swzxk1fp-kapman-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kapman-14.12.2.tar.xz";
-      sha256 = "00qdq5fabm6pljclchiqi0wa3cxdfxbiqs5vw86190ki23qgqfkw";
-      name = "kapman-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hwhbjrqg3qycpsq6kxd17fmmic1iv1ls-marble-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/marble-14.12.2.tar.xz";
-      sha256 = "04khv00h3w0i6igp8b4zh0xyyl7a3aqhbszj2qlpydghr1ghz2js";
-      name = "marble-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/b17whbxz6q409ghxcxaia83v95adkdrg-knavalbattle-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/knavalbattle-14.12.2.tar.xz";
-      sha256 = "07a9z0s12v2f5irs3d93pqjsrwv4zs7sckgvsbgaklbxwar1p26n";
-      name = "knavalbattle-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/krcpms45cvn7dnv22rp9bdri7v76bcvd-klettres-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klettres-14.12.2.tar.xz";
-      sha256 = "0ca23y3d2s2m4mzqvw3jknsns0da3gzhqa7g4hicl35v4cbi8w7z";
-      name = "klettres-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/b247bpgxvgl1msrrfah432n99hi6h4h2-libkipi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkipi-14.12.2.tar.xz";
-      sha256 = "0dp3n4awc4glwlnygq8k6119hxl2lq0l66a8a2m84bhgf1xqn05j";
-      name = "libkipi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/djjlbx20jk6pv82jrk626k183hkn65qx-step-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/step-14.12.2.tar.xz";
-      sha256 = "1r11csc1hlkrydrznprdvq5sxnmhlpb1v08ns96bs27nxbz29zw4";
-      name = "step-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/n3w571knhskpnv263dv67vncy1h4613i-kompare-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kompare-14.12.2.tar.xz";
-      sha256 = "0ma1kwn7psrffs2fn80did8gmv3cr527lb40n1jrvksq15fcfl5k";
-      name = "kompare-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/r4q34i2lsi4dcpqvpqzc8c628l99nrh1-krdc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/krdc-14.12.2.tar.xz";
-      sha256 = "069gp9ahq78pl2ax77c4k0sfvb3g70gl9ph8ariarhh3f5lvzh25";
-      name = "krdc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/0wq7q4n2xxkw0vn49ajjv07b9yc316b8-kbounce-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbounce-14.12.2.tar.xz";
-      sha256 = "1iw6gwy01ri7kqc5qkk296rzbz3j1swhshxkv05vqpv69vwnfxpp";
-      name = "kbounce-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kbkrcfralyq2hal04r5qbsc9cw40yf2d-kolourpaint-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kolourpaint-14.12.2.tar.xz";
-      sha256 = "1r0xs4pisaqg53nc6zgn7bh95346wsb9756d9lq6zgp8jf2lcs4h";
-      name = "kolourpaint-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nb1lzzscqr6g5m770aw8zjqxmng6c23s-kiten-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kiten-14.12.2.tar.xz";
-      sha256 = "1y1anhvdmcflkmhya24my80c2hfpnhw8w1b2mqqr4xyjbl0plaqs";
-      name = "kiten-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/la8lyk56j0crfjfj1h9yjxgws3f9shbl-libkomparediff2-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkomparediff2-14.12.2.tar.xz";
-      sha256 = "122078hvi34zg183r8i2ni37xi00bzv7nr5251lhgh0fd45d565i";
-      name = "libkomparediff2-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/h9n5pglbgwqxiwdpxf0zrkyfcnqvjgyh-kscd-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kscd-14.12.2.tar.xz";
-      sha256 = "055fdr9l79xjcrl33sxmk82dsbchjjwgmd75dw0sbhwfxs99dvif";
-      name = "kscd-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ah46p15xxk89lrydhxzvyl83q3jjs5mr-kde-dev-scripts-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-scripts-14.12.2.tar.xz";
-      sha256 = "1fclm5wvz58565fx366sia4cjqrb2cr843skw4jpzhh4wb1v9v8i";
-      name = "kde-dev-scripts-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v5cdrabvrfx1dvjibhzj6a1m200p53ks-ark-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ark-14.12.2.tar.xz";
-      sha256 = "1aj7dshigv25qki93drpfwgzdycvvh3kl52a0im7g2k6aj1yjg6b";
-      name = "ark-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jgnxszypng4x7wlhz0rg8390bkh87lgf-kamera-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kamera-14.12.2.tar.xz";
-      sha256 = "16zjdx7b1nqh0nfbz0qplvqhl2jnl6l0jc3lfxifiqxsbzr9wlrr";
-      name = "kamera-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mfrl2pk66facvk13mm0609ign7ilympz-kapptemplate-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kapptemplate-14.12.2.tar.xz";
-      sha256 = "18dpbvdhi8qpfxhrcjkk71cr4b7gf6achg24gn6i4rcq8bbbv07m";
-      name = "kapptemplate-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nqh3y6b9y2zgrkb07yrs07sqcxqmwwsv-libkexiv2-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkexiv2-14.12.2.tar.xz";
-      sha256 = "0fjrvk2dcd4xzbs5v6nrabchkqbvf4qhljlc10797a378sdc8znp";
-      name = "libkexiv2-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cf4mzk51419c0v7ld561gb8jk496qgaw-kdegraphics-mobipocket-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-mobipocket-14.12.2.tar.xz";
-      sha256 = "1n2n2pd8ca5lnyv2r98jr4k9sm7lsvc5plw11xy28q829aayg8jj";
-      name = "kdegraphics-mobipocket-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yl49rnhq8zxyprh004g1qnqiw148x8kj-ksquares-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksquares-14.12.2.tar.xz";
-      sha256 = "11hznb7jdamq8hnbxggdj33jrhdnxzrhapc1rsj1ms546z01flnb";
-      name = "ksquares-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ahgf7lvgcy0fzg9wzwc0agi77bj652lx-kget-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kget-14.12.2.tar.xz";
-      sha256 = "1jadb5x8bn80gwviw73cq715sw9hzx8lpj33d19vv18l2sqyb449";
-      name = "kget-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cv1vcvvi2nfic2p51vv6jf1nc2dwv7jm-kde-baseapps-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-baseapps-14.12.2.tar.xz";
-      sha256 = "05j034g5h9cd2xw64h5zyjl8biq66p3b0z4z0z0i4min4hp52f7w";
-      name = "kde-baseapps-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2rxc1y0r19zx61g6n9kgfp1rzgbs44xw-kcolorchooser-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcolorchooser-14.12.2.tar.xz";
-      sha256 = "063ahsbzd1mfrkc45gjsnhj11v68x7d1a718lxsabkjjx59qpbck";
-      name = "kcolorchooser-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dg4a3cj0wssfw3z10bwqxqrkjk3dmqaj-okular-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/okular-14.12.2.tar.xz";
-      sha256 = "1ahw7a8i1hxa8hw0407f9x1s02zn659nprx9bfi1mvxhcn5zbwq8";
-      name = "okular-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/x89vahdh994ax46rl3mx3dxyigph3zq4-killbots-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/killbots-14.12.2.tar.xz";
-      sha256 = "1zvjwimbjld408hplb439f4k8rm6aanlvycpmf4fdiwrcg4zjq6c";
-      name = "killbots-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3d0583a63pwkq8sszvl172d69j648gnq-krfb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/krfb-14.12.2.tar.xz";
-      sha256 = "112bv9yyhg7zyhkqavjqgvkzbjm54hw4nfqrj3jmcwbjbnlzkkxm";
-      name = "krfb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6sm1200z80xxra4ibjmpgi5b626is1kc-kfloppy-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kfloppy-14.12.2.tar.xz";
-      sha256 = "0a738m6r54g4ibinxwh70d7sp736r8lr63ca8hx90a1yl5samr1b";
-      name = "kfloppy-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/i36hvnhadldbxl9yl9sgwzgbmip6nazh-kblackbox-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kblackbox-14.12.2.tar.xz";
-      sha256 = "1j9d33k8732dbwdnv85kr51jmjvnlcljya5q2zp6m97cy7xrf3n5";
-      name = "kblackbox-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hnk7d2fjhvzd1j1c0pjc4kqh3a4zv7bv-kalzium-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kalzium-14.12.2.tar.xz";
-      sha256 = "16ngwp9lf15l06yzazymrdbszkq9sx14wh4k8w1sydryl15xl77n";
-      name = "kalzium-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/a6cidm1dwqxq34q0wffn8b553xwg3sxv-libkface-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkface-14.12.2.tar.xz";
-      sha256 = "1mp19n7jhs9x74b8rlnrdc7ig1dx0v5pjvl6b4fmzfglk9akhh7v";
-      name = "libkface-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zi3aqkz4w4s4ldzscvwby1r6xkldxpdb-kremotecontrol-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kremotecontrol-14.12.2.tar.xz";
-      sha256 = "1sbzycb2b4s7v1lr6d7g4xqadwcxh5jlsl01jl3dpni83phxzk3q";
-      name = "kremotecontrol-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bpi59fwiqf4rn8xgkzkhyzr6ajv1d2la-kblocks-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kblocks-14.12.2.tar.xz";
-      sha256 = "0wcb6sgbr7gm9hh3gb31zmw6rqmflzis44ry1zb7yql0kf95y5ka";
-      name = "kblocks-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g4xg6d0syp06k3znj4xyiyv9ykiq64pf-ffmpegthumbs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ffmpegthumbs-14.12.2.tar.xz";
-      sha256 = "1261dkxyj07gjs6rk7wh8vkxk9554b675d68w4yfzf4agb8kdb8b";
-      name = "ffmpegthumbs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/0s00l7a87bg4qzbd43z7yp6pqff1icn4-kdepim-runtime-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepim-runtime-4.14.5.tar.xz";
-      sha256 = "00pmiifhf6km9v2hn3xiapr4vwrrijnvyjirprs99p8h39kifblc";
-      name = "kdepim-runtime-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1cdzh2b6wq0nmkvjx6spl70pj3538sl9-print-manager-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/print-manager-14.12.2.tar.xz";
-      sha256 = "02vz69aj56hx9jdckacjd7yzr1cmwmlqd7b3n92zmn9bx152sx86";
-      name = "print-manager-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vk3f3512rv381dpcwihmxgx4av3d92af-kdf-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdf-14.12.2.tar.xz";
-      sha256 = "14dgcrmny2gvi3m4y95di6w3gv1bld6pbj5i5qaphhxk5gl489a0";
-      name = "kdf-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rslsx2zc6zf7hls6l1m598a04r6l2h7k-kde-wallpapers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-wallpapers-14.12.2.tar.xz";
-      sha256 = "1q9p1ay2n4anr822wx7lc45hwwyyl1328ick704x6kd1rz1qwjiq";
-      name = "kde-wallpapers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2zkg1fh4kr78r8qg5nrn72k431vxd96z-kdegraphics-thumbnailers-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-thumbnailers-14.12.2.tar.xz";
-      sha256 = "0kvqbdmjnrn5fx9ci9f4fnwk8b20d9cvxdb966cwrzz6x6rik7ww";
-      name = "kdegraphics-thumbnailers-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pb6xr7b484aszpwr3pvd2pywliij31y0-sweeper-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/sweeper-14.12.2.tar.xz";
-      sha256 = "1k0brig6m5y5pv05lmpmc0m6wiz981jyx1brhy3ixv40bivm4cf6";
-      name = "sweeper-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6im1sz3rqm53siyfapz4p518vaa05nvz-picmi-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/picmi-14.12.2.tar.xz";
-      sha256 = "1xnxsvpigsf4mjnxxp5w5nvp817az7c7p11z960z5f18adxg7frr";
-      name = "picmi-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qprvh7y50d15356kdspb4cxqvm9xc30i-ksnakeduel-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksnakeduel-14.12.2.tar.xz";
-      sha256 = "1gw9sv67jnwcxsm4qw21hjbv3fbnxw6ibr4l8zrcccahlz3lc8x1";
-      name = "ksnakeduel-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yak0kczv35nhxbgr15mqr6zy9ncvg5jh-ksnapshot-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksnapshot-14.12.2.tar.xz";
-      sha256 = "15ka0h8bc7n5023ghwgxvq36bjaipimcs09nrg3z4nvdzds6xsfr";
-      name = "ksnapshot-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xz6x2nvcwz2k7df7p8s8wx42309a2rhd-kgamma-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgamma-14.12.2.tar.xz";
-      sha256 = "1lzvgdqh3i8klnj243rfak6sksnh3z10diki65zzl8wsjyagizq9";
-      name = "kgamma-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ydd7za8ax4jb54rap067rzkwfv2ars7y-okteta-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/okteta-14.12.2.tar.xz";
-      sha256 = "1xdyg54zzylj8s6zr4z5npi9pvqx3bjma68j3p7ymqvaa71a1c0n";
-      name = "okteta-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/99n02c3v71ycxvywrqn14zrsjgli2nkz-kgeography-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgeography-14.12.2.tar.xz";
-      sha256 = "10bzwbxg4k487700mnkmk642b5jzvpadcmd8y3h3af91syd0v7zp";
-      name = "kgeography-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6z45z434l9dw981lqixg0jw7mb2s1j47-knetwalk-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/knetwalk-14.12.2.tar.xz";
-      sha256 = "102bd37i3z57xkq6rs7l2s4qlwayaky4qb07bh3c589g2s9nxl28";
-      name = "knetwalk-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ypdsbibg2isd991n9bmdkgi5wi59ibnk-libkeduvocdocument-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkeduvocdocument-14.12.2.tar.xz";
-      sha256 = "1rf2signnpx7ik3p7vrvlkbv0g3m280pc1qz1fxzw2kjn9ais2r7";
-      name = "libkeduvocdocument-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/i5wnc7wqbmnac1awgd45iz9d91b7misv-kdeedu-data-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdeedu-data-14.12.2.tar.xz";
-      sha256 = "09ch89pghjipxsr9j50a58xww6cxhrkh9z7ns6bh5kg9b6hc47rq";
-      name = "kdeedu-data-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lix9qbdd1ganlhwap696qdcyhq3awjgz-parley-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/parley-14.12.2.tar.xz";
-      sha256 = "0kq0nm732x723f1yml0cq3w1p7ah5m3q0lj0pvrvg5z393a1ki14";
-      name = "parley-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/b3kdfd6nv23lziv5nf21g00wl7di3vz9-kdepim-4.14.5.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepim-4.14.5.tar.xz";
-      sha256 = "07bg60b96wg107sn49h4phks55z6h69kdsznpfr09dsxf53vl2sc";
-      name = "kdepim-4.14.5.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aip7i17kab1fcv43qx999cxwr8b05gdp-blinken-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/blinken-14.12.2.tar.xz";
-      sha256 = "1dkdgfmpccbpb4i4h34dg407q6h18mq7x4k2d66bly0pkwhkwkbw";
-      name = "blinken-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hc68363pfz7k528lcv6p8gfj4r3bi061-dolphin-plugins-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/dolphin-plugins-14.12.2.tar.xz";
-      sha256 = "0lc6l84p3ixk2wzj4hbxwgvsmin3kw8xw40b3jrq2w1y21zbvf3h";
-      name = "dolphin-plugins-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6ycc8cckv9ybw5fj6qwn53ccn5dghcz0-kwalletmanager-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kwalletmanager-14.12.2.tar.xz";
-      sha256 = "0bynykq9j6xh0a712934vyvq3yr94676xhdvf1iazky1cwwmiryi";
-      name = "kwalletmanager-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vd8smizcfqw4zsks5sbf03chbxk9dqiq-kfourinline-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kfourinline-14.12.2.tar.xz";
-      sha256 = "14s4lb9kygaa16sq4xfmmabv31kg3rw7dw7k2f4vwqqh3s1168yc";
-      name = "kfourinline-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rvr5bpfppyd168gfqimfavs9g4ys2412-ksudoku-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksudoku-14.12.2.tar.xz";
-      sha256 = "10c148lksrh49mfvlx7q5i7xxjanhngm2s9d7ifx5xyqlpik2zcv";
-      name = "ksudoku-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/j2pwfcwc6n5r8klnbxf0gpal2pinan7g-libkcddb-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkcddb-14.12.2.tar.xz";
-      sha256 = "088hhnnm09xfqkc0j2l252qgl7nlqmsdbchbr5cninf8n9ivz99d";
-      name = "libkcddb-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gz25xkmky3kpl4hw2x9ahzr5xp3113f9-libkmahjongg-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkmahjongg-14.12.2.tar.xz";
-      sha256 = "0min3bpd2h0lch4412ybryk1bn3rs2s4936kcjn6mn0412xyjvdf";
-      name = "libkmahjongg-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g7hglkwmv8kdw0cjly5pysb3i4piapkx-kcalc-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcalc-14.12.2.tar.xz";
-      sha256 = "0vm861cd9y8ax7mfnv2aszip2z0grmjvhzp10x5f7gq1fhm1db64";
-      name = "kcalc-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/m69i89q12sb8mpc1bhs0a2miyrkfnq7y-ksaneplugin-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksaneplugin-14.12.2.tar.xz";
-      sha256 = "1scgp9p2jb5vwwdvbgmsbr3mmijiq40m5x7nd9qx7scwn2wqjvq9";
-      name = "ksaneplugin-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cynl1ai536dqs4cnlji5db1jybpzh7s6-palapeli-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/palapeli-14.12.2.tar.xz";
-      sha256 = "1fg2ikq19g92bqfp3j27mawl284xqiwd1nr8dg94khbb111210r7";
-      name = "palapeli-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4qwqpcwraxr0a8wy81plb3l3ij3jh3s5-libksane-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libksane-14.12.2.tar.xz";
-      sha256 = "07nw3mjc645angwyllzff0hb7i7lp6wl3fw88zqd380w5j13a46h";
-      name = "libksane-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.16.tar.xz" ".tar";
-    store = "/nix/store/afz1vd72namq3xca96zx1c9l6n8jzk4p-kde-workspace-4.11.16.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-workspace-4.11.16.tar.xz";
-      sha256 = "11mzr55vr7x2yym4gdaj9bcvp2qpbs3vlbfmhs74r5n08vmsdq3s";
-      name = "kde-workspace-4.11.16.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/wbjy41ymgplkg26cm94k6vny2vjl6160-kqtquickcharts-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kqtquickcharts-14.12.2.tar.xz";
-      sha256 = "0v5ng9spcbv22lhpx4hzfg3n56wfrjdxg6nls6sw52zbq12lagqn";
-      name = "kqtquickcharts-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zl8sxjy6mp1z6r3dajvf5ly5zsiasxjd-lokalize-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/lokalize-14.12.2.tar.xz";
-      sha256 = "04jmsysvx6ysyl3126bq7xg76y7ppzjfd55j7q7i18nrkcgw4y4i";
-      name = "lokalize-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/0sf32n3kd0fyvp4sdyv5yk4abn8gy54w-kig-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kig-14.12.2.tar.xz";
-      sha256 = "0c137jnkzpzv43yf7crymghybgz70d6q6mlfww53if2119sznzd4";
-      name = "kig-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gscz4fvz0xh0szcs0jr95xiif4115vj2-kanagram-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kanagram-14.12.2.tar.xz";
-      sha256 = "1s2zn876b3css74r79acq6wys4qlq9xgb3z376xfl71rzadvisvf";
-      name = "kanagram-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mljg8qpz9axmnzw9jarzz82a4qarvbwn-katomic-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/katomic-14.12.2.tar.xz";
-      sha256 = "0ns6apxaild1iiix03vjzvz45ba442agn4aqkbgik9x9wdr9yr7l";
-      name = "katomic-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3mm64rsb14p9cyhw31jzvqbs6nppva9x-filelight-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/filelight-14.12.2.tar.xz";
-      sha256 = "047bki2gnwvflb57vij1576d12ml4ga9b1q44dz9rq97wwfbwqnj";
-      name = "filelight-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9whfiwhxk7v4cfj1s863w6i789kgcbpf-kcron-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcron-14.12.2.tar.xz";
-      sha256 = "02s782x69xrymv3wbjcfm52v246gn3illdga7g1rmhs7kmi6q7rg";
-      name = "kcron-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dj7svyjh962g9c3j2bgprhmmnyi45pbj-kuser-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kuser-14.12.2.tar.xz";
-      sha256 = "0p2qwv24qxzx637v5fjwzscvxa7j84j91s4c4gj5hq8939anx7q2";
-      name = "kuser-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8zydgf0ncr96fgvyya9rg32ahavxm4c0-kteatime-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kteatime-14.12.2.tar.xz";
-      sha256 = "1vq21jw50w56i9bwx91hlw6a2m46q83mz2mg11cdc1nxk5gm1359";
-      name = "kteatime-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/im52lp4p99k9fn2ja5hch6m6glmlk7da-analitza-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/analitza-14.12.2.tar.xz";
-      sha256 = "0sjlsh8x4qzyg59zkvmrd312qvbhmf17349l0b989xm0m1nwmqfx";
-      name = "analitza-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5rmimmbz973alzhx2xm4r80lf556v14c-kde-dev-utils-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-utils-14.12.2.tar.xz";
-      sha256 = "007w4761cv2wxqhkk7mz2pgk7zmvzkfbmy0biriy836vx99xjdky";
-      name = "kde-dev-utils-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/91wk4lximnfqs5ly2q340rqn87h84axl-kde-runtime-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-runtime-14.12.2.tar.xz";
-      sha256 = "0cs07gbx7v6ilrbp4bgl20h1yrbh07sbrrf167pyd4lfx5rz9cgk";
-      name = "kde-runtime-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/whl3f2bs6018bg3i10akdsjvky2wgvwd-pairs-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/pairs-14.12.2.tar.xz";
-      sha256 = "0gs76fgyszs9lrvszi57vldx6avfyiz8hdg5axb7nmyikiqnislm";
-      name = "pairs-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/adksl0r448kybmvhs10crw43isw90i3y-kiriki-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kiriki-14.12.2.tar.xz";
-      sha256 = "0r7i6fh9apjhxc7khqb4lachqr95ypiagk7cr52kwpl8bd9zcz2p";
-      name = "kiriki-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qz2v6fj2akwll4s904z638pzwpyf18yx-kwordquiz-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kwordquiz-14.12.2.tar.xz";
-      sha256 = "03isbq1dbq5w0pd8jpb93hp6z4nwi28q5ccszvldisfna5abpkjf";
-      name = "kwordquiz-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jhh4r8rqhcx1jbqycy1i0x5x4ivqgjhg-kjumpingcube-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kjumpingcube-14.12.2.tar.xz";
-      sha256 = "1a030z8bcxyj70in7g574p80hsm32b8s7mqnl3abmw4315dc43kf";
-      name = "kjumpingcube-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ahyi8a1vsdyr3zdkiljrwmjz73dxknwi-konsole-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/konsole-14.12.2.tar.xz";
-      sha256 = "06rrhmmx8sdq084wb2a2pgvmi43fkjbmjsikr695c548qp76yzig";
-      name = "konsole-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gm8jph57vbjm15f2w0k2qijghdm9v9yw-kdewebdev-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdewebdev-14.12.2.tar.xz";
-      sha256 = "0n4p7jflrrjq47wcy20avgjiz1c5qgwmw8nqxmaaxj8vnwk2vx37";
-      name = "kdewebdev-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/s6n79j8914ms33xvjrx74s22axlh20b3-kstars-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kstars-14.12.2.tar.xz";
-      sha256 = "0fwfpjmr4i9kh1f3360ahhk01m8zrkipvdj0wn16a3mxvghr6vki";
-      name = "kstars-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kqvqadr6n5n2200w3gr5h978y6376gbv-kubrick-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kubrick-14.12.2.tar.xz";
-      sha256 = "0r7w6787gc2kcvjgddr0lw0liihis4a5s8rim3ycjlmh60bfw2ac";
-      name = "kubrick-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2m09vphyfk4wfl4pzxns8lgh00nin1pa-kshisen-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kshisen-14.12.2.tar.xz";
-      sha256 = "110fv7iqbv63sw0q8m1fj0x45ivmmhw2v32sx7my0hvch4rxif1f";
-      name = "kshisen-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aq90r77wq4qs67j8dvw89zppbrj5rhgz-gwenview-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/gwenview-14.12.2.tar.xz";
-      sha256 = "0ky9f8v3473f7ic2gaymc89f6yqnpi6vsbwlnqgjfwbq8ry47w4n";
-      name = "gwenview-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/29vsbhggrymqqgvs490jxykrf6mhvmhg-kbruch-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbruch-14.12.2.tar.xz";
-      sha256 = "12gs4l5wazkym3krcfc0sjzx9kji6ca3blmprw7hfwk1yqgd36rk";
-      name = "kbruch-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ccqbkxaxm7swcm1qf9rkvjs6fgfiafay-ktuberling-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktuberling-14.12.2.tar.xz";
-      sha256 = "0y5icsgkypcr2z9w8zbhn9z877dak2kjf0if5ag1lpmjlj0y397h";
-      name = "ktuberling-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8i8lf5v6bi77ijr3b8xwny3yrapqnxrg-poxml-14.12.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/poxml-14.12.2.tar.xz";
-      sha256 = "0d2iqgpxxfzvi9aim2xsz96gjpy1zcjr0f5fsha0hns6m6mdp1lh";
-      name = "poxml-14.12.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wx9ll48ipram4w163143ixab3lcdn9iq-libkexiv2-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkexiv2-14.12.3.tar.xz";
-      sha256 = "1rj7ac318rxl995cz70vdivk065mpsxk3sw0zqj7y0a2cgg67qrl";
-      name = "libkexiv2-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2bqk35id2iwy0hx56a4fqlj9hmzwn6z-kbruch-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbruch-14.12.3.tar.xz";
-      sha256 = "0vrs1mn701jydqjzlshwjq2366c65qwiz2gf37l31ha0nk8lxcxh";
-      name = "kbruch-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/14cmjnxm524ik9dmjb5p08c9hpr0xzlv-kde-dev-scripts-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-scripts-14.12.3.tar.xz";
-      sha256 = "17xwh4gwbagzdyfxb0wbl6hplrza7mj82mf1dhz5b6p1jjlfji96";
-      name = "kde-dev-scripts-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/r9f281gb1312wvy0dg8g8g5gd4f29mlv-kdeartwork-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdeartwork-14.12.3.tar.xz";
-      sha256 = "14m5hb1rzki0h4fdpg5bm9s4bm6lfx2i939jncjvxik8l5rk8wkh";
-      name = "kdeartwork-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w8s7d4pm150c4m392plhax8y1aawr8c3-libkipi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkipi-14.12.3.tar.xz";
-      sha256 = "1k20q3f5vgvndny7zj90r6xxdvilh1qg9vksvqn1vydz9wn15by4";
-      name = "libkipi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/388ffmw8i1b8bwdkwyr697fhq5cwghg7-okteta-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/okteta-14.12.3.tar.xz";
-      sha256 = "1wlimwi9j5x9y0j4zsx6d4c8xl8k7sr4wclbm6bi42fk34w27f56";
-      name = "okteta-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0ar4zk7r20w3xgnvv79n6kcx3p0fjvai-analitza-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/analitza-14.12.3.tar.xz";
-      sha256 = "1xlv47lgybw0wkmws6fkgjzskdmyzgrwgsfkixi2jj9yh8wj7jpi";
-      name = "analitza-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/kbi014f4cakyzj22fviawpqzqkfdc2f8-kdepim-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepim-4.14.6.tar.xz";
-      sha256 = "1c1mcxj10cirxwkzb71y2sik0xk45j2a1yhkpl5lgs1k6xwivslv";
-      name = "kdepim-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2m3n25m9xjnig9q4vqbwg00li866lsg-kteatime-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kteatime-14.12.3.tar.xz";
-      sha256 = "0k35gmpkmsc7fqp31l7jf5as0f25lk8kqpj300alryyr9m5i960d";
-      name = "kteatime-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xgcvm6ic3xjzlbd8xblayybdjz5f8ah0-pairs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/pairs-14.12.3.tar.xz";
-      sha256 = "1460wvjl17vzak74x5wgnx44db1vv900whl45hm6fjjciqpanb77";
-      name = "pairs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1q3i7f47j4mx8nrm0hl5hjjljn478a35-kreversi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kreversi-14.12.3.tar.xz";
-      sha256 = "1l0pmaqwcdlzi48dcyywzlrswfr3jkywcpv93zdgxx9fba5iyhpj";
-      name = "kreversi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8wiir69l2blpqd1w4b7mcmylsm8j2q15-kcachegrind-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcachegrind-14.12.3.tar.xz";
-      sha256 = "1xgn2a3ahwnx00fish7n5djx2ci89shf8mjrrq8lkg3grka6cv6m";
-      name = "kcachegrind-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hcy2r6snkvxxmnkr93y8yb5nhrzvk8a2-kmouth-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmouth-14.12.3.tar.xz";
-      sha256 = "1awkwq4h89qp04fid6d6df03b7fj7rdk0vjs683rpkz52qq8xwny";
-      name = "kmouth-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7sxzmrmp6y6xn4nq7zfqbjg2cf8y4zhb-kcron-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcron-14.12.3.tar.xz";
-      sha256 = "0w33d82253yasrhzswmpccc75mrjyrick2s6s3gibskcy3c9rx5a";
-      name = "kcron-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q54chzx2w5p1ifvkh3dkmqwxz6q35m0m-kde-l10n-sk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sk-14.12.3.tar.xz";
-      sha256 = "0nfikvbf10gklcn33pmwamiix1rcgdxgxk84a360rkahafw3xb1l";
-      name = "kde-l10n-sk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yn6w6h0ypqv34595f10l0jd76v8r3mdh-kde-l10n-mr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-mr-14.12.3.tar.xz";
-      sha256 = "0wmkg9rwl60q354y4kz0qmbwbv892v12ybps2wj4mplwq333d03m";
-      name = "kde-l10n-mr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/6azx1w8qq6g0aqz3jgz971k12va1si42-kde-l10n-et-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-et-14.12.3.tar.xz";
-      sha256 = "1zpj0w3v1hwxpkfmba9k46w37qi41yndhm3ymdrgyl5xgfbajdrg";
-      name = "kde-l10n-et-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nx1jxyya8da77jg1l5jrlb46xwdn9fbp-kde-l10n-zh_TW-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_TW-14.12.3.tar.xz";
-      sha256 = "0qwykxa72c6pdzdd7kpwigrjv4l7d7kb1h06rwrcg9kk5q9hn31q";
-      name = "kde-l10n-zh_TW-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sajpc2529bhnd5p86sn0k35wyqj302ip-kde-l10n-ga-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ga-14.12.3.tar.xz";
-      sha256 = "17mqxz2dpqyi1ngi1p2ivxg1qixivlkhzzd1id7ihff1i50f5gdf";
-      name = "kde-l10n-ga-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m3gp02jxirgh246njwsslprfq627d13y-kde-l10n-hr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hr-14.12.3.tar.xz";
-      sha256 = "0zv3rvrfn5khmbd495iqnsr579m6igz3fr6h729wcwmizm03kl7p";
-      name = "kde-l10n-hr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ghlk4l1xill1v93qnv6sp4d9ybm2m2p1-kde-l10n-uk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-uk-14.12.3.tar.xz";
-      sha256 = "0jh17m47783vrv3c9wf7j67r937ni4xc670m758casjccwy9ldcb";
-      name = "kde-l10n-uk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/g4l10q0rg746928lmy4jfk63aa0y063r-kde-l10n-fa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fa-14.12.3.tar.xz";
-      sha256 = "1imx7nmxx9p8xi290llyhh2hcaax6y458hlz8sid6kq0cl7y5w79";
-      name = "kde-l10n-fa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lsw2ss8v9p5ryiszbfp46p1zqckqag5a-kde-l10n-pt-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt-14.12.3.tar.xz";
-      sha256 = "0wh5dgg53aic5n3h260f1908dfirp0k53hakn2kv53m3p572ck74";
-      name = "kde-l10n-pt-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ga5jirz4ggm0qacl4rzj4rlassiswls2-kde-l10n-ar-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ar-14.12.3.tar.xz";
-      sha256 = "1ybmp4id3y9xrxcx2grmv8w3412h1qmwzawrzixfiixazbg8jgfa";
-      name = "kde-l10n-ar-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rgsdz47748cn77nmnkysf1vhz5sgzwf5-kde-l10n-ca-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca-14.12.3.tar.xz";
-      sha256 = "14749nzfld9b97bk062d6pdpjdcfhga62n2yh1j1b0g5xqc1x0cp";
-      name = "kde-l10n-ca-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nja0qv4yh272pjvwbbzk75zzdjn75dgk-kde-l10n-cs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-cs-14.12.3.tar.xz";
-      sha256 = "1prhlp42vnpspj98kbdshv4liixhxak84xzr58mc8ij7whggi820";
-      name = "kde-l10n-cs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/avwqrqad41ryhdbx9dbr5m67nn6vqphw-kde-l10n-is-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-is-14.12.3.tar.xz";
-      sha256 = "17gw5isal9xk4iz5dr7qqvqx8j06nb2wzsxkkdxk5qgnqsxdn3d4";
-      name = "kde-l10n-is-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cmp30mff1j0jq0srvvlhl28jr3jhdrwb-kde-l10n-ia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ia-14.12.3.tar.xz";
-      sha256 = "0qgdy7b5gs04bszpp2byj9hx3mhy18y3l859si437i0jd3aa4b75";
-      name = "kde-l10n-ia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4x1jjabkfwy5yk0ig70pn72awx9f1c7y-kde-l10n-wa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-wa-14.12.3.tar.xz";
-      sha256 = "0h23mnlhd53cpayhi3kpz7abj7786cf41n41m43b09ln3bw8d8i9";
-      name = "kde-l10n-wa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z06s7w5m81vy7q7lm5vybpnlq75s69jz-kde-l10n-sv-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sv-14.12.3.tar.xz";
-      sha256 = "14n0i4g484rxs2qx73jb0jh0a138anhj55x49inq7s0cigq2y1k4";
-      name = "kde-l10n-sv-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y978vl8sv6l0ls2kh6hkcj77cnz3kcvh-kde-l10n-nn-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nn-14.12.3.tar.xz";
-      sha256 = "037z0c6zy5vbzbg0i1fnyi2b88by2r65a9vyihznr2k72yzgbl53";
-      name = "kde-l10n-nn-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/b15q4v2zmbc030xb1mdw746llfq2vq0y-kde-l10n-it-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-it-14.12.3.tar.xz";
-      sha256 = "0rmy7cnsbfgzmfhq3lvap7x0q1b97np2x1kz65qy1lkdwfvqlafg";
-      name = "kde-l10n-it-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/pzn66c19cgkxlwk4dc7p14pvsagh5bks-kde-l10n-pt_BR-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt_BR-14.12.3.tar.xz";
-      sha256 = "0p2lfgf29432x7srx6piyi73gbqnwfcb6mrbgb5cbrlxmhazd0x1";
-      name = "kde-l10n-pt_BR-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dykqy8mnwk56zyqscjsbc5l0v3caxcm9-kde-l10n-el-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-el-14.12.3.tar.xz";
-      sha256 = "1l9zjgq4mg1rsdk58csdm1bbvjfblh56isp275jm7fg05izc7idz";
-      name = "kde-l10n-el-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vfw1xmdblc7ryz4iyddkx04n6bpsmi1p-kde-l10n-ro-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ro-14.12.3.tar.xz";
-      sha256 = "1an38a8kq5b5xzjxflr4fpwq3ld6ryb36p2fv5ks3cgp14vs9bhc";
-      name = "kde-l10n-ro-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/i8h2ydglwf8j89g22ppja7waljid0an5-kde-l10n-fi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fi-14.12.3.tar.xz";
-      sha256 = "1v8kv7ack9l8w7pcy918vc5crhd43y35m1zkp87zdaqg9svsj893";
-      name = "kde-l10n-fi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/s3dxzagxplipcrfh3sz9vhxsbwlvd7v8-kde-l10n-sr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sr-14.12.3.tar.xz";
-      sha256 = "03ddq090ihma7y19l2ryjf69mbmqwigrxmhsyphkrpvkcch995vv";
-      name = "kde-l10n-sr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5r0zswdk5p3ais2gwwknzqh1y70v98rr-kde-l10n-da-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-da-14.12.3.tar.xz";
-      sha256 = "1nl2wvy1vg76rci4jkkgpp5ii49x6s348ps4mpj3ad46a1nxldfa";
-      name = "kde-l10n-da-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a9nqy8yh51xmprzq7g806hpp85djxci6-kde-l10n-es-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-es-14.12.3.tar.xz";
-      sha256 = "12bj9jp6l03skx8pn2b3hrbd598kg4zm4qj88nbf6l9mzjm2pjb0";
-      name = "kde-l10n-es-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zdrqq64485q0zz3m3mh11canxyn48i6x-kde-l10n-he-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-he-14.12.3.tar.xz";
-      sha256 = "0bsjnlnn703s5s3k8p68ic591zf2k6lcdizhm75dirrc2ydwld2p";
-      name = "kde-l10n-he-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nxiv4m0827jvvh9pl5adani2f83jd0pa-kde-l10n-ja-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ja-14.12.3.tar.xz";
-      sha256 = "05gl706zmw0jhw7ahdg61q0swy65459j6p6qzx4g6albrxqjr2ks";
-      name = "kde-l10n-ja-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y9sx89dk7qf8mdl18ga9s99kga8j50v1-kde-l10n-ug-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ug-14.12.3.tar.xz";
-      sha256 = "0pl9fs7gdsxafgiky7k2a6xz07xd02k3glpfd5wxa9ya6l0970nm";
-      name = "kde-l10n-ug-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3flzizssjcyxgsdp1diq0xw5is5xdxzr-kde-l10n-bs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bs-14.12.3.tar.xz";
-      sha256 = "19f6s5vylir9a695l0wx8fi63an2kgynmdpz3xadq197m1j8wd8d";
-      name = "kde-l10n-bs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/id2z95s1zn6v733fyh3wazrbfy40hyvx-kde-l10n-bg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bg-14.12.3.tar.xz";
-      sha256 = "1hp1sa8cxsgifr7vaw7iqf8bydcnb7qnz9nnac0a7sx95ypvjmlg";
-      name = "kde-l10n-bg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d51bwij9xq5wh9scl66y66g5cwd27dai-kde-l10n-zh_CN-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_CN-14.12.3.tar.xz";
-      sha256 = "1f5zqflfhw077zlhwdf3his89dq8g0c8blpd8rkh7sbbyqgxgcbx";
-      name = "kde-l10n-zh_CN-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wqrvb9c3daz3hc650q212j7j6aysxs52-kde-l10n-fr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fr-14.12.3.tar.xz";
-      sha256 = "09jriffxnkmlcwmwplspy9znbz5fa8ad06pkapl35337cisyrdqh";
-      name = "kde-l10n-fr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/477qqq2pd57y9wb83kj2yhclvr8r6ixr-kde-l10n-de-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-de-14.12.3.tar.xz";
-      sha256 = "1y71jjigz5qg3cz16j1vrikddw94zzg00kc6ziw2dxk6sx8j7vxi";
-      name = "kde-l10n-de-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bpw0gllnd9asq0qkzksrvfni25ai7kaj-kde-l10n-kk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-kk-14.12.3.tar.xz";
-      sha256 = "117125baj789y88l533jpgfggz5g4i0j19qrqybqql2hys7vhvib";
-      name = "kde-l10n-kk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/37lal5izk34xpsw4ba5i3fh7klr8s3sm-kde-l10n-eu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-eu-14.12.3.tar.xz";
-      sha256 = "15albwrdigyk9fzgvqd23njxks0ri72j2n5isbh218gcpp3k6z3b";
-      name = "kde-l10n-eu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/isl6qfzmn18flary4fdcz4nnfh4v8wpx-kde-l10n-lt-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lt-14.12.3.tar.xz";
-      sha256 = "0z8qpy7r22rijhyfaidxvmafbbpha90imx0zk1cg8d96qn5iz1ri";
-      name = "kde-l10n-lt-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/34jssw40n5qml1s21bsdqw3an7g02g4w-kde-l10n-pa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pa-14.12.3.tar.xz";
-      sha256 = "17ra2abhgbh1igd36rxkdx7n30qcmcbn85sy54zig8rdcznq4bjk";
-      name = "kde-l10n-pa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bydiajxpa21jawxl5yd2fhdy4ha9ad43-kde-l10n-tr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-tr-14.12.3.tar.xz";
-      sha256 = "1mwzryf00x2yaz6c4pm2459svs3hdjddms4xx3vv1r9aq7aavjqb";
-      name = "kde-l10n-tr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3s8gz9b9mhymdiq262w8f1skyvz25c0x-kde-l10n-nl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nl-14.12.3.tar.xz";
-      sha256 = "0jm7z2m5ngb1z1nx2g1vwgkzj46yzm0a37br5jba9yka9dmr15mw";
-      name = "kde-l10n-nl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d3i513r1568j9pvqznjr94ygmpgb8zp8-kde-l10n-ca_valencia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca@valencia-14.12.3.tar.xz";
-      sha256 = "1ybsw0r60gkxy3fshm2da5w4mlwfmanwjfwpjnwj40ydlgdi8by5";
-      name = "kde-l10n-ca_valencia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/90rfd4hdzch06plw672qfxzljqnk7x71-kde-l10n-id-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-id-14.12.3.tar.xz";
-      sha256 = "0kxss6f349mbhwafahwdv2zgfmsg5v9wp668q9xf0649d1h2w0ww";
-      name = "kde-l10n-id-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qb61jvp0gf8a76nkw1wqzq32mg2i926i-kde-l10n-lv-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lv-14.12.3.tar.xz";
-      sha256 = "11x1csh4f4mmkbhdmk0dibqvl8cddr8y3m9jyrgs980k7kd9617f";
-      name = "kde-l10n-lv-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x9jkn1ngspshcja4z0h4zrlmrqbfc1a0-kde-l10n-pl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pl-14.12.3.tar.xz";
-      sha256 = "17gbg4zb51alcp5g1bx6lbmbkzz0fzl8sbhswwc71yhkq4h9ifpc";
-      name = "kde-l10n-pl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zbrn541qzdcpsy20kf4mah7rqy64xwwv-kde-l10n-nds-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nds-14.12.3.tar.xz";
-      sha256 = "1mqhc2174g58180l13qygwifqxai78m7prvrd4nnmc22b86cb0i1";
-      name = "kde-l10n-nds-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7shjylawg8f357xm52zc2qxssqind29q-kde-l10n-km-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-km-14.12.3.tar.xz";
-      sha256 = "1244bjxs2kl7hmaj4v7bfw98vawcc5ipl73payn2ygxqiqmb2jgr";
-      name = "kde-l10n-km-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ab3swg0pgzwiihfn3vkqiw29gawrlfgf-kde-l10n-hu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hu-14.12.3.tar.xz";
-      sha256 = "1cjfy1wash2jvvr0l9s4am9s7ny1zvabbim536b6lmqhyk5bm452";
-      name = "kde-l10n-hu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/grsgaxij3fp3kqwlgfaqv0hzh0d6k3zf-kde-l10n-ko-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ko-14.12.3.tar.xz";
-      sha256 = "1chkk4zr7jqb0vbn3bhqpfvirpn5zqrih0124cyrfxmv4a19cz8v";
-      name = "kde-l10n-ko-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/27lgir5h7a95dgr1khc5gvk7rqmhvsnq-kde-l10n-hi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hi-14.12.3.tar.xz";
-      sha256 = "16pmyi73yfr885xv31rfwq9ingm4cfd2p04wvrxs056yimip2hgz";
-      name = "kde-l10n-hi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d1ydfg70nkp219vhcc6pi62kxv275121-kde-l10n-ru-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ru-14.12.3.tar.xz";
-      sha256 = "1x89kap46by47ra278r5inps9ab8mncfw76a2scpz7db9g0vfvf3";
-      name = "kde-l10n-ru-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xc5zsjaiyy9fzf8wdzz15g593xlkgzzb-kde-l10n-nb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nb-14.12.3.tar.xz";
-      sha256 = "14fgxrld2q9y7w50kn9952115fviyqb66sxvi2501b6kf3xnrpp1";
-      name = "kde-l10n-nb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m11758s3nr89b0rzfw492ljzwkqkn30i-kde-l10n-en_GB-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-en_GB-14.12.3.tar.xz";
-      sha256 = "1fbn5rih063wgmnzzsdq5dzmw4vx4cf8jpqd0zjdp4jcja7a7z7h";
-      name = "kde-l10n-en_GB-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rg1m42j06j7sp2sm33107krg0b655hzg-kde-l10n-gl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-gl-14.12.3.tar.xz";
-      sha256 = "0gm2z3va0lxnk9k3mnw0crlaf946cd2v1nygzbmc74r986aiyrla";
-      name = "kde-l10n-gl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yidz4dma1zm6rx4axqpk37irpvmf96a8-kde-l10n-sl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sl-14.12.3.tar.xz";
-      sha256 = "17vlwgsab5jq9r8vs5q7gwk77p9li8qk8d4997p75z9rmf95jx35";
-      name = "kde-l10n-sl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1p0y7hq9pqw8qjy9a5nyrjlirxkxayrs-kate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kate-14.12.3.tar.xz";
-      sha256 = "0czcni5wfw56ar0r5p05j1wrmah98qv1wca95l5mya8fb17wcmnc";
-      name = "kate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ad9jhnfb216r0x6dicjx3px17mqnxhzr-kolourpaint-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kolourpaint-14.12.3.tar.xz";
-      sha256 = "1rcln9nqqzhzb0qlkdx81k0zspyyf266s3sa12npil2g9n1yh12h";
-      name = "kolourpaint-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9g2fg6167fghd9v5nz92sadiyyac6zmv-kruler-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kruler-14.12.3.tar.xz";
-      sha256 = "0px10ilji6blpfyp44f66m53y5dhcw9s2534pwhbx9xfkal1pprj";
-      name = "kruler-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/gg40xflg0y9c38rcg1q1m352zknrvmci-ktimer-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktimer-14.12.3.tar.xz";
-      sha256 = "198gx9j0x556m1vbwmyfgvayjpbws380pmrz4m58ylsvg5mcgwib";
-      name = "ktimer-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z6ql801ixafs2n59gb6fa8z2zr8wq79h-ksquares-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksquares-14.12.3.tar.xz";
-      sha256 = "0fyqs9b4bsgnaadcc0zhvsljmm83mc8brz1gsc7iz4pm3dnz74fr";
-      name = "ksquares-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q5rjxayccrra40ahwj8g8q3splvw10sn-ksystemlog-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksystemlog-14.12.3.tar.xz";
-      sha256 = "0a29n39jyrlgfijn99v48z3za4nnz6bambakyri8j9da1zzwn6hy";
-      name = "ksystemlog-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bfj7740qpfw5i6cjml9xf9648s9vj7wh-kshisen-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kshisen-14.12.3.tar.xz";
-      sha256 = "0h5l3m6xxq91v2fzc8p213iglvc78shqa3q0bfy3xbrnd3c8gkm2";
-      name = "kshisen-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/l294adqj7slk00ns53dr6p28jzbjz29b-ksudoku-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksudoku-14.12.3.tar.xz";
-      sha256 = "1scyqlfwxgkdwh93h80wzp7a55vvy0j0zxi9fl0ihsjsh20iv0bm";
-      name = "ksudoku-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h4x11ry35314s0max9aqh47k1pyfr22l-libkomparediff2-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkomparediff2-14.12.3.tar.xz";
-      sha256 = "1829sxn3y906hsfj6hqllx0hhwk2qngw9lvrgkcyqygb99ngg2bx";
-      name = "libkomparediff2-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/18ywxpzrac8brdqp56vm3jbly49dis8f-kamera-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kamera-14.12.3.tar.xz";
-      sha256 = "1hrvc6l4q69npxyafznhg5i8mybg1c7z4iwp98q5rzsdw5zppvs8";
-      name = "kamera-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nkz7204dhnfjvjvqqp9id19l5xgzxzrx-kscd-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kscd-14.12.3.tar.xz";
-      sha256 = "1inl4sksyd27rp9g75h0900hs1hr6cb779zf92wsfflmk12gin7j";
-      name = "kscd-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dix33an8h17r8h03vnwml2fym44hrq5l-kdegraphics-mobipocket-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-mobipocket-14.12.3.tar.xz";
-      sha256 = "1ff6bbrhwa1jp3icz6mv9m9xl7f7b786yvg8dmc795wmm5hzr721";
-      name = "kdegraphics-mobipocket-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qnqwzdhg87x5dahx3avxcnys0j3k1qil-ksnapshot-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksnapshot-14.12.3.tar.xz";
-      sha256 = "13a5cri4dqn111p8q0idfgbahlx4ks2xjgvvgcwxd2srxifld825";
-      name = "ksnapshot-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/972ra01nd7jywn427qj5jz3gwibd2cyy-ksnakeduel-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksnakeduel-14.12.3.tar.xz";
-      sha256 = "0cjylhpsl33zgav8dyhrdl8qvi7yjafsf30drgjsc9jizhmn8hdz";
-      name = "ksnakeduel-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a3rr545r48ykp0rxfk2b643w683p0af0-filelight-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/filelight-14.12.3.tar.xz";
-      sha256 = "0am2qi6v2mr1rbl4jfjc4jaxg75511n2dvfr9zlsbhglfmzagmj8";
-      name = "filelight-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wfrkxk4f5hnvfwdraamqci3xap593sh5-step-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/step-14.12.3.tar.xz";
-      sha256 = "0pkj25jb7ydvghbx3187fjddsmck24k1kk4mms1hxp2i8xa11b1l";
-      name = "step-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/027r3fzd86qx6rfsc5lfas02cmn60283-kompare-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kompare-14.12.3.tar.xz";
-      sha256 = "1vjq7fdbdskhymwrl8i9945qbd0xaqgcrp95p8qpmafcc88nxvdl";
-      name = "kompare-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/kxpwjjlwa41agz76z15jbwb7b4s6x7ck-kblocks-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kblocks-14.12.3.tar.xz";
-      sha256 = "0y5f55z1i9fywfsspiyy467r2f11v7szwzhjrvacqf2g208mncwv";
-      name = "kblocks-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5j6v68g4gc7jvqrypk9s1m0grng8rpyn-knetwalk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/knetwalk-14.12.3.tar.xz";
-      sha256 = "1bakk8linrmgzn5zn79kj9bhfn43krpdahd989ba8ldfyz9d0hcc";
-      name = "knetwalk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/pgg1zvpidxgv1dacj7ncn62mizwjz0m9-killbots-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/killbots-14.12.3.tar.xz";
-      sha256 = "1b5chz21wxpmvi43iyr5gn2dh7azahamd8fwnjsdb49znyy5ab19";
-      name = "killbots-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m3sl4zcjky2smf0vky7lwvw8g79n2idw-kde-wallpapers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-wallpapers-14.12.3.tar.xz";
-      sha256 = "0cdaj33xim3rvq7ihwpv338g4s51xb36b6jszpfa9hnzxsxa146f";
-      name = "kde-wallpapers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/syx3k30s7j3s4v1hcb4azh176m4n7082-bomber-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/bomber-14.12.3.tar.xz";
-      sha256 = "0bhy5rjisq9f9ai36a0m9vhagdxj6jdyw0hlylpjl1ayy3qly1mc";
-      name = "bomber-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y1nrp3nf81v1v6khr86xdp9bjn7fnaya-kjumpingcube-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kjumpingcube-14.12.3.tar.xz";
-      sha256 = "16fgz0jicalls8c25p1hnd92rj3vwbbdli9wi1ljdv0f799h3z9w";
-      name = "kjumpingcube-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jahrwl1157161xh4dgjcnd0hnfq8x28c-kfourinline-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kfourinline-14.12.3.tar.xz";
-      sha256 = "026kvydxlrk7r91k9ffc27bsj0792shpziynh845ycbx9dy3nspk";
-      name = "kfourinline-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/l3zj17f3n998w3b3mf4v8jjib0a0p3yy-kwordquiz-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kwordquiz-14.12.3.tar.xz";
-      sha256 = "1r8ms2d59aa64wnmdv8psjn4bbypjzcpb982jpc6kfrwj391q2ig";
-      name = "kwordquiz-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y8lsccnmrc8r451j1b1igjxyrnvqpbys-palapeli-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/palapeli-14.12.3.tar.xz";
-      sha256 = "1wwnsvccshg2y55zcfpy2kvyplkjjbv96nacdfhln3yilbakwv1f";
-      name = "palapeli-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1nwhjxi7hmywfqiig8b60qaywwqircqh-libkdcraw-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdcraw-14.12.3.tar.xz";
-      sha256 = "0fw025nas8x70ji534j59d6vcsvqzr7yfcyls0yznlz5ppy4g9rz";
-      name = "libkdcraw-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9pj5rh11mpnr3grriz5x4c3ar5whn52g-sweeper-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/sweeper-14.12.3.tar.xz";
-      sha256 = "1y8yvjpd6v8s7xzgwkaa9sc4k715n53l01182j48lcyhfx6gbh98";
-      name = "sweeper-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cjd95qf5ppz9msqy2ggisilhhl4h0nvy-zeroconf-ioslave-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/zeroconf-ioslave-14.12.3.tar.xz";
-      sha256 = "0x858q6w1llcyy3933sqpdi53p8h2l1rbic1v1xyqbl4zdz9ixpp";
-      name = "zeroconf-ioslave-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cbndc9qfgqbksmfq1q00lhw1a6qz52wk-kalgebra-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kalgebra-14.12.3.tar.xz";
-      sha256 = "0pm2dshg73yc4h16sjm37j1003zs6hrp92lkr1679541z02m2f2l";
-      name = "kalgebra-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bfpnby19d3qgqhkw3fb102v8j4qh9vi0-kaccessible-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kaccessible-14.12.3.tar.xz";
-      sha256 = "02h56bykzpkvk17snm88mb8cxsy2nmhjz1by18rg4cc2gf61qk74";
-      name = "kaccessible-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/91s8bj9j78cmwj5ijb8536ykmnh3k1fg-kdepim-runtime-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepim-runtime-4.14.6.tar.xz";
-      sha256 = "1jnwgfy7052fzlz3mic7cy5jp1v5j81f28h205x56h6p7nswk29a";
-      name = "kdepim-runtime-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bm5pazc7ch4k130xj2ikmdcz69490xl6-kmix-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmix-14.12.3.tar.xz";
-      sha256 = "132k71ymd2pbbsbcw91haaalxljxzyirfw33ppk5w9d9m46h7gk8";
-      name = "kmix-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yw3v6jwj76v2savll4mwsvy8bh9n3iv9-kbreakout-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbreakout-14.12.3.tar.xz";
-      sha256 = "1kzwdz0njqggy6h208lllswaqsrwr7hid4pi1f69hnh9c27a1vbl";
-      name = "kbreakout-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vv1vfxq2dd88qhz563dbzmd8gisrhdb9-libkmahjongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkmahjongg-14.12.3.tar.xz";
-      sha256 = "0kizdr1xn58wxblkkq5swy4vqap24cdcxl092aswvi7ql85zn2hy";
-      name = "libkmahjongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8m2kvp5j83yw25smfh55ka4x73bp3sli-kmahjongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmahjongg-14.12.3.tar.xz";
-      sha256 = "08y03hszmnmf7wawrznhqhak00gd5mcrbfndb538j44k5am60ddb";
-      name = "kmahjongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/smk5qi7815a13m4c6xb7vzz18vz5n6qf-libkdeedu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdeedu-14.12.3.tar.xz";
-      sha256 = "0bja8qc2sbfq3ikhxk70fg72cj4hwbw4l7ag4zc9lq312jbzvkii";
-      name = "libkdeedu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mi979pdj5cm4sz1qbbdvzr75731xjfbx-kstars-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kstars-14.12.3.tar.xz";
-      sha256 = "1gg96zny1vgsm1cyzxqlp617ly862r6ywv21vr99fismrasj919z";
-      name = "kstars-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0661bdzswm2n96vgix2vq8rp48jg2a1d-granatier-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/granatier-14.12.3.tar.xz";
-      sha256 = "182z9lnvrxhfp1jp4lb33ij07bvzvi79xi3ncicyb9p015s9mlsg";
-      name = "granatier-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d6kz07a661dlyr950zmrirgsb52i8c5z-juk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/juk-14.12.3.tar.xz";
-      sha256 = "1zaw82px1qacfy612b9bxfgksyyvhlqrn0sv6p5dqzz01kg66xwy";
-      name = "juk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/24hs45qvjc6ixw77rjl226y0mldn14z0-kdepimlibs-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepimlibs-4.14.6.tar.xz";
-      sha256 = "03fnxg2as2rri27ajkzm2wjma25pqd97h91bxka07b3fwcqimvbh";
-      name = "kdepimlibs-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2x4jzjdy5k10dcn15q3jfnlbbaihbp2q-libkdegames-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdegames-14.12.3.tar.xz";
-      sha256 = "0dj39kzhix9h79mnw25535n0swpb04sdl1n4l9jnj306daf16g27";
-      name = "libkdegames-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/id1jxy17a8g7kwbhgk0h60f8rsvf1zz3-ktuberling-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktuberling-14.12.3.tar.xz";
-      sha256 = "0svfdfpvmwghv656rmip5y0c997pl6mlnq9ns88akqdjl45nywkm";
-      name = "ktuberling-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8myygl0hkb6l20xqj8wfynfx3zx45c9h-poxml-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/poxml-14.12.3.tar.xz";
-      sha256 = "1xw1dc9zc0wnn8h7dk115zapf8kgvm57nh2zrgmahy6ppza112bd";
-      name = "poxml-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/banw9x2cffxi8a0lal0x26v0c0vlypwi-kmag-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmag-14.12.3.tar.xz";
-      sha256 = "12aiyv848cdy0jkhbcj4ha3cg781ndjcffkl871ah7qy0sgcnkw9";
-      name = "kmag-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1361pwj0m3rxysay6njg9dz04in7k1sk-kde-runtime-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-runtime-14.12.3.tar.xz";
-      sha256 = "08ndk21mq547fw26gfa7vy88vxf78v8anbvjrym2k5f59fdx2aai";
-      name = "kde-runtime-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jns1ws94d4cklkzn7n9hk0a6zsbwyg6n-lokalize-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/lokalize-14.12.3.tar.xz";
-      sha256 = "0cy3zyzszbka19hy624rgxc07bh4hyfins4j2cwlivkszbssh8r2";
-      name = "lokalize-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y692wcc35c9dr5v9h1yjv33b0s87k3p3-kopete-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kopete-14.12.3.tar.xz";
-      sha256 = "1cdqcbafmmfq357n2kybzkfjwq926wb5lslpxbbpdnhiid23k8xp";
-      name = "kopete-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/31mxjkglzynxwi3h928n52mi6ldszww2-parley-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/parley-14.12.3.tar.xz";
-      sha256 = "0vzqsbr26l39akpch7f1xr1xwsdybszvd1f9rrdmy4rg9swc692v";
-      name = "parley-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w58yam9l13rjzh0cc4a16qkn9xzrl72m-svgpart-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/svgpart-14.12.3.tar.xz";
-      sha256 = "0jrhyb2ji2ii1pq7fmnyln12zhrqb9ahwpdq1x8ya56bws49qira";
-      name = "svgpart-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/i6l7hapmsfcga8b9agdi0ld2sss2maqy-kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-      sha256 = "1w8alhwkbffvwjfpja5pw881min6mv7vc1ag1qiblrzirsx4zhvh";
-      name = "kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m7vz5qmkwxbbs0f2251a0bbrl8g2jjw5-ffmpegthumbs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ffmpegthumbs-14.12.3.tar.xz";
-      sha256 = "1kni6fc1nb1n5zjqx736mlfcv08jp9nrchs7qkb2krzn4n5m0aji";
-      name = "ffmpegthumbs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5zhbmw2i3xb7axfyvq45qkp7dhf6xya0-kdesdk-kioslaves-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-kioslaves-14.12.3.tar.xz";
-      sha256 = "0w7ish8xpd7s26xmc9j9gxxy7b0lllv5px95g5dn4876qqcqpsks";
-      name = "kdesdk-kioslaves-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x2m1gbmqsq6zd48sbpmp2dz64d5m2nm5-kremotecontrol-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kremotecontrol-14.12.3.tar.xz";
-      sha256 = "0wy2jb9dx3bf8x22l0x7bqn8n45mn6jclnsb3saq7cns5905b68m";
-      name = "kremotecontrol-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7ckqs96cigik5syqj0ka0xk3m9ybphhx-kdenetwork-filesharing-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-filesharing-14.12.3.tar.xz";
-      sha256 = "1icg45a2qsv1n19gsfg7w3wa2ysa4rkbx3w8maq8c7x673qs5kcp";
-      name = "kdenetwork-filesharing-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m2p9ipvfj9cdznrc736fjhbvyj3g3yz1-audiocd-kio-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/audiocd-kio-14.12.3.tar.xz";
-      sha256 = "1103f1ic5niy0zs4zvz841aaa6r4q0x0db4apnyvwbx51zi7qzsb";
-      name = "audiocd-kio-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4anl6k756x5n7j58rafxyx04sgxjlc20-konsole-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/konsole-14.12.3.tar.xz";
-      sha256 = "0apz7dn9lza69fgnylhy3md47palj3qzjhpihfr0qsgn6gzg6f7a";
-      name = "konsole-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rv12zii0hdwh4fb5mv08nf0qid79miy5-mplayerthumbs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/mplayerthumbs-14.12.3.tar.xz";
-      sha256 = "01hisifj8j88wz31q4dhj0qinzz0yw9fz0lm16qp3yxv7r7p82cr";
-      name = "mplayerthumbs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/6lgsi6phi4p3lyh7qvw3bqkixfad0fl8-kde-dev-utils-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-utils-14.12.3.tar.xz";
-      sha256 = "0i6m5vs42c5mvznayh9rzjdp5rkcbl3aar909j3ir9kc3v3mi2ns";
-      name = "kde-dev-utils-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2ckqwp8l6cy1c35bvcbs4x26z1czsdc4-krdc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/krdc-14.12.3.tar.xz";
-      sha256 = "1q8s1wdmblfx8jj8acnkkyhx3rrn1ampskd9wx39jid8vznvkwpy";
-      name = "krdc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0hyjdsihgm0sn0gv2xsrijhqbgaqqn6z-klickety-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klickety-14.12.3.tar.xz";
-      sha256 = "1cz7aam2azgqilvz6jsbkfy3dpimh86f64vmkvlk3n42zkksp7hm";
-      name = "klickety-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sw2cca4mpa4y2dq1f0wjkqiqdxcjqkcn-kdiamond-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdiamond-14.12.3.tar.xz";
-      sha256 = "1cm793801nysqp90dcyvfvwxc9h212qrq3lhg7621h9fhq0946a5";
-      name = "kdiamond-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rb4li4dqgv2mw1w732pkhkxpvjxdb50g-ark-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ark-14.12.3.tar.xz";
-      sha256 = "0a6ggjg6x9kdlhm2n8l3dw4nn765lj78gn11yxgj37riq9yhg5xx";
-      name = "ark-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zpk335imsalsxqa7bfa6wcllxgcdipln-kfloppy-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kfloppy-14.12.3.tar.xz";
-      sha256 = "1b1zskwch7zz7iqfz3fa14q0bkrr2yjckr1h5fvn9k7q79x7xph6";
-      name = "kfloppy-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/c9z5wpwzpnvp5fiv5zbjg4fm8p8xrn7m-picmi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/picmi-14.12.3.tar.xz";
-      sha256 = "0vlyn2f2j1p4734rcmqyjh03h4a2m79z9swfmlahh12gq5ka81im";
-      name = "picmi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mfysg0babfpbzvpnh8b3a9kzk6n29ssh-konquest-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/konquest-14.12.3.tar.xz";
-      sha256 = "1il757w6xzvkaadangwfpkz14qx02wwdlflzffw9jis2lbz19qnh";
-      name = "konquest-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dn3vmyqlm2qsi52bhfl1cyafza31b6y9-kalzium-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kalzium-14.12.3.tar.xz";
-      sha256 = "1mnkhp5wlc3rmxyw4lli5smb419vzkv52aqpwakyncrz7nxkyk24";
-      name = "kalzium-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fi9lq4lqwclvr627x32q8lr4cwcxbgng-kde-base-artwork-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-base-artwork-14.12.3.tar.xz";
-      sha256 = "06v3javkhkchpjc3sv7x5mk2jgb1366mi18dzwg63h2ca8740wn1";
-      name = "kde-base-artwork-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2fq724w1bqmiz9hqqmhds1f0zj18k8dz-blinken-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/blinken-14.12.3.tar.xz";
-      sha256 = "0k4a5r4rq5brh5xv2lm6ldwfv1qy5wiqnj0ycp55p974isbdgqsb";
-      name = "blinken-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vqyn4qdsgnai9a9w944g0jqpmvzqg5b9-kcharselect-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcharselect-14.12.3.tar.xz";
-      sha256 = "1ycx0y82f4ah5fg9ki62fwnnhyly1sqs52zs4519hnmyqn7h7q1v";
-      name = "kcharselect-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x66xrvdlnwcs8g6l3f4iz9fvxhw61v28-umbrello-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/umbrello-14.12.3.tar.xz";
-      sha256 = "0f5qn6h89hj4n25p2nkcgqb0xk4qvlwi115n5qlsmbc3icj2j7cy";
-      name = "umbrello-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ah3xdqjxw5h29qmjc4wdb1c5i9zdsl40-kget-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kget-14.12.3.tar.xz";
-      sha256 = "04wf6qncq1xdfrp9j5cnhdii9hj83wjkp5i168flzi292sqyw9ia";
-      name = "kget-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/68ps9qh0w9mq4qawdzzjyy1h1y33wfqs-kuser-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kuser-14.12.3.tar.xz";
-      sha256 = "1xgd3g2fdanl28sar3mgcsnld69nczcdanvaqslil4vc7d8r1xim";
-      name = "kuser-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/60ipws592hnlygalmkzgzmlwnhmkvjg4-kigo-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kigo-14.12.3.tar.xz";
-      sha256 = "093bm60yaj8v8g6n7x4ysjbxph6xgh9ylarhdxsrjpmq268wql31";
-      name = "kigo-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zk9mrrc8vkzq41bx7sfyjc3lx73jzlqm-dolphin-plugins-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/dolphin-plugins-14.12.3.tar.xz";
-      sha256 = "16kxzpnfy8cxy8v1idwsisqq0p13n14zcid9a5n1sv02w91c02rj";
-      name = "dolphin-plugins-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z8kgww8c0mqwx6cfsfqm8yd58k71xvrl-katomic-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/katomic-14.12.3.tar.xz";
-      sha256 = "0rbhf8j8if5r20l1cryl4irgd8p94ikbsz6456y7v8fzv5mf6kgn";
-      name = "katomic-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jqamjiig020rvvyqwjarbxqj29ix93yi-rocs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/rocs-14.12.3.tar.xz";
-      sha256 = "14k5yx0vfpf0fllqi5f72vz2135qag6gb7hs7523jaavxkb23d1p";
-      name = "rocs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9vhmysfqpabx7cwrqsmkpgh4hinjqh39-libkcddb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkcddb-14.12.3.tar.xz";
-      sha256 = "1i8n63jpckc3fa27rcqyrf10cz8zsyjyvrpa7fgmggsf91k1c144";
-      name = "libkcddb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bz14zb6rlkwgmj0l8q9nffar2443zcaq-kdewebdev-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdewebdev-14.12.3.tar.xz";
-      sha256 = "17qy41gww688klpv2cgnk1r3cnd9sq72bsga82d7dnk0v6dinlxz";
-      name = "kdewebdev-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/iq7fn9lp4fh2s74lrb2r4v39n66c8a7v-krfb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/krfb-14.12.3.tar.xz";
-      sha256 = "0258ffj2wx25cycpw3cmvnw9ig874jpi6yw711w6d8nfy66ribpb";
-      name = "krfb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yv1ixn2gwc8vv32m3y5axy3dn1p3sbrv-kde-baseapps-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-baseapps-14.12.3.tar.xz";
-      sha256 = "1zcjbhnxzqxjn4xs6pwb8cvcnjypa4yh09jr4frd82nfhdsq7nyd";
-      name = "kde-baseapps-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7f8qlf08l8fwykz677xywlfdsf8j1pml-cantor-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/cantor-14.12.3.tar.xz";
-      sha256 = "106k9gp4r2241yh6np8mbq587chwkicxk7ssbpvvvg2m126idz9y";
-      name = "cantor-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/24zfmzbi9q832p6i91i71sms1vk3rfg2-kdelibs-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdelibs-4.14.6.tar.xz";
-      sha256 = "165xn2bv03j2g4j7m287add40kwhccvp2ci5hrar2xfd9sgl24xk";
-      name = "kdelibs-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xl12n09yvf5j7di78mrkxxhfnn6axijy-kubrick-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kubrick-14.12.3.tar.xz";
-      sha256 = "1g9ls282qy6s0xsaa50ck0gkiz980cx50zjjhq4yimlhp1gswmj0";
-      name = "kubrick-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hq79f56cq1gqw7nfxcfliqi4k8kjpkd5-kpat-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kpat-14.12.3.tar.xz";
-      sha256 = "1787qymlsxyi7dm2q8axpjl3n62qx9xv7diyg8627kkjm1a1xw9r";
-      name = "kpat-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/inai3p0228fmjcr8vkbnbhnvpznwvrgz-marble-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/marble-14.12.3.tar.xz";
-      sha256 = "1ylhc3278yqdcsli6yw7bnci6mdx01g0r97m78bs74l5biz4yql4";
-      name = "marble-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/szdzjvc2h3w5dpp154m0kqh5i0spk771-kcolorchooser-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcolorchooser-14.12.3.tar.xz";
-      sha256 = "1v8mgv5pjl3g6igxs92qd3zn8qr3qip046pb77856qhn3d9s4pqj";
-      name = "kcolorchooser-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rfk8bxw07690a9kncmcdmlqjx7qkrld2-libkface-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkface-14.12.3.tar.xz";
-      sha256 = "0zp48mlkqkjc6wk81kcf1q980196q0m153kzfjahi5w4vlslzgam";
-      name = "libkface-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2gc6778llzkl8qbzdl582ay45rwn6wn-kbounce-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbounce-14.12.3.tar.xz";
-      sha256 = "1hn09ghhmj2dk47vnkqkvrm87n50m506mmzq058cccjlfdah5iin";
-      name = "kbounce-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jplhnd96n48zih1mbf6bx96xl5b35kdp-kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-      sha256 = "135dcs9ppa8lv5va8bqmccfxj0hf5f65qprx7l02k74xj4k70yki";
-      name = "kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5aykxgy1by52pcfmv1z990kz6xpwjj18-kcalc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcalc-14.12.3.tar.xz";
-      sha256 = "0w5pl11vw0d2g3pnxb3ffig209r0bjg135163crnic9akfbfa9s5";
-      name = "kcalc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1lk25ql2cgisdm7yhjyn1ac416h8qdc0-lskat-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/lskat-14.12.3.tar.xz";
-      sha256 = "0k5wq5naj0ahmnwpvdrif2clzxjwr9jk6p40igakzanpp23i6p9k";
-      name = "lskat-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vvbs6wghnrbrq9yd9v647l227bzsiyaa-amor-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/amor-14.12.3.tar.xz";
-      sha256 = "1y9cia887lqbcs6nr08mbrxr8shb895wvxf5jg8w6iic6pwy516c";
-      name = "amor-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sxi3wlcwn3gbkmcama2vx4dg45xwm7sx-klines-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klines-14.12.3.tar.xz";
-      sha256 = "1xsrkbjdnw4icchbr5y7w64y6szfv8qdzndwd2bgrw0yvyjg5w7x";
-      name = "klines-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0al1vmsjw3a94arnw19k59gajw3kpxdd-kiriki-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kiriki-14.12.3.tar.xz";
-      sha256 = "11c76kq2pji07xfbyf2621h76sjx9pqdj3qqzydzbwdinxy0bgz0";
-      name = "kiriki-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4bw6lkbzy88kl09gk9sv494xw4a004a9-kgpg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgpg-14.12.3.tar.xz";
-      sha256 = "00qjgkgy1d8wygc298z3v7y37j47w16pjzp8ssnsdkmx88h1dp3i";
-      name = "kgpg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/97i8x4wydz1z4p2dfg2c04xvvblpdds0-kolf-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kolf-14.12.3.tar.xz";
-      sha256 = "12h4817ky9xwwrdqgba515dw87314ijci4lwqvcqmm7rq44qac8g";
-      name = "kolf-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/k35761pidfd258y0fjbcr1c22y5lwzhf-superkaramba-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/superkaramba-14.12.3.tar.xz";
-      sha256 = "1q6qpmwyics1mb44l55vy5wyjd0d5mbsm780kj4y9l6mp98b47c0";
-      name = "superkaramba-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h55lr5qacws82h167r142367mldrq50z-kapman-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kapman-14.12.3.tar.xz";
-      sha256 = "1i3ci8qpx8njr250pgkz7zlfihyi3k6vc2vnw7dcv09qfby466qb";
-      name = "kapman-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y0xl8ckan6cwmz35mvzsjv35a55s45s9-khangman-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/khangman-14.12.3.tar.xz";
-      sha256 = "1y11jwsb1ba55hc2sx0adffvrck1mrn43wna16zkrh1sxk7fk8r5";
-      name = "khangman-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rdh9ivzb5i8xilvp5v05k6szxv9nhv40-libksane-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libksane-14.12.3.tar.xz";
-      sha256 = "162bi5d6kbx7zlb4waha82ldg2j40rwcg1gikfahkjsprm6npmh3";
-      name = "libksane-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h4if4axrpc0sdn6xmazgn2d5xhkbpr0x-kgoldrunner-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgoldrunner-14.12.3.tar.xz";
-      sha256 = "1kg9mskg3aj0bp8h8y5bfkapmw4iys42aw3sa7f8zfkqp993zsw8";
-      name = "kgoldrunner-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/30xn0rg0g32p4d00i9z4xs95lp504six-bovo-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/bovo-14.12.3.tar.xz";
-      sha256 = "021pmar0g7s0p7qrzimp2x54idy9pdg22y8mgi26xrk9n7i5yybp";
-      name = "bovo-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3ajn3gyhisbdny0q3qskhn6r9wkw0aly-kgamma-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgamma-14.12.3.tar.xz";
-      sha256 = "1ywpkg7zbh9xy50a53dmlz1rsli5gdc52l50v14gm1sdjl2sfjpm";
-      name = "kgamma-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fhr2zhxsxlc5fl15l9fil414jaxw98hz-kajongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kajongg-14.12.3.tar.xz";
-      sha256 = "0fdvwv5jbmc42wzc2j5y4adjqqwzq6hvl8b7nzaknphvpk7257hj";
-      name = "kajongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7q3rq4gjjkwxjlliqy76x14h45xxzhhf-kppp-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kppp-14.12.3.tar.xz";
-      sha256 = "00517rl2b5zaf42sziar2cj878dcii6jr1mx8jicq293f171krn7";
-      name = "kppp-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jdxf1cy03k03r51kqa1klb3ib5jvd8jy-kmplot-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmplot-14.12.3.tar.xz";
-      sha256 = "1fq8m07pgmcfp1cr7q0y90ngaj282nz1pw5mqdfjh9syfradli0i";
-      name = "kmplot-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wrk2mg2h2y34s0gysr095d713wim7brw-kdf-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdf-14.12.3.tar.xz";
-      sha256 = "1dd35frqxgqmhakc6f7xs6sck061271cnfym9bsd5q6fxv9s8vdp";
-      name = "kdf-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8wa0nvqryc7gzxfk2sgbsavk1q6p3jpi-knavalbattle-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/knavalbattle-14.12.3.tar.xz";
-      sha256 = "1jl5f2ndgnffhmgpcc4in6rryshph3p12d1xa2ixw36xyr45hcki";
-      name = "knavalbattle-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/macznkbfj12i3nfcks2fr29fy24vlda7-ksirk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksirk-14.12.3.tar.xz";
-      sha256 = "1h3dgp2j7lz13j16k1j5b7wyg0g4x08svw1v2pc15llakr39p88m";
-      name = "ksirk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ja14bgwgs1wp8831ipa39s9zhayjfqdl-print-manager-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/print-manager-14.12.3.tar.xz";
-      sha256 = "1n1m5w3p4r97y7jp76q35z8g39ipfaldkgbfbz47i89bc33zaxy5";
-      name = "print-manager-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/44frkjvk64qwj15g2pfh8a1ficag137d-artikulate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/artikulate-14.12.3.tar.xz";
-      sha256 = "1rv51nk2lqvxfgwsxyzq9cd1qq68nr6z7r5xis83smc4gnaczajh";
-      name = "artikulate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9pd7p5vl53w6i6m324km5xkp6v967l53-kdeedu-data-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdeedu-data-14.12.3.tar.xz";
-      sha256 = "1q1vw5dprvqj7yyg9w39ndy8nvnnhkbladylv0kyh1491ba2a3kb";
-      name = "kdeedu-data-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x30qa0vibvxxza1pqy9a4ddnj4w2xhcw-kturtle-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kturtle-14.12.3.tar.xz";
-      sha256 = "0hxnc8lfqrfs5njaym54kl4vf2q6jakgif90saxfm50irjbwlg34";
-      name = "kturtle-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/734ajz153q37a4pzyh464q9aip528d77-klettres-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klettres-14.12.3.tar.xz";
-      sha256 = "01irm9pgh46rghbmmwwrdb85ys2gv23h46qaicv4zp73bl6mhn5c";
-      name = "klettres-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bj1igafd6x86fay8syr6d573b05472mc-libkeduvocdocument-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkeduvocdocument-14.12.3.tar.xz";
-      sha256 = "060p8sh3rbbajykjw1z2ba3xnv1bq8ns86yfwx2lv2jyaqpkkgyk";
-      name = "libkeduvocdocument-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hbrdr0fizjfwyf4p317gwgii4ckxr9bx-libkcompactdisc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkcompactdisc-14.12.3.tar.xz";
-      sha256 = "0957qd9zzbnksi1zxw1av4zxwzi48pq80jpk5h1id7cdhlfrsxz7";
-      name = "libkcompactdisc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m37c7klxvf2nz3byv04b763sls4j6h8r-kdesdk-strigi-analyzers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-strigi-analyzers-14.12.3.tar.xz";
-      sha256 = "13q7cy274ibsisvchfagb5mh4iq2wpm12zriwn625ciajy1zbq1r";
-      name = "kdesdk-strigi-analyzers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5ibmcrrhacqq7qn5zfq7fp1y3qwj90jn-kiten-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kiten-14.12.3.tar.xz";
-      sha256 = "0iy508g6mp7gibzv3m59hjjcvl32h03pzfqj8k6pgq0jya0bqvvd";
-      name = "kiten-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q2v3p0k65zzhmzphawir64a3x8k7qmbn-kwalletmanager-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kwalletmanager-14.12.3.tar.xz";
-      sha256 = "1sbbgvwh8d5pv4p5z89gk29lz2snp4glinpa3y2dg9s9chnn0qj4";
-      name = "kwalletmanager-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hcpxv7a1j4r0pavak6zqps9kb4mlgj1a-kanagram-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kanagram-14.12.3.tar.xz";
-      sha256 = "0j8l5cx251wvb2s6xzdsx45cgwzpy8a97lbss8lhhfrqwqn62lh4";
-      name = "kanagram-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/v5rwasilq989vbmqqnj14cqq87gmvpsr-kspaceduel-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kspaceduel-14.12.3.tar.xz";
-      sha256 = "1z1p5wy39xkyplhdq8z3p61flnyzh03yhi28yc0f79iqx22psvjb";
-      name = "kspaceduel-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/amjyaqjvc88397nj2g54z6djs5rj5mgm-kig-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kig-14.12.3.tar.xz";
-      sha256 = "0vhamrasgazjn110ahh09a402vhsgqh8h5v1qqmvi49f6v44bxbb";
-      name = "kig-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4fzqz8h97hnn7v0q2gadc1mp4xhssl3x-jovie-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/jovie-14.12.3.tar.xz";
-      sha256 = "12ky24hkpqm0bhi9x8fm6bf0nfqclpr5yv7n054995k3irygz9lz";
-      name = "jovie-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/81d3gi968mqnzps5v56lfi4dzkq7vfkw-cervisia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/cervisia-14.12.3.tar.xz";
-      sha256 = "094x08jf21h5f0vjx28bqj207csh56rc293bs4sl8lg9d1h0gbax";
-      name = "cervisia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2wh0xa17ikpsbm0addwb502rvld07ici-dragon-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/dragon-14.12.3.tar.xz";
-      sha256 = "0fngv700yhlh0q73njwfl6szf9v57csyf0gpqf1hyl9wvv2mwswj";
-      name = "dragon-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a3lgzwlizzj1yp4n1v0k80h45rzml2bz-kqtquickcharts-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kqtquickcharts-14.12.3.tar.xz";
-      sha256 = "01017d0mww3ai4i8ik29kfwkakyp92ngrjm6704015i0wili09i0";
-      name = "kqtquickcharts-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/r5721x8a5aasszaw7hnj91iy90sy0007-kblackbox-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kblackbox-14.12.3.tar.xz";
-      sha256 = "1kmdxiy30cm3jrgi6kdg15rrwyyxgnrb51w3bfcgaqr48kz73id6";
-      name = "kblackbox-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xgnk2fv1a5q0xsy80xwn2p57vn10w3z7-kapptemplate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kapptemplate-14.12.3.tar.xz";
-      sha256 = "0gwx51df5qms1vy1b6csbllcjy5xs55xmscz4i2n75ba7dsw9ivy";
-      name = "kapptemplate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/409f1vaf4n42mhdyxmjw0vf670frpgwg-kgeography-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgeography-14.12.3.tar.xz";
-      sha256 = "098j76mk1lc7wjvwybvyb04zaysmmn9zl9y35r4yhr11lv2v2idf";
-      name = "kgeography-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h3c8xaj4wybcpndp90x5qfr9602l6cr2-ksaneplugin-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksaneplugin-14.12.3.tar.xz";
-      sha256 = "143j3ck5cy4678fx9d0jv3y8zvbkvjxc8kyx3n8hmm4plin54lah";
-      name = "ksaneplugin-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fsviwbz3j2lx8d9hnscq7i6ncm1svq2j-okular-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/okular-14.12.3.tar.xz";
-      sha256 = "07snh1z38s1ycwfsirkzh91dw13hkf0lq79das75qjjladv3v9d7";
-      name = "okular-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/062pw1fc4w3nsflchjnzr33agfr5zpaa-kdesdk-thumbnailers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-thumbnailers-14.12.3.tar.xz";
-      sha256 = "1vaw2p5y9q44yfcs34f501baga1rhswgawn2brglfada6y2b89jk";
-      name = "kdesdk-thumbnailers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.17.tar.xz" ".tar";
-    store = "/nix/store/hgca7dsswq9axlaalvs1ci8zh0sl8j4k-kde-workspace-4.11.17.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-workspace-4.11.17.tar.xz";
-      sha256 = "0pkn49wis90v8ky8hasa80x6ji59sswlb5ib3hzr67mk191vhlhx";
-      name = "kde-workspace-4.11.17.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/kap125hfflfrp7nb58b7vv3w2kp3r6wh-ktux-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktux-14.12.3.tar.xz";
-      sha256 = "0yg3a9wnn4rdbainypq8v6hw57flgsqsq8h8rzb6iy6hwnw8pc8p";
-      name = "ktux-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/li6azfrf8qsi5ai8vfrfq0md8cw581p7-kmousetool-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmousetool-14.12.3.tar.xz";
-      sha256 = "14n79dlfiyd3pz3gi6sg71nd2p5vp18sk99bh7qz1dyid27v6z08";
-      name = "kmousetool-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mlpp2nwbyg3dscicj50795c4bxbmzcqq-oxygen-icons-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/oxygen-icons-14.12.3.tar.xz";
-      sha256 = "0apfpfrpxjrnxf6c4bxxfhys9k7wif74yx9bbysrrndw4bvv0nx6";
-      name = "oxygen-icons-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3hpc3hmys0i16sh7aqmlw46flk6r110y-ktouch-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktouch-14.12.3.tar.xz";
-      sha256 = "1z084yi4s1i5nqir2izdaa5gca3216gqb00mr06044pc2h059j6h";
-      name = "ktouch-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lvsdhfw8c30z36yyjfcxprcw3ik3jb2s-kollision-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kollision-14.12.3.tar.xz";
-      sha256 = "1gfzya87q202az63dvrfpyf70khc27vh9nj5hriyql0kzyqy0xgf";
-      name = "kollision-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0vnr7sljdzsxpkdyzz08yspr6kcbj0vn-kdegraphics-thumbnailers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-thumbnailers-14.12.3.tar.xz";
-      sha256 = "023b1la31qc2b8rfmc3nxi29pd3jld6p2ivi1sdl1pybcillzpax";
-      name = "kdegraphics-thumbnailers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lrkq8yk3wr9gwivm2177vqv5y2sh7zcf-gwenview-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/gwenview-14.12.3.tar.xz";
-      sha256 = "14kwdayzffsc8nk20xl86gqspbvrwja9x8h2dc498cqag0l60hcw";
-      name = "gwenview-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qgxz0771xbp8zvqplrv3g8rc89025xqa-kmines-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmines-14.12.3.tar.xz";
-      sha256 = "1xbpdq8250srbg2c10iz44aa6i19srk4x0f0bcsjhc53r8680g0f";
-      name = "kmines-14.12.3.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/applications/kde-apps-14.12/manifest.sh b/pkgs/applications/kde-apps-14.12/manifest.sh
deleted file mode 100755
index 7e3038275b8..00000000000
--- a/pkgs/applications/kde-apps-14.12/manifest.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../.. -A autonix.manifest) \
-      http://download.kde.org/stable/applications/14.12.1/ \
-      http://download.kde.org/stable/applications/14.12.2/ \
-      http://download.kde.org/stable/applications/14.12.3/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/applications/kde-apps-14.12/renames.nix b/pkgs/applications/kde-apps-14.12/renames.nix
deleted file mode 100644
index 011cb77337b..00000000000
--- a/pkgs/applications/kde-apps-14.12/renames.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Analitza5" = "analitza";
-"Backend" = "kde-workspace";
-"CTest" = "sweeper";
-"ECM" = "extra-cmake-modules";
-"Gpgmepp" = "kdepimlibs";
-"JDns" = "kopete";
-"KDE4Workspace" = "kde-workspace";
-"KDEGames" = "libkdegames";
-"KDeclarative" = "kdelibs";
-"KSane" = "libksane";
-"KdepimLibs" = "kdepimlibs";
-"LibKEduVocDocument" = "libkeduvocdocument";
-"LibKdeEdu" = "libkdeedu";
-"LibKompareDiff2" = "libkomparediff2";
-"Libkcddb" = "libkcddb";
-"Libkcompactdisc" = "libkcompactdisc";
-"Okular" = "okular";
-"QJDns" = "kopete";
-"QMobipocket" = "kdegraphics-mobipocket";
-}
diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index c664c248171..1e94ffe11a2 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -30,6 +30,7 @@ let
       ["Backend" "CTest"])
     // {
       "KDE4" = "kdelibs";
+      "KF5KDEGames" = "libkdegames";
       "Kexiv2" = "libkexiv2";
       "Kdcraw" = "libkdcraw";
       "Kipi" = "libkipi";
diff --git a/pkgs/applications/kde-apps-15.04/dependencies.nix b/pkgs/applications/kde-apps-15.04/dependencies.nix
index 08ceda442d5..a66843197f7 100644
--- a/pkgs/applications/kde-apps-15.04/dependencies.nix
+++ b/pkgs/applications/kde-apps-15.04/dependencies.nix
@@ -433,6 +433,14 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  kde-l10n-eo = {
+    buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   kde-l10n-es = {
     buildInputs = [ "ECM" "Gettext" "KDE4" "KF5DocTools" "KF5I18n" ];
     nativeBuildInputs = [ "cmake" ];
diff --git a/pkgs/applications/kde-apps-15.04/manifest.nix b/pkgs/applications/kde-apps-15.04/manifest.nix
index 9475b54c571..09d89ef7045 100644
--- a/pkgs/applications/kde-apps-15.04/manifest.nix
+++ b/pkgs/applications/kde-apps-15.04/manifest.nix
@@ -2,7635 +2,4071 @@
 { stdenv, fetchurl, mirror }:
 [
   {
-    name = stdenv.lib.nameFromURL "pairs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fsaycjsmkm1g92j3syc2a8nwdgfgs99g-pairs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/pairs-14.12.1.tar.xz";
-      sha256 = "13byliibd6fwa8bsgka8hc64jkprmgsnqh9sks36w7ic22f32qhx";
-      name = "pairs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccessible-15.04.0.tar.xz";
+      sha256 = "1q90ak7yxvvi5scxajb3d4nid2h7y7xfvdbqfd9a6w312r6lcvz8";
+      name = "kaccessible-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4ggxl3vnlngg1p6irixa42as7gyp3c8k-kgamma-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kuser-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4q0xn6h1mf6plwikl16v490hbcm1c3jf-kuser-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgamma-14.12.1.tar.xz";
-      sha256 = "1ad2c1l2lbc2pdybavnnj834ww82rbm91k0wjgz25xc3l3gkrg9i";
-      name = "kgamma-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kuser-15.04.0.tar.xz";
+      sha256 = "0fgjfd76iiyp98013x9la61qxnw454kcrl7vpikg37hqaqbzmgkh";
+      name = "kuser-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktux-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n68cvnv9h371cx7q5jqfqs2bdj1rqvyi-ktux-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kiriki-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p393dfammjyxak0wm3vblzcb8n7r0gnw-kiriki-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktux-14.12.1.tar.xz";
-      sha256 = "00x5jm26w1a214chdg1fkzki1z3h1dbw5qagal4lkcb98fi5sbcq";
-      name = "ktux-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kiriki-15.04.0.tar.xz";
+      sha256 = "0cg4iijyk96lwc48ifs5arip3y51wpb4fd4slgjbkhvg4fc859sa";
+      name = "kiriki-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "analitza-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n8ayxw5rwzlyc015ff1lzwnd2wa3ss4x-analitza-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/819bf5a5q4b4l0w9yi099capf9il9whz-kdepimlibs-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/analitza-14.12.1.tar.xz";
-      sha256 = "0jgmjda5n5935v37jgaichk5hif67mzlyvxqmr19wwmbiqfbazx8";
-      name = "analitza-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepimlibs-4.14.7.tar.xz";
+      sha256 = "1cmqyx0shm0ss48pjh9jm9g9bghkkl6fg5wgw4yhs4dgz1nj9qn1";
+      name = "kdepimlibs-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hz00x8miy3gw4gm2ylw0v90d8xnxxqml-kubrick-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "amor-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fmbdfhm9703yaq7x619d1s97il6prp7r-amor-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kubrick-14.12.1.tar.xz";
-      sha256 = "0c2ixhd3763pzy92z1ck638wggmq3h4jvnax5ralfhhvn9r2f5bj";
-      name = "kubrick-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/amor-15.04.0.tar.xz";
+      sha256 = "167j2qqkivrc2pid11nmnllw2m2amr8d9jvafy54j3i7mcbs788k";
+      name = "amor-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fv5vdi5m80l7hzkhkidyk5rd1srghl8x-ksirk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "knavalbattle-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/y9k66adhrcr1vxyzdvsx3zymkd7b4zaa-knavalbattle-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksirk-14.12.1.tar.xz";
-      sha256 = "1sdd117xhn9jclqiczh1cr8apy0akwncmbj82gwm7i1qx31i55fx";
-      name = "ksirk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/knavalbattle-15.04.0.tar.xz";
+      sha256 = "0hgwx63g1lrzrszajya4va2pidh2xm1qy7b8iw5xi1yz1khn6cvd";
+      name = "knavalbattle-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "katomic-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9wa79ygill8gb5n281cybrmj4zv627h9-katomic-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kiten-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zb4wpb0g4vbkrnwrk7d54l2dd88cz4b2-kiten-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/katomic-14.12.1.tar.xz";
-      sha256 = "1mjzm4v80cva7kfakjpjkd4sw4fdcyin5f2srck7fl0pnqdpnhqz";
-      name = "katomic-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kiten-15.04.0.tar.xz";
+      sha256 = "0lpvwm20zr7zq7p09igbacqhm7pv4bv7r701nijw5l9l4d58hq3y";
+      name = "kiten-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "jovie-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/w4b045lmp2viqrvifkm11n282l5khwbd-jovie-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4i8v7c1a44idrlpdqc6yk41w6r34259x-kwalletmanager-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/jovie-14.12.1.tar.xz";
-      sha256 = "1xkmybfgn6mbrp6lx8ri0dzmz1nsvg9cxlxan4n5bzwd3zjpycjd";
-      name = "jovie-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kwalletmanager-15.04.0.tar.xz";
+      sha256 = "0c5r6pfinb509a0mn2k31wksiya9b52pjm77bbaq60k1y39fsizc";
+      name = "kwalletmanager-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ky4vpsb0mm22raiq0r6jfxjsdr5c0vmv-kdeartwork-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kalzium-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6ivi9a4yilhb621zj0kz07yzbxa5wpxs-kalzium-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdeartwork-14.12.1.tar.xz";
-      sha256 = "0jrdyy787wnqx31nrgmf7amhy5ix9w7anfnqrdn4w8yydpvghhqw";
-      name = "kdeartwork-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kalzium-15.04.0.tar.xz";
+      sha256 = "1x3vdi9h5px84cm7k1nbrlakkb13xrc25d6yw22pnfsf3v4n66f5";
+      name = "kalzium-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kapman-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l5xwmjgcw6rbmmhy2m5z55hxcf9d12hv-kapman-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kfloppy-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7w91cal36byklnn0mzzclgjj5hpjzb2j-kfloppy-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kapman-14.12.1.tar.xz";
-      sha256 = "0bkpcjdcax6b3dp236ybaakpxz5b1vkrmmxpczvg6hf2cqwmlsv5";
-      name = "kapman-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kfloppy-15.04.0.tar.xz";
+      sha256 = "1nmcdzd7zhr4vfxb8lgl7dxfs01wy81kcag36s43hg7mfs5xb0k4";
+      name = "kfloppy-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/aixz1c1q6rnpqxm805xdirlqg47kw1kr-libkomparediff2-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kolf-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/76g0y1k03dlc50d5wfdgpb2grsy9p0qa-kolf-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkomparediff2-14.12.1.tar.xz";
-      sha256 = "0fjqsa83sqd7gcpm818yirnm077g6q616rh9676dzwv0cmc334zx";
-      name = "libkomparediff2-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kolf-15.04.0.tar.xz";
+      sha256 = "0nzqvq5y2mvh7x2lsq8prkyn99j8137hq5pyk5d9yhla4lpq2lr4";
+      name = "kolf-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kx7kv61rc3ddz7gmm5k5cwp9zh3k70nk-kde-wallpapers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "print-manager-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rmvqcnl3b77hxhcw7z22vx03pi1gk3gp-print-manager-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-wallpapers-14.12.1.tar.xz";
-      sha256 = "1q28rb8a4rw6v5wvwri3aslc8xwbn0324b07lnkvn58alpmdga8v";
-      name = "kde-wallpapers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/print-manager-15.04.0.tar.xz";
+      sha256 = "0yn8dhvpxv5dxdn41c6rzar66gvlqmgb3m9f0rdrxzqmw9xidzrg";
+      name = "print-manager-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ark-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c21hgh72czi1nqr3lci8lynvsd3qkvzh-ark-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "poxml-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kinljjyys5d6s5rfyhl6jzmh8z5bm92d-poxml-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ark-14.12.1.tar.xz";
-      sha256 = "1fimg9f4l373l31kr59fvvsavssvn3ljdrxrgnl6a66v1gwgjsdp";
-      name = "ark-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/poxml-15.04.0.tar.xz";
+      sha256 = "1cziw2ydylsx45s5hrg1bfwk8qv9jbvji3hyzwi6jqc72fpv9q5x";
+      name = "poxml-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b867ygwgvr9g8j54s3gya7c2wpr9gwf8-kdesdk-thumbnailers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kblocks-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jjkr9khw6fzh7hb4xss9jx2qwz05jral-kblocks-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-thumbnailers-14.12.1.tar.xz";
-      sha256 = "1p3abcnidk07jgr9qn03zfnhqci27683gz25wy271v6gl7b0wp6c";
-      name = "kdesdk-thumbnailers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kblocks-15.04.0.tar.xz";
+      sha256 = "0q32xvajnv7x3fmhax1bmc4f7530cijisn48hpnpkm4g4mn68qb0";
+      name = "kblocks-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hp6x10injwcygbd5zqvkkg2k85n62drw-kde-l10n-wa-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdf-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1wrgspd1n890ln1dffghslw86z2ynfz3-kdf-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-wa-14.12.1.tar.xz";
-      sha256 = "0aq5n0n0saqkllkwpf9a5scjpsv4bxzx89z2a048kh76i8h9zr5p";
-      name = "kde-l10n-wa-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdf-15.04.0.tar.xz";
+      sha256 = "18i9rbl210vj370n3irjy2ai4vrhg26ivfs37wl0zdvz4i81ncg7";
+      name = "kdf-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j8x84jy2x4fw72a2mj7zgzkbd2v430np-kde-l10n-it-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/krsghsp3cs3wmib774g36933smh1bldv-libkomparediff2-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-it-14.12.1.tar.xz";
-      sha256 = "13z9gmaziyvw112phzxc7893lz6wh8q92gb3fj3hmdmzj0vfqv4r";
-      name = "kde-l10n-it-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkomparediff2-15.04.0.tar.xz";
+      sha256 = "0i9vyc4bfqj22a1v48f3gyfkxl3pi9smsg0lql1bs0x8rsn7iznd";
+      name = "libkomparediff2-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yccjbanz6ijsf5rdd0n53cwygbv5jm4m-kde-l10n-km-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/659kk26hrkssc4xkyda1kwf41ri00csx-kde-dev-scripts-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-km-14.12.1.tar.xz";
-      sha256 = "0fdns3fifr4ypz5mi798xc18miwlb7lqz22f18gnrza22vnzwi09";
-      name = "kde-l10n-km-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-dev-scripts-15.04.0.tar.xz";
+      sha256 = "09r8wcln0m5akwjs939dbbz20kdqyxag91028vfmwzkw9r99604y";
+      name = "kde-dev-scripts-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mzfjypmyhmp3s7mnxk0mwf57s3l440c2-kde-l10n-pt-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepim-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/i8i89jlpkd3rmgyfbw8xbv67az4xkmjq-kdepim-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt-14.12.1.tar.xz";
-      sha256 = "13pzz23zf9nnl3a65nrpmwlpnkvr490vfs7yfvvr5w0nrqfwzhp6";
-      name = "kde-l10n-pt-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepim-4.14.7.tar.xz";
+      sha256 = "0hnmpjrcv0qcyn6hagpayza2bjkyd2v8y02rriifq9q99j7rwyj0";
+      name = "kdepim-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pjdp04f6m3ghqr23lyzxw7w0fgg5i6ll-kde-l10n-ru-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/xdmcjjrfxhwwigf32sbafbakczc9jfyd-kde-l10n-km-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ru-14.12.1.tar.xz";
-      sha256 = "1a5ygssdwkm9iqakl1w4pza70g1gwh7mzi6jzhbd4jsn740ykw0r";
-      name = "kde-l10n-ru-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-km-15.04.0.tar.xz";
+      sha256 = "1rv7pp35sgqppqs320pnlpqrjs0ljix9dd92fl2jrfpag15fi887";
+      name = "kde-l10n-km-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4j1r5xz2fslwv0di0dn9x8n49hrxizg4-kde-l10n-de-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0kz1fd8ha3m8r5kmqa9phr607ayry1ds-kde-l10n-es-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-de-14.12.1.tar.xz";
-      sha256 = "1iavp7xr2qv8i97sl1kpl9kasi21br91l3mdah382ayhaz5khnlb";
-      name = "kde-l10n-de-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-es-15.04.0.tar.xz";
+      sha256 = "0bjh1x3snldbmfvdamgid23cxv1sn3qwsdpy92h1djb49zbm51a0";
+      name = "kde-l10n-es-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dz1zi3jrw92cgci5zc8nia3xzq1zykdf-kde-l10n-uk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/brvc7zjfmcvif2y8n4zrmlva72v243md-kde-l10n-fi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-uk-14.12.1.tar.xz";
-      sha256 = "1228lpwggkwz9rwnmrmrw4f72hcbng40g1q1bfhjzw078s7j6nxr";
-      name = "kde-l10n-uk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fi-15.04.0.tar.xz";
+      sha256 = "0xh66i7wgapi6bhig712mlq8dkaml9dpzsj43dic58xw8bx4n6s4";
+      name = "kde-l10n-fi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ylf7xmqdh9yrz37yaq4f8nddap1gfanc-kde-l10n-ja-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h0hfrfigk06zqqgl0crsah3sqgh05syp-kde-l10n-nn-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ja-14.12.1.tar.xz";
-      sha256 = "191whr3i7qkqj2wjzjqgagb1vs391x9sp688w56ynjjmh58vrvq1";
-      name = "kde-l10n-ja-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nn-15.04.0.tar.xz";
+      sha256 = "1d2yvvl6rralsw77vg6hmbi84dswf116dpab7r5039nqgxnr8k81";
+      name = "kde-l10n-nn-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b6n06i5p82k6fq4p4rpl7bf0cyklazxb-kde-l10n-kk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/r2mbi7gj1a4f71cp6xgjxfkbmx1qzzrp-kde-l10n-it-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-kk-14.12.1.tar.xz";
-      sha256 = "01ivq7g550i9ik18xnibn7xl5mmm237wrsksjm0xni18s89wwz8b";
-      name = "kde-l10n-kk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-it-15.04.0.tar.xz";
+      sha256 = "1izidgcrzyvxka143cpnvrcnf2ddzp8384sjw6bvw32wsxi3v0mp";
+      name = "kde-l10n-it-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ysarksjh5lcm2yhbphrsqhyzmlp6qclr-kde-l10n-pl-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kxaxpwzy0bs1675by3qhhvj1hlvvig7a-kde-l10n-pt_BR-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pl-14.12.1.tar.xz";
-      sha256 = "0ni41lp6l4l3pa1xf6kkim2k5qcvapm2g65nh5hryiwx9dpgkimv";
-      name = "kde-l10n-pl-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt_BR-15.04.0.tar.xz";
+      sha256 = "0s6pc40ig83zjqbgqwhfkxzhp9wcrgac6hs5qhcxbs3awfmxi5hn";
+      name = "kde-l10n-pt_BR-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zpq7ayj7ihr1xw4ihcnckqvnagl28lk0-kde-l10n-sv-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mxmsybkjr2pr2xwfrxciwf6jjn2mp1vj-kde-l10n-kk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sv-14.12.1.tar.xz";
-      sha256 = "1r84629cv7c0lkfxii0q133cl710rgiqp5iylb3w32h7c1ji4x19";
-      name = "kde-l10n-sv-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-kk-15.04.0.tar.xz";
+      sha256 = "0czb1dmrdciim910bnazvsvi7lcvq27bj055f36w6y6l1zgvv8c3";
+      name = "kde-l10n-kk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/g5pcas9cz1yq6qz9883l2djfpb77li8a-kde-l10n-ca-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cj9bhf10x4rcvcia97l9qhjnzll979ls-kde-l10n-fr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca-14.12.1.tar.xz";
-      sha256 = "1xprgp7l1h7wkfjh6v3yya9xw3r60vhsyk3ly38vcwxy5b6fjigd";
-      name = "kde-l10n-ca-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fr-15.04.0.tar.xz";
+      sha256 = "0g94wik9q6c9w5x851k76qfk0fknv6ga497vwqka1h4yrmdmc1vl";
+      name = "kde-l10n-fr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/v6hb004qp3i0p4vp1yslnmz4clb66p8d-kde-l10n-da-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pyl52lwdrvfi3xpby5yyi93204jp3mjx-kde-l10n-he-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-da-14.12.1.tar.xz";
-      sha256 = "0b38wgm8f23l9ya9h67m6zm785fmqi7737xfphjmrjh2i13gxpbl";
-      name = "kde-l10n-da-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-he-15.04.0.tar.xz";
+      sha256 = "0hpnn6rci0bavl6hqs6v2ylz26sjyf5siwi2klfc3fsw6a04in43";
+      name = "kde-l10n-he-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/33f2k043b8gi64mr4wwrs6pwp5b9bq7h-kde-l10n-he-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rn2hih1b8fdbjahg1va76kn7cdjq05g9-kde-l10n-nb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-he-14.12.1.tar.xz";
-      sha256 = "0ynvsrczdraf55gaiwbv9nzwy548zkkbdh475frqfmalzh9b7jww";
-      name = "kde-l10n-he-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nb-15.04.0.tar.xz";
+      sha256 = "1mz3bcm92745zr6gn7q85p72l57sh19bcvvkpg40c63k34xpwpan";
+      name = "kde-l10n-nb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7hlk5vyd3pl9rdp22ybsj868w6s7sfz0-kde-l10n-lv-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8mvkdlcf0azzq8y5g1r2bbq15z92b8df-kde-l10n-fa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lv-14.12.1.tar.xz";
-      sha256 = "0x3rlallirrzgn8gfyssyvaj3zaji672n6hfacp2djpfzbfwqq6l";
-      name = "kde-l10n-lv-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fa-15.04.0.tar.xz";
+      sha256 = "1jmwjlbnlciy4k9szqi7vjwjpx94faixjg2mmg42cjfx5as9ws5x";
+      name = "kde-l10n-fa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b2v25j4hlsl7lqb77wk7sj1j5z9q7ldm-kde-l10n-hu-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/01ryc8gdgvjawaki8qaw5dpbyibvng63-kde-l10n-nl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hu-14.12.1.tar.xz";
-      sha256 = "061kyzz24f6bink3sm4p7q959977ril3m86lm8fa1ddnccw7ya46";
-      name = "kde-l10n-hu-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nl-15.04.0.tar.xz";
+      sha256 = "0a3c7fkw0cczdd5733c7klfsffpi5ah1i6alqknm15y534bsigzc";
+      name = "kde-l10n-nl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8a3pmbwm8k7g951yi5d3mv57y9vxn84z-kde-l10n-sr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g71kfpca8y88a0dmcrphban2vjvyr85m-kde-l10n-cs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sr-14.12.1.tar.xz";
-      sha256 = "16kcpilb4mp4cfgklc4dr6y389hlmzvwx8wp0y3i2w1r18nwd8m8";
-      name = "kde-l10n-sr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-cs-15.04.0.tar.xz";
+      sha256 = "1bl0w1qhk05xqniv1piik9gkj5nlcsb90bpxlvj0sd5ivcqxma53";
+      name = "kde-l10n-cs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l4fy9j1aix7fyisan5f2pa4273misph2-kde-l10n-is-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/afq8qa9cr7yli1djasn7xs9fg781b3dd-kde-l10n-ko-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-is-14.12.1.tar.xz";
-      sha256 = "14r5wrkr39cipx40hqqcx12cvv0vql829689yiy97ypcg4bqndma";
-      name = "kde-l10n-is-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ko-15.04.0.tar.xz";
+      sha256 = "181gzqhg6lc5z045l05zxz4zrc6hx36fmb91v62sfn2w70dc6jmd";
+      name = "kde-l10n-ko-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vk6fz8gixl7wv6w20h4inn984839lkkk-kde-l10n-mr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0whvwp9h1lrnqcf68qihaq5mlz73lm5b-kde-l10n-is-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-mr-14.12.1.tar.xz";
-      sha256 = "1nvaxd38c4f9kkhkrv4bb1aczi1iv1bp16kmm47s1y6kzb93zq9h";
-      name = "kde-l10n-mr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-is-15.04.0.tar.xz";
+      sha256 = "050fdym6mlj1m1m594jglhjcxwk8dx4hc6p1428ldc19m4b9q06c";
+      name = "kde-l10n-is-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0f4agkrcrb1cn6sdgdpj1bwln6f2ra5i-kde-l10n-gl-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fd72fjmwlgy7znmi7gz71qzd6fb9w5k7-kde-l10n-zh_CN-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-gl-14.12.1.tar.xz";
-      sha256 = "1xjh19c7rjd5k3v3c7g0ljz1kz5vv3zhji4rm84j30z12cks3nhh";
-      name = "kde-l10n-gl-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_CN-15.04.0.tar.xz";
+      sha256 = "0klkxznhfc5sfrlnz80fqf06lzk8g411cz2v0wpd2wjafk1pyf56";
+      name = "kde-l10n-zh_CN-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3nk8pxfypvnwbcszm33fn3j7f0kmgdji-kde-l10n-cs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g1nxxpcihfcb0kwk0bm53acvv8b0yfgh-kde-l10n-hi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-cs-14.12.1.tar.xz";
-      sha256 = "1qg9y5173374fpf6yk4v8mlsqdjzp8inirp08qx0lh33jd6rpddb";
-      name = "kde-l10n-cs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hi-15.04.0.tar.xz";
+      sha256 = "12qgzwiy0igz7i352dwk5ipsxhia0spi74ibk70xr7irr9axgidr";
+      name = "kde-l10n-hi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/i5vsmw062i49ki35qqyi0ix6x5fl4jvg-kde-l10n-en_GB-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/knj0hcr1dirq6rlhmw9dg1vl5ag52h6k-kde-l10n-ja-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-en_GB-14.12.1.tar.xz";
-      sha256 = "04b7amh2247ksr414m3x7bc4p22xm6kxncsax9ggapx613flb2zc";
-      name = "kde-l10n-en_GB-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ja-15.04.0.tar.xz";
+      sha256 = "1b8741fzhimf3bch6mc9hzdj040y50gf7fgd7ja5n5ipi0ma2drf";
+      name = "kde-l10n-ja-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p2jc4kci6k5kn1ihy9yv5inp4p4g01n9-kde-l10n-sk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lg8jgickpm35z3mfypigxhngq4r93c2h-kde-l10n-mr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sk-14.12.1.tar.xz";
-      sha256 = "0ic2y081699mv16hpkb3ivdvd4ph51wz3md5bz65pfz404gn7krf";
-      name = "kde-l10n-sk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-mr-15.04.0.tar.xz";
+      sha256 = "0v2mcmrpqz31yix7z7kcjcfpwpghsifnvwmdf1k1lif0a9mq5qq1";
+      name = "kde-l10n-mr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4kbdmqqmv1slh4z56rifg8sw0a9980m4-kde-l10n-ga-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yq2f4v4vfafxk8j1j1v97jbh39bklnag-kde-l10n-pl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ga-14.12.1.tar.xz";
-      sha256 = "0794p0dqa1nnkwwc2ipslzhaakcx3r4b6s03hf7m14r58wmvws28";
-      name = "kde-l10n-ga-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pl-15.04.0.tar.xz";
+      sha256 = "002nladxsgh9pamcaibsx7z7dcvcpbii9dyql8v3845wqjpgj8wk";
+      name = "kde-l10n-pl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hdyxfm2wnigh8wb3ay8y8v7psjrbijy7-kde-l10n-sl-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1i36fnf4018v9zc0awz7raqbv7269cay-kde-l10n-ug-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-sl-14.12.1.tar.xz";
-      sha256 = "0nv2yrk99dkvb49ww6l6za0czy89p1nsilm56f4mdgbvrgzwk9zp";
-      name = "kde-l10n-sl-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ug-15.04.0.tar.xz";
+      sha256 = "094x3jnaby75q1j7q6c79y0sw63hsqqvw1qv0dzjgghky7qs584s";
+      name = "kde-l10n-ug-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ln3d7jpln9kl947fhgknbhg0rh6lnxds-kde-l10n-nb-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0svv0vq2dl7cm4wihdsp459m404jvimk-kde-l10n-pt-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nb-14.12.1.tar.xz";
-      sha256 = "0zj66ydg5pwlx3hwwdxz6i8m330wz0w2l2p4fvf4kjvy49cafrmd";
-      name = "kde-l10n-nb-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt-15.04.0.tar.xz";
+      sha256 = "177b455rgdrm021lvwlx6xgbnk3mh38l6080i2v52rzjm6bmchsy";
+      name = "kde-l10n-pt-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vw8kpmpiyrrqch5wb4164yv0jhkdkpkk-kde-l10n-ko-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h1i1cg1qhsxfiffalx4j4bar3nbwjpjr-kde-l10n-gl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ko-14.12.1.tar.xz";
-      sha256 = "08q0d0q2cm2bmdwwmyavzb07wlbnf5lpl071gjm146kzk0y1kmpg";
-      name = "kde-l10n-ko-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-gl-15.04.0.tar.xz";
+      sha256 = "0l27hrsd1pbk3w0lgz34zspmc6b4cs4y0p8i6y1sq51sd5p8qwd4";
+      name = "kde-l10n-gl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/87kmgghdnkmzvdbk611qmv2nav8m2f0p-kde-l10n-ro-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vsqwvz9r39nypa1hcxnn3figzyngpf6v-kde-l10n-ar-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ro-14.12.1.tar.xz";
-      sha256 = "0xprq9jw94i38aaq1drkv1qpgf3rf75745zlagzb430jr1a285lb";
-      name = "kde-l10n-ro-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ar-15.04.0.tar.xz";
+      sha256 = "04djbcdq3z4iysbvdiai2qd7wm9zx5fp400k3zsw36150g93ar7q";
+      name = "kde-l10n-ar-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/h8wfla9jsbhfjvjfnca6yjwpcc90nb5m-kde-l10n-ug-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ug-14.12.1.tar.xz";
-      sha256 = "1am6yr3qq4l2wgpphxhqfj8ydndvjxmc3cl4gz6zlkddaw4pv5kr";
-      name = "kde-l10n-ug-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca_valencia-15.04.0.tar.xz";
+      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
+      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mja592hds8ajqsx96wb1zxph1n0pxqb0-kde-l10n-hr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hr-14.12.1.tar.xz";
-      sha256 = "0hjhzf77mckh9xqqxn54w47lsn3fwl2p4rfk22ijlliglrylpajv";
-      name = "kde-l10n-hr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-uk-15.04.0.tar.xz";
+      sha256 = "0n01ypzyqr8k30hakahpm68430bgr207yv5mbw2parzj3xbwzpbl";
+      name = "kde-l10n-uk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9vay8airc00fg0d91lpp84l21akqxn27-kde-l10n-pa-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fn45av76smcp2bj01aphy1m49na74jlz-kde-l10n-el-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pa-14.12.1.tar.xz";
-      sha256 = "0sr6pygs0lk1ar2zn6966ngaf9vjfy207i1bgg6gr3559v5wkx8x";
-      name = "kde-l10n-pa-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-el-15.04.0.tar.xz";
+      sha256 = "0xxfqc1hzf3nbvja8c6aq6axpwx64ifqz32nxw4171valjj1faqv";
+      name = "kde-l10n-el-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/sx4w67x5xq87ragvsysg4jwcpvrk674p-kde-l10n-id-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ijscp8qiliavdzda0k4vzgmfp30a065q-kde-l10n-eo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-id-14.12.1.tar.xz";
-      sha256 = "018yvdp7l9qjaj7niyjas87dhna1xr0mikpdycw5dbwchpizlr53";
-      name = "kde-l10n-id-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eo-15.04.0.tar.xz";
+      sha256 = "12j9ggkgjbz229iwzpb19hjnl6zy2fvgkk68mh133ij3ik70i3bd";
+      name = "kde-l10n-eo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/l9cx18xxg7ly9nrsfi1lj9vxzg19h9sq-kde-l10n-bs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lm8d1vbsplg0r6z7ksir7z9nqjy7c0pj-kde-l10n-hr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bs-14.12.1.tar.xz";
-      sha256 = "0ybh9wyhym05rlc3s0kl9lh07y96nyl3p4lifj13lcqi975mgnp9";
-      name = "kde-l10n-bs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hr-15.04.0.tar.xz";
+      sha256 = "0a0p1bspv849zdja86rw7lvg60h6rgl1g5hc4zajmq9sviknsy3k";
+      name = "kde-l10n-hr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/59bsq0cq07hc9apbfdmaa66jg5n8wlwg-kde-l10n-pt_BR-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bm9c9n9jln8aadmjmqhjqh67vd2d3126-kde-l10n-lt-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-pt_BR-14.12.1.tar.xz";
-      sha256 = "1wbgns7pq0jxjffgvr6hgfg3san1k2c7wppsvn2cpjiph0v4azz9";
-      name = "kde-l10n-pt_BR-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lt-15.04.0.tar.xz";
+      sha256 = "1l899bj9zw5db9wf6zhd6f9mpyynwagk907q8ws2xh6nlgrs9ydx";
+      name = "kde-l10n-lt-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9xiaf2c0lbxy65vrx6hdh884ky6h2s79-kde-l10n-bg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bp31anbdx5f3blgdnhl205vrqw9jgfx0-kde-l10n-de-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-bg-14.12.1.tar.xz";
-      sha256 = "0m404hxz8dskbdsni021703vdn4lvwpf88hwrdrfnhcv06jazjiq";
-      name = "kde-l10n-bg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-de-15.04.0.tar.xz";
+      sha256 = "1hd0pz2n0l1hs5dy8426n53w8d0a4mys7m7wyihs0a7akf76cy4s";
+      name = "kde-l10n-de-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/m8ahg0qxpv2hskl9dl7dgch10adxfia5-kde-l10n-nds-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0a57w09ilczqr5dwwz8x8qvgqq4wbzpj-kde-l10n-ia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nds-14.12.1.tar.xz";
-      sha256 = "09r79l4ngcsnya6kqj5hj69xq00bf4ndxgkkplwiq137zqamqcfl";
-      name = "kde-l10n-nds-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ia-15.04.0.tar.xz";
+      sha256 = "03wir3y5hz3fnkqqv97bcjv4rc768f953y8dqsc362a61zidw70l";
+      name = "kde-l10n-ia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mq5v891rzj692h61aak71g71iy963ayw-kde-l10n-zh_TW-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/whhz3930c4q5n50v7n9xbzc6l4xblf3m-kde-l10n-tr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_TW-14.12.1.tar.xz";
-      sha256 = "1azwmzg47pk4b23hpnpic3c8phnfz4iy3n6lv50sz98b9whkmf0s";
-      name = "kde-l10n-zh_TW-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-tr-15.04.0.tar.xz";
+      sha256 = "0h1997x62ycisnfnbawjfqfwblh6fhqqscns79f7d7krxhfyq7cr";
+      name = "kde-l10n-tr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gprdva58d383n4ka677pdbpaz8l05w8i-kde-l10n-nn-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/22fjrzh19zha3ldbwkb7l64gnnq60i5h-kde-l10n-zh_TW-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nn-14.12.1.tar.xz";
-      sha256 = "1xp44glwk6nnnavw0lrl7ssl5miqfd7b093chfz35g2g92nyaa3g";
-      name = "kde-l10n-nn-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_TW-15.04.0.tar.xz";
+      sha256 = "077pr968z7d8ldnv87vsfn9j13llx3qqw9gwc041c9av73vp4ccg";
+      name = "kde-l10n-zh_TW-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jhv6zy04igavcq0dxsg9kk3vfh2063m9-kde-l10n-ia-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/16bpvmlzzw1cqjmrlvznd5751p1fsi18-kde-l10n-sr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ia-14.12.1.tar.xz";
-      sha256 = "1kjjg4z4y0fh4kyzy9vzxlw47xkiirh207d7x0b94nksxzbqwg67";
-      name = "kde-l10n-ia-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sr-15.04.0.tar.xz";
+      sha256 = "0yicfyaj6zckk0x9skw9q3qnh0f0vz6pmahgh1pd5ayl3sqs8dhk";
+      name = "kde-l10n-sr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hy0v61dnnmpbj84a4imvgxqx3y0fd5qg-kde-l10n-tr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zv04hsibpg539rzkg1g7h2nfm946pz8h-kde-l10n-lv-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-tr-14.12.1.tar.xz";
-      sha256 = "1kdxps75gv2vlf98f958llkk161z2y908bg1fdq4rgdh1n3bylkh";
-      name = "kde-l10n-tr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lv-15.04.0.tar.xz";
+      sha256 = "1r2fahydjybk5zparmn4wjciys5kjsjps2mkhlk1x5k9aa0wimjg";
+      name = "kde-l10n-lv-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jmjbgfmqvcqd1sxdj0a7c73a9yqyzvpz-kde-l10n-ar-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/04hs3q4dknk3b305zqibxskqnzm4f6r0-kde-l10n-hu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ar-14.12.1.tar.xz";
-      sha256 = "121dblyh53fb3qirg7s9givqcn0xswdj2hrnqc8s2x2qas74v6a9";
-      name = "kde-l10n-ar-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hu-15.04.0.tar.xz";
+      sha256 = "010d3x7l1kadp3wj2v9jg0bjd9d3xw2q3ql7i21705s2zi2any7k";
+      name = "kde-l10n-hu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/b9dqgb7nsfgyzhr4vw7fnl287spyjigg-kde-l10n-zh_CN-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5n06i2kass6wqnl6ql28s1ryrbj2399y-kde-l10n-nds-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-zh_CN-14.12.1.tar.xz";
-      sha256 = "0cyi0g55xln8smnlnhl0vfpi0jrihnfp3vrv6j2gz30zzfgkw9dp";
-      name = "kde-l10n-zh_CN-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nds-15.04.0.tar.xz";
+      sha256 = "0asgj3dkbjgcabl4qrz3i8dv0i0348dg6q0fk1sgicm4257y0a7l";
+      name = "kde-l10n-nds-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0ycvh7sgyhjqffzq5ff5mjnv0y4f8pxy-kde-l10n-es-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ai53nz76fbqj1adsl4lb0byvvcn8bg2v-kde-l10n-sl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-es-14.12.1.tar.xz";
-      sha256 = "11i4xmsigmi9mqbc5x9l96vsrfh6709fbbfpqa6b28a5jif9anmr";
-      name = "kde-l10n-es-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sl-15.04.0.tar.xz";
+      sha256 = "0jm6b37irpp0jabad4jpqlvpw6ir5ygc0cs49138hb58kcjwi54v";
+      name = "kde-l10n-sl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9rbki0767k1hirpx7530lqcw74bfy2b1-kde-l10n-et-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p18pga44549fxqa0ksijc057dd5phbd6-kde-l10n-ro-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-et-14.12.1.tar.xz";
-      sha256 = "0c8vhbi1bi29krh1sway8z0536cn507i1lp8jffb4mk953mm5y9n";
-      name = "kde-l10n-et-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ro-15.04.0.tar.xz";
+      sha256 = "1lmjz5578b1xbgdgrrlgv6vyiara2n5595kd0pg70s1ixvd986as";
+      name = "kde-l10n-ro-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pq8r37pcg05p9rc5prcy9r2f5mby7m0z-kde-l10n-fr-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6grb8a1wydjjdkn2vkv2sj1dd8wp4317-kde-l10n-ca-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fr-14.12.1.tar.xz";
-      sha256 = "1s2glywjbrr2q6ssmalblschrgny4rk3q3aws2ffrrlkanx0qyva";
-      name = "kde-l10n-fr-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca-15.04.0.tar.xz";
+      sha256 = "16n29ja4d83g001js682ijibblhfwfb8pww561bcvda84qbvhham";
+      name = "kde-l10n-ca-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k0amn3lcd7xcssqh8fs46swa9jmksv9x-kde-l10n-fa-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/izn9fzf1r2xyc57rj889rc6ziv9kjsiz-kde-l10n-ga-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fa-14.12.1.tar.xz";
-      sha256 = "0pj3klcdlash8wgvz75nw009jz63rblv038yhrh1qsidjw4vsl85";
-      name = "kde-l10n-fa-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ga-15.04.0.tar.xz";
+      sha256 = "1n8prxqxxr8r76ry0jaszsn446y8vdk9b629ypj8s4d0byz336bq";
+      name = "kde-l10n-ga-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/cqbsi6sr0mcl3pnzlk0w52disg2xgm1i-kde-l10n-lt-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pbaf3bd49drbap8bx58pgz85xllqvjhh-kde-l10n-pa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-lt-14.12.1.tar.xz";
-      sha256 = "0k4m1ixlnmmgbznhgvbmfss0c1fynd492sylcvbsrnqcawq3fqdz";
-      name = "kde-l10n-lt-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pa-15.04.0.tar.xz";
+      sha256 = "18rqlh26qc4h7jbsa6jq27k5d1d5kwdbrd1slm8fcw67r6iw72ai";
+      name = "kde-l10n-pa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8pw7v2ccr5vgl6ic7dnlm5xcqgkbvxyr-kde-l10n-nl-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/311y10ml4kxpkicjlja7k6wwm05yd75p-kde-l10n-et-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-nl-14.12.1.tar.xz";
-      sha256 = "0m0hwib0v5j2bmgkgwjzhbhqnyk8gcm46969rr2qf51snrvynlax";
-      name = "kde-l10n-nl-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-et-15.04.0.tar.xz";
+      sha256 = "0hkh800rx03w5gvy1lc7fn0s5kldihcaml5ryvx0g1qrj5k61b3r";
+      name = "kde-l10n-et-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vplfymrx36jk65b0xjmzh2g4l9ky7dfm-kde-l10n-eu-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lld8r34x3lclrb30p8w0qr6gw117h923-kde-l10n-wa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-eu-14.12.1.tar.xz";
-      sha256 = "0wcax8gnnk6rwpfl6ph8z5i013rmh08pr159nxpakdsvbcn5ma5v";
-      name = "kde-l10n-eu-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-wa-15.04.0.tar.xz";
+      sha256 = "0mivzilb2f3fp5wn2vc6c3z20n0l4cdpckyk43fdb4h9sys02xs3";
+      name = "kde-l10n-wa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xdh9f96r2l1fnj1z7dl4321aj362kjph-kde-l10n-ca_valencia-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ajsr93ly7db9pwjjbrkvr5r4n0cx03fx-kde-l10n-bs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-ca@valencia-14.12.1.tar.xz";
-      sha256 = "10r6zkisnm4rcyzdxs0jbilbqg78qr9rzj5901q16kz01nm2fpfq";
-      name = "kde-l10n-ca_valencia-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bs-15.04.0.tar.xz";
+      sha256 = "0zw2q22lm73k04c3nb0596xd3hknfhc7gq9i4n7kj55sblv0mqzz";
+      name = "kde-l10n-bs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p9a3lyi934i4pc5p8433firhkcs0ybn3-kde-l10n-el-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/45bg2qd1nyjnnqi4yzpkkwcimlnr5fs5-kde-l10n-da-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-el-14.12.1.tar.xz";
-      sha256 = "022kr5cvlz8hxj3s74my680ghp23lj8amykzgr5z9i996q2hs6ps";
-      name = "kde-l10n-el-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-da-15.04.0.tar.xz";
+      sha256 = "1v07bazlq6420zkfy6m3jvwcyy2snz93967209204jnxkzf3ssk6";
+      name = "kde-l10n-da-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9f3cb3yksriwphrnkmn1knrq0108ka4p-kde-l10n-fi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ack1f3vdjkjbzpdsai22ki3lncc5v6s9-kde-l10n-id-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-fi-14.12.1.tar.xz";
-      sha256 = "1sxs5z3dkx7hb8l7ilrhzvl2ip02fsb24iqgh0gadqwdfj46gwjn";
-      name = "kde-l10n-fi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-id-15.04.0.tar.xz";
+      sha256 = "10mr2d24akz5la2bz88y827dcv061sqrbi9awbiirgd2wqisnn8z";
+      name = "kde-l10n-id-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pfswxr29nz9qylmb7n83cnap95khz248-kde-l10n-hi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gcnmv26q44ya6jb2xwhm4kvp8aqr059l-kde-l10n-sk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-l10n/kde-l10n-hi-14.12.1.tar.xz";
-      sha256 = "0a5ilahwh6wpxg4mb3wqg079qfvcxg7zqblwyx6mdwh4d2ly5y1f";
-      name = "kde-l10n-hi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sk-15.04.0.tar.xz";
+      sha256 = "13v871ahfj3bwaj0ha6fm6gpn7x9qw9m5dz89mfg3h5vskqv7akl";
+      name = "kde-l10n-sk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "granatier-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ychwcs2gn4mgmhza315nmf2z35c0ibb7-granatier-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/v7ln63jsr0v32l86rqyg6fpinzpjpns0-kde-l10n-bg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/granatier-14.12.1.tar.xz";
-      sha256 = "0lifihkssp0g30kv3iigbpr9ghdwwykmzfiv4qwsxaxadil9qqlm";
-      name = "granatier-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bg-15.04.0.tar.xz";
+      sha256 = "1p4y9rbxwwnghslwjk1m32a26h6pnssyj73ns1az3saqyfb85gkw";
+      name = "kde-l10n-bg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kamera-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c1n1s1hbj8q4smgxnd4kka9qidh0rvvw-kamera-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rkbbjy12la1p7l7vm5xk4hwy72f4piys-kde-l10n-eu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kamera-14.12.1.tar.xz";
-      sha256 = "1avmsy622rnyyvsx9zwspqx9g4mb5wzc74mvcjrivi3c3mcz2ng6";
-      name = "kamera-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eu-15.04.0.tar.xz";
+      sha256 = "129k6m59x8f63f393jxx61s67f9gmaab9ilaqy2978d64l3z0bpv";
+      name = "kde-l10n-eu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/bl5csvnm20xxaqz5p7d3ymnkbd0df1p1-kfloppy-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fzwxz4747hfpjisg7n5kc77gb92dm3c8-kde-l10n-en_GB-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kfloppy-14.12.1.tar.xz";
-      sha256 = "1ky8n0zk07d3cnap8f3zw5qck2kw4l0dql0fnbk3s58r982af2fd";
-      name = "kfloppy-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-en_GB-15.04.0.tar.xz";
+      sha256 = "16c255j3klss711iqk41k1kcf5nn0lwg0qr74c1abvgrnpsm261h";
+      name = "kde-l10n-en_GB-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/v157pqk6clf9yn21cdbvxxvh0sn892rd-kdepimlibs-4.14.4.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/49fv8h0b5lzf4cm5qc6baj9sk9k29pnz-kde-l10n-sv-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepimlibs-4.14.4.tar.xz";
-      sha256 = "04c53ms91r8bpxgn305zzvagi30jli7217kvgdy4z4il6wnvns8r";
-      name = "kdepimlibs-4.14.4.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sv-15.04.0.tar.xz";
+      sha256 = "17z9yvw9mrjb7h3qa4zc18f5z2n6b0gr4y76s7jfnh8kpjgm1sgr";
+      name = "kde-l10n-sv-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7amx4gdg85lw28amb0v3nd92hk71lphs-libkipi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/30j0lkfk4p7pwv4nyknvm1wbd93cfji7-kde-l10n-ru-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkipi-14.12.1.tar.xz";
-      sha256 = "01bpjh40p5cwli018sgyn6jgis1l83icikabcw6vxkp8vsn3q6yg";
-      name = "libkipi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ru-15.04.0.tar.xz";
+      sha256 = "18l7wnfr1indy8im131lxd45da9x49ii1iavi8g1lzmqq0av097z";
+      name = "kde-l10n-ru-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khangman-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jyx0msd02v7iikj7czv3y8ckw79rahpa-khangman-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kcalc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4qsl43z86wq82bpspki2y4gfn8iy6xag-kcalc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/khangman-14.12.1.tar.xz";
-      sha256 = "1574cdbq5lyq4hl84xwia5z15az4zzh6zvasxvaa5bz94cjkpyns";
-      name = "khangman-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcalc-15.04.0.tar.xz";
+      sha256 = "0rkvxbz9s5wqa054bf1xg3rza95plvnakydlny04iw5w8i33i5yc";
+      name = "kcalc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "konsole-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0wy6dhhq6gn6h58vi324yiqa2f5ni5py-konsole-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkexiv2-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dnl3qi3ldzmf1yl7m8yzlgxyzvj6bm4k-libkexiv2-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/konsole-14.12.1.tar.xz";
-      sha256 = "0i7mccspglppz0sx2zqfn0861h6ibxkwrcscivqk7yxpq44nb58j";
-      name = "konsole-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkexiv2-15.04.0.tar.xz";
+      sha256 = "0zv8yjgwfdvkl2ss2gyv6bqbc3qgnz3hryhcjdyfa56kys6xz7n3";
+      name = "libkexiv2-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "killbots-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yg7gb0aidvcxh4i1z0ja8nvs23vhdf22-killbots-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kigo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yvj9sxfh55nvnlvcz4b12iqqgnd3p33y-kigo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/killbots-14.12.1.tar.xz";
-      sha256 = "0i006gjysfbf9wn0qgbv47fvx8z4v49ikcaqg9y83pl72shnsa1j";
-      name = "killbots-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kigo-15.04.0.tar.xz";
+      sha256 = "00ggvrs3mm5f2q6zkdsxbrhw8vgb0h4p4dk3v0agf3q4bqr86akr";
+      name = "kigo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s16w00cgm430r315d2v2a041hivc5a1q-kturtle-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kopete-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9yn7mj3csimgx1r4q6bp9gknh5bqnw49-kopete-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kturtle-14.12.1.tar.xz";
-      sha256 = "0sn74w413xx5y3kh0fqf7f47pklz4v22nnv6x11kpkcyx1xmghh9";
-      name = "kturtle-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kopete-15.04.0.tar.xz";
+      sha256 = "01wl7n535j9l21zbzjhix33rhr0i4rg2bb25zxwk6sc2ahbsqcp7";
+      name = "kopete-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j2qlvd878dlxkaps9v61dw9k1n6nmh4p-kajongg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qpc0c00mhc367aivilvkp329a4g6iqj4-kaccounts-integration-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kajongg-14.12.1.tar.xz";
-      sha256 = "0690jlsnj3s2l51nmx3an75q0m6xv0rssdmshrmbxgp2cqx5b455";
-      name = "kajongg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccounts-integration-15.04.0.tar.xz";
+      sha256 = "1g2rn256wfl78ajxircaikq3hpj5nxfnk0294wz10srmg5a4hgji";
+      name = "kaccounts-integration-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bomber-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8v0k2n5pkvv6wg3q957zqclasmsw2a7c-bomber-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdeedu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/wyk34ah7lc3vvrcq4ldik6brm2jk9fiv-libkdeedu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/bomber-14.12.1.tar.xz";
-      sha256 = "0g4cb3jwva9saddf9m2j4k3y1gybh2bv8dxzfb1xqy5cv20qlrfc";
-      name = "bomber-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdeedu-15.04.0.tar.xz";
+      sha256 = "140ri9whmvxjlj2i0bdpyr07zwspyl5d1bh91vm8hv2zdgmxh1rl";
+      name = "libkdeedu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kruler-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c61iqdbq71kb6wvnzfq7436hni8anrrn-kruler-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "superkaramba-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1ck2s3vi0dksdlis3cghy8advap8y5a3-superkaramba-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kruler-14.12.1.tar.xz";
-      sha256 = "0rag54kg5jzgj32fnf4xmawb0hnk52rhjf7i2y5f3156x3iraxxx";
-      name = "kruler-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/superkaramba-15.04.0.tar.xz";
+      sha256 = "05j93sa39m78vlxdy4haqj5913dyi6kab5sspi8ky0why17zmaav";
+      name = "superkaramba-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmag-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/r2c1gika9sw2m5i1mmj3b47n7g19715k-kmag-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "klines-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1zsl1wawlhzgyr53hfrn5dzqwii51ib8-klines-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmag-14.12.1.tar.xz";
-      sha256 = "1wlz3n3z9qcsqvs7rz3a76bh6rkrq0g9p797axcsfp7wzjfilj5c";
-      name = "kmag-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/klines-15.04.0.tar.xz";
+      sha256 = "0c0saaybxjshwap5rydc0606xkwmzl696r41fhkvr26c077p09p4";
+      name = "klines-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rqrykz2vvj59w1563dgcjpi8fmkwdnm5-kwalletmanager-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "cervisia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qmkqp9sgai9djwishibis5qckhl9dnrf-cervisia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kwalletmanager-14.12.1.tar.xz";
-      sha256 = "16pd2iym8v9xxdmazn2i7vq61c9m805h9a7awy8wha8bfdinazvi";
-      name = "kwalletmanager-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/cervisia-15.04.0.tar.xz";
+      sha256 = "097hayf2k2fv3d90jnhlh4iq4qvk3v0qg7ywchgipzsz0w6nayki";
+      name = "cervisia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "krfb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/x147kkpbjm9mmdbapxs040cvb8fci9ab-krfb-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ark-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nms2hq3a33k03lmhh8y7swiggglcysxv-ark-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/krfb-14.12.1.tar.xz";
-      sha256 = "15kxapi1mwjpbj995k8rxla0h1wwvhd406pbwkpak3a9szljsv72";
-      name = "krfb-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ark-15.04.0.tar.xz";
+      sha256 = "09jcz7x5rjazz8xvxy3kx32v21ig736m5gxyxhl48inxaypxxd21";
+      name = "ark-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ar6s1pn0lfgs1iw6q5akr0l5dcrd1x2a-libkcddb-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "palapeli-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zsh3ssjxmxggzf54kw9f73kzpy7y3n9d-palapeli-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkcddb-14.12.1.tar.xz";
-      sha256 = "1vb8rmb1j0nh2dh8ch19v1qpdxhc4c0am7k11lld45kamg3az0gd";
-      name = "libkcddb-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/palapeli-15.04.0.tar.xz";
+      sha256 = "1iql188gysjnhym1mj9h2cizydgd97pal37zkxljc9qhqb58wq3d";
+      name = "palapeli-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klettres-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dbf3r79p85w5v6jihmqndcb631kqpb7m-klettres-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9qg39s2sb7r8sdy37hm185jn7dsv24q1-ksnakeduel-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klettres-14.12.1.tar.xz";
-      sha256 = "1bj5s3js6v3641s2kgrl6a5bgr25g9lgbvsfzqrp0pil2nx1g6h1";
-      name = "klettres-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksnakeduel-15.04.0.tar.xz";
+      sha256 = "1i32mrc50isz0q0gzfkd0fz8in2hhc8d61q55dprq3ps28lgd77n";
+      name = "ksnakeduel-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klines-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xwj5di67f0swj1w0c2235vrbany8ffgn-klines-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kollision-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qxc07ckfn60wcyb8cs75dy2d8gbj211z-kollision-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klines-14.12.1.tar.xz";
-      sha256 = "1hxjqpc1z47dj1ryp116hdzkla4h1awnlmyzq7yjhki2viw32n3f";
-      name = "klines-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kollision-15.04.0.tar.xz";
+      sha256 = "0ch3h3g0hgm52l13v6wdrvacabwkvzx537bhfib05prb9604vkn8";
+      name = "kollision-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/aj1drn165rirvr5wjmqfnzsfknnb32gj-ksystemlog-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kamera-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6l8pgg55qph99rmprrgz56vvv621zbjk-kamera-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksystemlog-14.12.1.tar.xz";
-      sha256 = "15a92f873vybp3m9icjshbqs8nl6xm4cl9ca3cghmdlcqrn7f92x";
-      name = "ksystemlog-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kamera-15.04.0.tar.xz";
+      sha256 = "1mjpbcslba9wnxrvm4xg6kfy11msn7kvxln98ak55gvpfh7zhm5r";
+      name = "kamera-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klickety-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y8p216blw2zrld7mj5c1ji9nwqhrbqsf-klickety-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "klickety-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/iwlkabdklb3v1md6vdsjw8x09vv0kzzv-klickety-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/klickety-14.12.1.tar.xz";
-      sha256 = "071y9khz57mrw12dvwxhs03jn56j06hw38hcf8d4r4wksbwr3j87";
-      name = "klickety-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/klickety-15.04.0.tar.xz";
+      sha256 = "0l8vk4gkfjs71xfzw9lg18g9xg4yf4l9jy1f9plikw9gfm7br90p";
+      name = "klickety-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5c1isv8y9s4k7153i5y41jdps6zsp8gl-lokalize-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kolourpaint-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h5x9pzbiq62jgwfln5gx6agzcfyz2j3s-kolourpaint-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/lokalize-14.12.1.tar.xz";
-      sha256 = "1ala2pfqh0a0kqxiyfpp11rcn805g6gcn0m9qjbmdqhl9wviij9h";
-      name = "lokalize-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kolourpaint-15.04.0.tar.xz";
+      sha256 = "00vyblqgp7hqigid6xgj31b8jkqb8jlsvnbd2ci4zg7s778l10sz";
+      name = "kolourpaint-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/d315k9787k4c5ww7zp0341cybnwwsy2j-kdegraphics-thumbnailers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zdqama1r97132n4ks422yzr4zhh6fjmq-kde-base-artwork-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-thumbnailers-14.12.1.tar.xz";
-      sha256 = "198m7iw621azbcp4abv3izq5p29yz9s2apr6ivxpp1iqzpz2x70g";
-      name = "kdegraphics-thumbnailers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-base-artwork-15.04.0.tar.xz";
+      sha256 = "1r3w4ab9vls7wyzy6g7ashnnixxid894ghqc5yzhpn4x999y65lp";
+      name = "kde-base-artwork-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6v8hm7rgdvfkvakv1jfq3g7jk3zq7x3z-kde-base-artwork-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "gwenview-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3wkajcx7p2wdzldbjb94brqlfqhdn54k-gwenview-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-base-artwork-14.12.1.tar.xz";
-      sha256 = "0zd298ii8a3lnfh6lxgw6nmf91kx3days1nqk5arilkbrf7b4952";
-      name = "kde-base-artwork-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/gwenview-15.04.0.tar.xz";
+      sha256 = "0h8ndywh8w9wx0zisl1b9681d7zqx2d3ki40zxdgk4clyl34aijb";
+      name = "gwenview-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xaibvsd6g0xnwpnayb0jxhah9hmb3xin-artikulate-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lgapni2v7qsl3wsi8wx0vwcav9almhs8-ktp-desktop-applets-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/artikulate-14.12.1.tar.xz";
-      sha256 = "021hyprapc6fjhls55yn69sndm13krfriwj1vmq5mvqxzr0aid2k";
-      name = "artikulate-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-desktop-applets-15.04.0.tar.xz";
+      sha256 = "1byv8dk864vwl4s5c18xjh3ckdzr9d7gq1mjrlaslxang7fr97cx";
+      name = "ktp-desktop-applets-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s6j8nymsygqkh4vfgkgqwcg6xigda53d-kaccessible-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lqdl7ks619gxdhnaa9q0axni4pz3h5v5-kdesdk-kioslaves-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kaccessible-14.12.1.tar.xz";
-      sha256 = "0gp49jxkscdqd35xqmzhr17smiwyxgx8xbr7hkvbm10dzn9kx6x7";
-      name = "kaccessible-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-kioslaves-15.04.0.tar.xz";
+      sha256 = "116xj9i3iwzbz41n3bka6xg0yq88iwzw066dy5dbs3yxbpmky19g";
+      name = "kdesdk-kioslaves-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "konquest-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wxk5v878fibdxxd9m9f6phyc99a56psc-konquest-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dymdah33hpq9qn07qcz402ijmwc67bvd-kdenetwork-strigi-analyzers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/konquest-14.12.1.tar.xz";
-      sha256 = "006an4bpfsnzcpm086xjyryd1xlzw0yz2knbzkvsdf3jr9kpmnrr";
-      name = "konquest-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenetwork-strigi-analyzers-15.04.0.tar.xz";
+      sha256 = "1zsa3ky6plfksm8k8hgd93d0awrsi5gqz3qbqfbzj3a2qic7nim6";
+      name = "kdenetwork-strigi-analyzers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p3yhp4gg9pfbmnlb6jqk6xhaz2yllx9w-superkaramba-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmix-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ql4a0i42ij33kd9y7qg4ng1a0p5j2sqs-kmix-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/superkaramba-14.12.1.tar.xz";
-      sha256 = "10dlnn4knlvkz38c98613x9px85a8dhlfwpp4231r3v5va03xszj";
-      name = "superkaramba-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmix-15.04.0.tar.xz";
+      sha256 = "0yj0byy98243c83bw938i1x8yxgbib8vr2s831hpmqi8h3v7xvyg";
+      name = "kmix-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ga54jhkjav5i83vmir8j6l51d3gv1cs1-kdesdk-kioslaves-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktuberling-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7cp8mnviqns6ij94xxz3mpizdc1avln9-ktuberling-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-kioslaves-14.12.1.tar.xz";
-      sha256 = "06f8xxzldsqmch9acmfd95lr48rm94d6qll62bj5zi0bs5qjygbw";
-      name = "kdesdk-kioslaves-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktuberling-15.04.0.tar.xz";
+      sha256 = "1kqz1g0r3icgx3brd8qlln29mxcx9b54kvl8wdar04r8ckk0m733";
+      name = "ktuberling-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "cantor-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xhdgix591fkzqdzw0pch0vv8wk2kkhz5-cantor-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kturtle-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0a3rrj74sfwhqwjql88gqzw8qbmf8llr-kturtle-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/cantor-14.12.1.tar.xz";
-      sha256 = "100yscp21w7amqmwzh4zsk7kmyn5pf3swlkwipz857wi3wajkm75";
-      name = "cantor-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kturtle-15.04.0.tar.xz";
+      sha256 = "00r3lzqa0sazccy28kmackqgqwcyqsl3mzjs7vpg4i76f0agfx4h";
+      name = "kturtle-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pvk5701kz79m2bn13n45ffwy0zjng838-kdegraphics-mobipocket-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gszm27h7rghsvkvhyf15xnp5bgjj18in-kde-dev-utils-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-mobipocket-14.12.1.tar.xz";
-      sha256 = "0qa0bpfvgbq3x3wlgi1cp3v8xn1wayyjrc07ffdr63w1gfi10mg1";
-      name = "kdegraphics-mobipocket-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-dev-utils-15.04.0.tar.xz";
+      sha256 = "1vvrrb4c94apc67fg3gpzgfmhylx6m7xfyq0y5kjxk8l91fl2bdi";
+      name = "kde-dev-utils-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/yd2zzjmb762dkjbkhjxdsnbg38k53f65-kde-runtime-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktux-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cd126p5pizh2ha1jadg82csdzazlln49-ktux-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-runtime-14.12.1.tar.xz";
-      sha256 = "0cy2dhxw2cvbgqrknb3iy97rip2dcd7nrq3pj649mpq9a3r3cg17";
-      name = "kde-runtime-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktux-15.04.0.tar.xz";
+      sha256 = "1j5h65vdigym6ldz7fpn2kidxphfl02l4afg0jmj55wrym1vvc0r";
+      name = "ktux-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hxk0628k5s042wcxwd1v7vy951bsjqxp-kiriki-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/xbdr5s1xf4f58lpshppamii1j5rl5ll8-mplayerthumbs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kiriki-14.12.1.tar.xz";
-      sha256 = "00j95hcyrnw2li2abkwqsd0dp8ph4wlqzy0d3gzfnkal19j2x2m2";
-      name = "kiriki-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/mplayerthumbs-15.04.0.tar.xz";
+      sha256 = "12d60nkmfp16pgrfh5brl80n1y7crmdzk5k3ad313l4ani99z45r";
+      name = "mplayerthumbs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6a5bi2hpxmry12zq6qkwk2hzlv5h7qkz-kwordquiz-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kblackbox-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/72rhcbzax6ahi3myznpi1fkh0x9cq6ay-kblackbox-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kwordquiz-14.12.1.tar.xz";
-      sha256 = "1c03ab89lnnin81lvq3mbcw2d10k3rjlk2fpplcbbnsryq35bivi";
-      name = "kwordquiz-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kblackbox-15.04.0.tar.xz";
+      sha256 = "1w55nzadmkgspngxwazm6nfdf3s72rw4l0absx1jhinln7mif8w8";
+      name = "kblackbox-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ykssldwmik1x7njph3rmzh9d14n7f0mi-kate-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktouch-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0p1m96gmy2rw5pyy029j4257b32ziyvx-ktouch-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kate-14.12.1.tar.xz";
-      sha256 = "0c3diy846drf5nihvhzhpsp8pl2kviyn6ian61myy2147smkany5";
-      name = "kate-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktouch-15.04.0.tar.xz";
+      sha256 = "16gd6rghz1caw88yh32728kcxj79688g4hw3dkmgkayb5wcwnwl0";
+      name = "ktouch-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "parley-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3k84f0vl6l7l65hmbbdlfp2zg348kcmi-parley-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "dragon-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ha0s2dfbqb6gjgwq5451gbcgq6h3q16r-dragon-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/parley-14.12.1.tar.xz";
-      sha256 = "0awzpa9bl1j9gzy3596dhpsg3pqbmmdh87n52z7cjyk8sw0ikk19";
-      name = "parley-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/dragon-15.04.0.tar.xz";
+      sha256 = "0rzyra1xqjyrnx7926dql2fw9avy7rwx9x86v894xppcjqsyr3jx";
+      name = "dragon-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/clfp83sn2pg1jr82j79szwkx0aysl9a3-libkdegames-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "katomic-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dzv478dhlwj11gpfd0k7npmyw8z09yfw-katomic-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdegames-14.12.1.tar.xz";
-      sha256 = "0af15lbsjc7w5p3s3nxsb08cvyg7dncjmpw7z1vhgqykzmwpyp56";
-      name = "libkdegames-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/katomic-15.04.0.tar.xz";
+      sha256 = "0vbcv973ppijip8l1y2kkj93rjxbcj3xw6pypw50w3pg168s1ylv";
+      name = "katomic-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ghjddljclnsn3z0rflrrxanbkzxn46m5-libkcompactdisc-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmousetool-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8ws0s6acsrrq7x0lvy61vy4sqhndbakm-kmousetool-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkcompactdisc-14.12.1.tar.xz";
-      sha256 = "10zpv05wmqs1lrby95d5bgvwiqcmkd3ndrdsr6cpayg2lw9nq86d";
-      name = "libkcompactdisc-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmousetool-15.04.0.tar.xz";
+      sha256 = "005y7jp52f4x9193dxql8wwmimbylkazl671di2gfvrmcrh164n6";
+      name = "kmousetool-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k78l2m24w71dbczia8bnwi3fhpqghj6b-kmplot-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "rocs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/palrbcvrwp2vxf67myadgcvr5wl8v3pq-rocs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmplot-14.12.1.tar.xz";
-      sha256 = "0p0iv3m2648vyr1imzwdfs73rc2q39nl8r7w31z5dhm65rq2zi27";
-      name = "kmplot-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/rocs-15.04.0.tar.xz";
+      sha256 = "03ibi17331vcjzfc38agalbybn7k06favm0sgcyg68qribpcwmg1";
+      name = "rocs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kuser-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/lpdpdbbbgfyib95cq1m1db5fdym6wjxz-kuser-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/b7716r5kxhznfdlp9cwp3vf2vhsv1r1c-kde-wallpapers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kuser-14.12.1.tar.xz";
-      sha256 = "1zgik2i9z0n58m3fm8g0kgjm9aqa6v1f3331r8nrjir9vd9vr8g7";
-      name = "kuser-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-wallpapers-15.04.0.tar.xz";
+      sha256 = "0ckvbsdim0485h4f9sz1z0qgbb61n8l7ncwr80zm7vpnx46xzavm";
+      name = "kde-wallpapers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p1lzq3dbil7klabykd2995j65qwqfldd-kspaceduel-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdiamond-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p1f9xs4wkbdi9cmry7wc5686dxy2fvsg-kdiamond-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kspaceduel-14.12.1.tar.xz";
-      sha256 = "1zihp0nc6gs4xymyykldjw22zrxm8qznjaya4z1fw07hwndijvia";
-      name = "kspaceduel-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdiamond-15.04.0.tar.xz";
+      sha256 = "01ri6nj217dmg2xgm4ra4gdsabk28c8bkw6z69x5smbczjshdcr4";
+      name = "kdiamond-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/agnpfa5vjjfq79j3x2nf3nfwvvxjl28i-gwenview-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkipi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jckns8avmk0k34k62f77bdrl9cbf01nr-libkipi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/gwenview-14.12.1.tar.xz";
-      sha256 = "04g3qkz1g27ph6ha1zrbqpr827vhx9n2nigr0dy95a61qw1m0jww";
-      name = "gwenview-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkipi-15.04.0.tar.xz";
+      sha256 = "0c90y8f70k83pxxfx6mk6ar6zw7lf2l7mib526x8s7j534ya57ad";
+      name = "libkipi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wfnbykydc5zl9d678mpw7hpc1nscynmg-oxygen-icons-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdewebdev-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/wlx7pxcwlq5f0w2hrlms5gfxfixzfzbc-kdewebdev-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/oxygen-icons-14.12.1.tar.xz";
-      sha256 = "1z27id29s98h20dg27wr28w2qpb25ii1xsrgjk6r33nhj2y39jmg";
-      name = "oxygen-icons-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdewebdev-15.04.0.tar.xz";
+      sha256 = "17gizsgvw5ihibsf8z2rmczzkqp1gp5jbyvvsairgzv1izryi6ah";
+      name = "kdewebdev-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kppp-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/q4fxwbxh1rl3icjzhcyij7wwbchc0xzn-kppp-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3vyd044k6qmjnxc7sfig6q90g2dr58lf-kaccounts-providers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kppp-14.12.1.tar.xz";
-      sha256 = "0lvcanlskjgra2wn3k1j5jx9vy5k0g381ycg79fazkczsr8is5wf";
-      name = "kppp-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kaccounts-providers-15.04.0.tar.xz";
+      sha256 = "1b5cp6winxa9slqaq6mrf4y4py1d7ps55088gs35qcwrzyna04l7";
+      name = "kaccounts-providers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9ny33z3srhnwz8p9fd7i6klmm9y9j08k-kmouth-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "marble-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7kh58mg7dnd0yr6nksbfki20rncdqm1w-marble-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmouth-14.12.1.tar.xz";
-      sha256 = "0a3fhlgy8z84n83v59safl71v29px9783dndlqgh1dk8lmki7dmd";
-      name = "kmouth-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/marble-15.04.0.tar.xz";
+      sha256 = "0d6i7wwf220790ld5qgd30gph9y71a75ybjjfg81k13a4jg0ndk4";
+      name = "marble-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kig-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/iwj5hwmm9p278b7yi510fh38710w96rr-kig-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rrdyv611nn7kbnkr1fnvn6xkd01k8zwb-libkcompactdisc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kig-14.12.1.tar.xz";
-      sha256 = "0qs89kpms9ch2r9xj4scvjscn7b7bh5k1nxaln1z654mgp1rl4f8";
-      name = "kig-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkcompactdisc-15.04.0.tar.xz";
+      sha256 = "0nisrgpcgf4r83q7p82b8xfpzq96qjk8362i6dalsb0jcakia4c2";
+      name = "libkcompactdisc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/z8w5hn03zzpbpg7mjdmykylcbvhcd2ac-libkexiv2-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/fjrkx2vwb6m4kfl01sa4r23wbvmsmh05-kdepim-runtime-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkexiv2-14.12.1.tar.xz";
-      sha256 = "0qpfccasra3ffq5iz7dpxpzcyk13ywjdaz32n1wfsylfv158w9sg";
-      name = "libkexiv2-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdepim-runtime-4.14.7.tar.xz";
+      sha256 = "0ywg703sqidxif853gfmqriymkkp9xzkfxd863p1sw35n1zhfkam";
+      name = "kdepim-runtime-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcron-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ixgf55ccq4gyyazhnbrrrg1qhpgh048s-kcron-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/akq8y3wjkvbzwyzwxyd1vkmqygmc78p4-oxygen-icons-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcron-14.12.1.tar.xz";
-      sha256 = "0czcxajsdx7xal9cvy9cd4drhvaivx68mhymj5k3n90cka7qda2x";
-      name = "kcron-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/oxygen-icons-15.04.0.tar.xz";
+      sha256 = "1ysy82war9n1dm5nwj69aasz9abp2zf5dmw92gv8brzyrn8svn9d";
+      name = "oxygen-icons-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/vjc105v5nsibh4pfvrvsjck78f2645lx-ksnapshot-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kpat-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/af38swaxzd4yavh6iaxq3ha8xn3q9gmf-kpat-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksnapshot-14.12.1.tar.xz";
-      sha256 = "02g48b3i7xglrgp1nxvpbsrq7kqg81s4mf6k9rhfn312n45g1arg";
-      name = "ksnapshot-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kpat-15.04.0.tar.xz";
+      sha256 = "076jrjrs97353pw39gbanjf5s8l4cj8g2zapngyc1kwm6q0jry5w";
+      name = "kpat-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "marble-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/543lrxwg6zz77yz58ihn3dvf9rhy3xzg-marble-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "juk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bbvywnmrg713gdmzxkndkcyjs7jmdazj-juk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/marble-14.12.1.tar.xz";
-      sha256 = "13plghz8d5a8gdkq3nr7m0bvp2p0smqnj987bmsi1cldvliwiijl";
-      name = "marble-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/juk-15.04.0.tar.xz";
+      sha256 = "160n9wpx0krf1nlpa3hbj0b1yblgq68mw3c9is2j41k0p2b7divi";
+      name = "juk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kpat-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2ssmxyy2vhlipyrh6cs5qgms20cicmhy-kpat-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kspaceduel-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zx8jk8s9mrfga1467a42hfdz0w144p66-kspaceduel-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kpat-14.12.1.tar.xz";
-      sha256 = "02bh34553r7k0vf7sb5nsr6zgmh1xfgyjfyfc22yvknpmz2zz8wb";
-      name = "kpat-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kspaceduel-15.04.0.tar.xz";
+      sha256 = "0drb3628l47qp35h8vyz66ma6ph5v9sg2k9dp0fghrhwp1x983fv";
+      name = "kspaceduel-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "poxml-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n8504ljfha2rq1r0lrpz0gyyh59rpjln-poxml-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "picmi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rrqb0hx0kb96y9x2j65vbyq12pk4m875-picmi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/poxml-14.12.1.tar.xz";
-      sha256 = "1r0iqqszmqmjnkq41xv87sc601fm8s94ga9pn37alni7f7qddfrs";
-      name = "poxml-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/picmi-15.04.0.tar.xz";
+      sha256 = "0abas2qx83a35dghrr5gbsvgc0lg0vk0br18nizi82sbiawls24w";
+      name = "picmi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/m7ia6872rxwbpx88zidqanf1wqni1az6-umbrello-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "artikulate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/a4vr2g2m7hr6svmbdkg89na3zvsh4fg5-artikulate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/umbrello-14.12.1.tar.xz";
-      sha256 = "0kr60kdfg2pl049n4rkksfs6160jijxdwymx60gj44h8w2dxrx6c";
-      name = "umbrello-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/artikulate-15.04.0.tar.xz";
+      sha256 = "1ghffybaq2p9jx7cppbji8jk0dbblw3mh3czfzfms92ahy9xzcbz";
+      name = "artikulate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "krdc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qlj342akja4fh4yp2fib4v4bm3kn2bmg-krdc-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeartwork-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3yyj9dcqj7b2zjrz5w7j20h0pv10gnid-kdeartwork-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/krdc-14.12.1.tar.xz";
-      sha256 = "0jqq60spxb64m9y37q2wd7w1z3h0c0hcjvd6wi694v0zhblg5622";
-      name = "krdc-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdeartwork-15.04.0.tar.xz";
+      sha256 = "0kwscj036gjvai5knw1jpxjacllza4y8wnlv24lp19f2s61jqq24";
+      name = "kdeartwork-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/39r333hqffzycjszw3wbash4p8cs4vrc-ktimer-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksquares-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ayr2hry1z8z3v8q8a4iamck9bsxy1pdw-ksquares-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktimer-14.12.1.tar.xz";
-      sha256 = "1p4y1kx3w6rqwjnhpjx17246w8gp7l8q2212x7khs8karnfyvxh2";
-      name = "ktimer-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksquares-15.04.0.tar.xz";
+      sha256 = "15a605pc7jfsrsj1jj3lqy42z1bnw4pppx0hv51xlhiza00s2kww";
+      name = "ksquares-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p9al8bnc7cy61ccnbmw5vzbvg36rq3yl-kremotecontrol-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4kb7k1cfzksinnw0d08nginvli44rwx8-zeroconf-ioslave-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kremotecontrol-14.12.1.tar.xz";
-      sha256 = "0rvf73bj6l7cgbjcpn2bgy00zpdw4sj5zcchgl42xldl75zzr6mc";
-      name = "kremotecontrol-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/zeroconf-ioslave-15.04.0.tar.xz";
+      sha256 = "0fqqx0ji1v0cz87qb0kig9kkfdigmdfmz5qw1y2kx25mb0rp1g2i";
+      name = "zeroconf-ioslave-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qsdvwqqp7pwbh2vdi5p3w56snysf94f8-kde-dev-utils-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "svgpart-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n8v8kbzq9vsghk0nc47rl49zqfz1w182-svgpart-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-utils-14.12.1.tar.xz";
-      sha256 = "1wpiarm8h4y5yjrdrxkmndps06h08vql70n63aai8crdvgwixdqy";
-      name = "kde-dev-utils-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/svgpart-15.04.0.tar.xz";
+      sha256 = "0985jjy2mghs57sy53mkas5p9ya0makrkklq99s04rgl93f2akj1";
+      name = "svgpart-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6ic12j8bm99jckl82p347717mrhl5v6r-knavalbattle-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "bovo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/sigbrnva6hymkgnjd48aw65s7vrysi2g-bovo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/knavalbattle-14.12.1.tar.xz";
-      sha256 = "1jd4b2kmlknh1xz055xysasfs90810m8sg4iwyzqv2j5kj8i4x4l";
-      name = "knavalbattle-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/bovo-15.04.0.tar.xz";
+      sha256 = "0iffvb4m9bszpxh8s8yrpyzawyflwcbkajib5h1lw8xsgi6vcqhc";
+      name = "bovo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libksane-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/72jv9b0id1ql2pbz8vdcm77n7s7br3vk-libksane-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kig-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lv7d5hvgs42razrzhd3g60i1gpzb8w06-kig-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libksane-14.12.1.tar.xz";
-      sha256 = "0a4hp2d0h26nkggmkiswywlw0aj5wkk8c6s9wy2h7m7qcmyq4gk0";
-      name = "libksane-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kig-15.04.0.tar.xz";
+      sha256 = "1v9p9f9dk3f2bfbwic1vf8ky5ziac4vx0vh8wxshzbjjb89kxkq6";
+      name = "kig-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/j4y0bpk9zir6270cmxmfxn10bphgbdw8-libkdcraw-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8g1l1dd5cccy6ncaywfhpf1x2633dk37-ffmpegthumbs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdcraw-14.12.1.tar.xz";
-      sha256 = "0svalln7g862d6f5k76vdggqc1h1x9gagm6v56yzr9dypz81y40m";
-      name = "libkdcraw-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ffmpegthumbs-15.04.0.tar.xz";
+      sha256 = "0j0x8b0gcwyzx307rvhrx4k4g530lgyl5rzvdpkjqpga2qjg8q96";
+      name = "ffmpegthumbs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "blinken-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/xl2fn6zcfr99ir7l10y8dd79ns4msgyp-blinken-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "parley-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/piznlrz9g0kvy1262p87db03830mx6by-parley-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/blinken-14.12.1.tar.xz";
-      sha256 = "1fvgq57qhx305qxmhzm628p283dyk9nnp33q5vgcxxfw726mi5pq";
-      name = "blinken-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/parley-15.04.0.tar.xz";
+      sha256 = "1f6nmnjz84cm8yk53whjm7k471y2vj106m7q230xj1g56mb5adrc";
+      name = "parley-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "step-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1v6hadh7m1i58hc62c6z2qs2ycsi02rw-step-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "lskat-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6bdihbmhk9vdr9mzj52alqhvav2x1lc5-lskat-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/step-14.12.1.tar.xz";
-      sha256 = "15wlgig9b932ck1hwdld0q8nh74rh820wj4nc6ifys83wv43jnzh";
-      name = "step-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/lskat-15.04.0.tar.xz";
+      sha256 = "12mnvbisbaiychdgk6fb464lwvpjlkrwdz5101sdrw466c16a2a2";
+      name = "lskat-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/0invqcgsx7scwmihagccpgdfq3aa52w8-kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kgpg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fys5hj4c13arjjqrh4kn8vyk92zrgz25-kgpg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdegraphics-strigi-analyzer-14.12.1.tar.xz";
-      sha256 = "03lajpwia7fmlnr9l0g44knwghz8b2i70i659nkvypw6qd89cccr";
-      name = "kdegraphics-strigi-analyzer-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kgpg-15.04.0.tar.xz";
+      sha256 = "1n37jh3zl4zb3dnb9lvjpni7gl6sb9s1jwmvf4jvqmqnlqny1b4f";
+      name = "kgpg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rjsmd2babmjdbwvr5n5gv1f9wcag4iln-kde-baseapps-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kruler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/2c9221fqxkz6ajx8g2l7xnhcfj8iivki-kruler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-baseapps-14.12.1.tar.xz";
-      sha256 = "0l31842mmriirkcqsdmj7s31yjwr5im8di7z7dfjgjqy0j1q1jzc";
-      name = "kde-baseapps-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kruler-15.04.0.tar.xz";
+      sha256 = "1pnhram0g6hfi2k13xhixwpr9vx1dhkvivn1y1ydvwk26klala1w";
+      name = "kruler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/h2hcdrv66b95ajbj5wrz1aspq4fr85pd-kde-dev-scripts-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kscd-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9yidmqhziwp6sj4l0pzh1gvmhi5g1ny6-kscd-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-dev-scripts-14.12.1.tar.xz";
-      sha256 = "0g3i26vm3n2jc69mpwy94b60ff9c6fsr4yrl1h4f3408f4g4sjj4";
-      name = "kde-dev-scripts-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kscd-15.04.0.tar.xz";
+      sha256 = "079sj1g5mn32b2l2l9qap55s5sr6bv44a9ncswibkr49vwq7va10";
+      name = "kscd-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kollision-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8kf7fxqm2avmamkdidsglx7rvl30cj1n-kollision-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdcraw-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5y5x3vr7zibkhk5pk7hz5ibkza56d54s-libkdcraw-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kollision-14.12.1.tar.xz";
-      sha256 = "1l2c34l95kj4f8y156yirc35vfb2yblnkkjq1bfkmiavsb6vzhd5";
-      name = "kollision-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdcraw-15.04.0.tar.xz";
+      sha256 = "0h7m6m27jsp4xh6ywrbxad3c413ipzfgz357ahffqcafdjw6yfx5";
+      name = "libkdcraw-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/82jk65vx3xpg2ydn3fzg6v2w07xgihhc-kgoldrunner-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0z48pwb041r7sfwzvsxdqyw46bxy6d7d-ksaneplugin-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgoldrunner-14.12.1.tar.xz";
-      sha256 = "0sgr2034mr5gmmg81qp9sqjw2sn2cgdw8bl9dq2iid43czih5zbw";
-      name = "kgoldrunner-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksaneplugin-15.04.0.tar.xz";
+      sha256 = "1wh83c31x1n7vipi6m29hsinrpzwsvjnj3psg6s7bywnb6if2ir7";
+      name = "ksaneplugin-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kolf-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y7m9zzkm4wz23myj568sdjpn86f6m4iy-kolf-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "lokalize-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5by08m2jgiap41wrk8kg7lc8b6q6ifwh-lokalize-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kolf-14.12.1.tar.xz";
-      sha256 = "0arxis9q9qzbv35qq52pl4j5xzqhdwypjhxwdiqammqksdnln8lw";
-      name = "kolf-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/lokalize-15.04.0.tar.xz";
+      sha256 = "1nikpfjnmm3ws2qd46zq6g5v64dbfa7pmbp8nw1sv7dcin3k42ll";
+      name = "lokalize-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "okular-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8ipl9g3hgm04x1xpvyy8ahlbvjq6birx-okular-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "granatier-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/w9bkpa3frqgnh07gbaln9m15nhj0vdcj-granatier-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/okular-14.12.1.tar.xz";
-      sha256 = "1my3d91lm6wz8gh9g7pw4rrdxkc22vr9v02b22qqvxb2z8mdq5cb";
-      name = "okular-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/granatier-15.04.0.tar.xz";
+      sha256 = "1s5jkwqzjlcd343sm6akzx56a48yvx7z9n3cww9gxrjl76q1a19c";
+      name = "granatier-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/jl34m0f1m497dpwnmmw2svy9ig9x7x5q-libkmahjongg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksudoku-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0ssavwdndi5h0mc3cjrgn1vpfz20wmdm-ksudoku-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkmahjongg-14.12.1.tar.xz";
-      sha256 = "00s4akfgr33n1bg2bds1fxccnig9hybm95qq95ii6ky4jyjc6b78";
-      name = "libkmahjongg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksudoku-15.04.0.tar.xz";
+      sha256 = "0bxcjqpkqr5zbjrx8drmjvjgnyjvpqbvmqgyfsidm8rgfg6mi3fz";
+      name = "ksudoku-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ab28gj1xwh9calkkf87xqnh84x8cjq08-kbreakout-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmplot-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/76appqh3cg62681baq1cy6fymadaq2c8-kmplot-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbreakout-14.12.1.tar.xz";
-      sha256 = "1cvqjch9ymjii7xmlg1clscbv6245m5bnf77dxz6nkzsrcy4khbx";
-      name = "kbreakout-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmplot-15.04.0.tar.xz";
+      sha256 = "0fnvjixnp2iyjg0hgm6lkry407f0fh39kb184jzaakrp703m3jmi";
+      name = "kmplot-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8bfm6nbnd3clpdy108yab44vv7552c1i-kgpg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kcachegrind-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ys2xzw0hck8gp7g79m933580y7rix754-kcachegrind-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgpg-14.12.1.tar.xz";
-      sha256 = "0cfhmlp200dbhdkckf7xvfbfsz985zw7vp6vin4w378dzyw55lmb";
-      name = "kgpg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcachegrind-15.04.0.tar.xz";
+      sha256 = "1q1z0w7c7j8ii97n4vcd80qi6hb7gsg6j9l3md37ls8c4qvhknx7";
+      name = "kcachegrind-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kscd-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/lfsycaw8n7kjsbnkga24cfqmpr0rpff8-kscd-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kbreakout-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/x4rsvf3qzl921vgamzjxkvwjw971r917-kbreakout-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kscd-14.12.1.tar.xz";
-      sha256 = "0ag9i649ah627b5xsacvz1q05pijfrbwrg34bpcc61px9zsgk18l";
-      name = "kscd-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kbreakout-15.04.0.tar.xz";
+      sha256 = "039g4qmmkf3lq8jx5vgasvqx19k3xbvfkm0j9his61z021ldjxla";
+      name = "kbreakout-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5avv44x780sz0v874cl781k7camn6xcj-kcalc-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kapman-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/82vlfb4yna41mip5zpkal4kpy67w4kjv-kapman-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcalc-14.12.1.tar.xz";
-      sha256 = "0qsfllwhn1gd675k5fxbfcfflnn86cbh3nzn70bc2lmxmwrlzbj2";
-      name = "kcalc-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kapman-15.04.0.tar.xz";
+      sha256 = "0glc8hcjs89s5cxa77f12pzlnmvr74kiqhcrk7djz98pnqwlsn5v";
+      name = "kapman-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/qbgn1hkh15gv93wbrfg2bh14zsfgxfva-kfourinline-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kalgebra-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/346qqpdqx5hdzyvd4dlkag3ir951fjp7-kalgebra-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kfourinline-14.12.1.tar.xz";
-      sha256 = "0mhykajapvbcrasadyjjjz7sps3vmmw1hhijfjbswkb62ikmwc6k";
-      name = "kfourinline-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kalgebra-15.04.0.tar.xz";
+      sha256 = "07czg7i344qq93y95f46qvk3zpghkl3gcr8cd8wgc0v0b1mdmyfm";
+      name = "kalgebra-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "picmi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/s1m8hz32vjf2v38p2rkznrx4mgn6rzr3-picmi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "pairs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cd5q5wchjl2ncm44pwl156jks832y96z-pairs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/picmi-14.12.1.tar.xz";
-      sha256 = "0nrg4qza4h99k59w92v3qy68xlkdslqrlqi62fg94i88rl9l6ypq";
-      name = "picmi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/pairs-15.04.0.tar.xz";
+      sha256 = "1d1va0b55fwivsvcz3izr680nl4zbyn44fdnirglw7q25278p7bh";
+      name = "pairs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/9mqr7imp19hgjl7bn5sbp2d3xmgrr3p1-kdewebdev-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "khangman-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/krpgzhpksq4kr9r78w9f6rk2q0963lwv-khangman-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdewebdev-14.12.1.tar.xz";
-      sha256 = "0iv2r5vxkk8bg8p2zpq2dqnq0vvwhmjls0gdg30gyc4w04a7jcqr";
-      name = "kdewebdev-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/khangman-15.04.0.tar.xz";
+      sha256 = "0cnaih6xhg11wrg0c3v7lir2yknc4k6m490aw7bhraz98kfxr905";
+      name = "khangman-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmines-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/nx62f1snc9d786yi1vsh0vzixkgrv9gr-kmines-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "konsole-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qb3gypyd97v9cakicf44q7xnwfmyqsyz-konsole-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmines-14.12.1.tar.xz";
-      sha256 = "13f070kh0rfs5pmw3lnlwxwvx2ph2q8n1vm9lvr6kw1ablngiacm";
-      name = "kmines-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/konsole-15.04.0.tar.xz";
+      sha256 = "10qgynn6x7cxyp6lgri0vggmzmcvckwvrg9mrycdnwwrsfabscrc";
+      name = "konsole-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "filelight-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/syf2l3yk3wga82cyak82janjsjhgvbd5-filelight-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "analitza-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/c9xwpgl8bdp582w91zrchhywr1j9xm9r-analitza-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/filelight-14.12.1.tar.xz";
-      sha256 = "1dzcgric6rxhxhi84lgbsmkfk6s6b96px8019njnp744jys2ikv8";
-      name = "filelight-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/analitza-15.04.0.tar.xz";
+      sha256 = "03kaaa8kp92lsva5shzqb9497wmhksm79pc39ip5l50lqac9gr1l";
+      name = "analitza-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "amor-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5nkk3cqvi177qd3mq0n687r5swcrixfd-amor-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libksane-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6qn668dc4yppjwyc1ms0698nkmxj4sxm-libksane-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/amor-14.12.1.tar.xz";
-      sha256 = "0p0fgp3j6x1f83kxdvmkcy4ladhg206m261fbpa92zyxp2ylnl0a";
-      name = "amor-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libksane-15.04.0.tar.xz";
+      sha256 = "0rnja700hwjn4bvy06lijndic2zryn64kybvj71ip6knq3nx77x6";
+      name = "libksane-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6pbb85yp6xhd3x5w0a5ql6ms10yj1pj3-kdiamond-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kbruch-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g1hbkl20wkzglhaabxizzhrl1xpkfiy2-kbruch-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdiamond-14.12.1.tar.xz";
-      sha256 = "12frpi62f4w86ygxa68dvx1nj8n7w7lsgizfdyc6lix6l5vfzn7x";
-      name = "kdiamond-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kbruch-15.04.0.tar.xz";
+      sha256 = "1662hqqsf1rnfwrqwx5wpl0cvr9313sh8bla2sig8v2s8v2lyyi6";
+      name = "kbruch-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/89l402jmb83ji7xvkz82kz024l012yaz-kteatime-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmouth-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dwkbfqj5a21hcryw42dwqw9lq1r4ld0d-kmouth-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kteatime-14.12.1.tar.xz";
-      sha256 = "0my0fjiblkkfy2148axc7gp1nsx5lr2y8zn6d2labai2f6dy1bpf";
-      name = "kteatime-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmouth-15.04.0.tar.xz";
+      sha256 = "1swvdrlcfxv312kncihvxba0cklmv47qyr2dbrkhb9s9v6jbiqb3";
+      name = "kmouth-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "juk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gjxwckkx3mikzkpxs7vzk830nj42fj6q-juk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kppp-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8c2srwnwg41aypvjqzs08129wm391p2q-kppp-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/juk-14.12.1.tar.xz";
-      sha256 = "0wzjrk5w5y0f6bc98pr7xni1j8krdyjsk3agcwkhb4d4c0aa5gka";
-      name = "juk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kppp-15.04.0.tar.xz";
+      sha256 = "1ml5lc20jg05zfq9d274vqp7k7fh5369zshp073bi6zjj4cm7gss";
+      name = "kppp-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kdk1frzcpvc11ln0vamc6m0m7h1xfnj5-mplayerthumbs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmag-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gi6kw8zlmpy8gjijr34620dzp858h657-kmag-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/mplayerthumbs-14.12.1.tar.xz";
-      sha256 = "0z9iw1syv61y4fb4dlr9n8w78ri7wpznys5bd5sn0hxbkwnavs6b";
-      name = "mplayerthumbs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmag-15.04.0.tar.xz";
+      sha256 = "0wmarmybn56mppwb33cjg96906hh4vbnwxqpw2441axn5vqmf90j";
+      name = "kmag-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kget-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/v34rq3l61yyxsml99xp18adg85ki53r1-kget-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.18.tar.xz" ".tar";
+    store = "/nix/store/b65xpr56hpmfinssggl4fq88lky5czlm-kde-workspace-4.11.18.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kget-14.12.1.tar.xz";
-      sha256 = "1jr15bcc09pypihva7pjsq6rlj0kqqhqvprxdggmwa7fnyyjxrg4";
-      name = "kget-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-workspace-4.11.18.tar.xz";
+      sha256 = "1rvi88flk8c1j6qdkxak3sy1yf646ql3zipxw2azchwzd4k54mzv";
+      name = "kde-workspace-4.11.18.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkface-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8l4frnslphg2rbpmaikwi0j7w4hfw56r-libkface-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksnapshot-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zim1ydmdxhwv0cypdviqdnn0nwz2d66q-ksnapshot-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkface-14.12.1.tar.xz";
-      sha256 = "198z0n286qnngrln24s1dfghkddz5zy7qr8af0jkywxdj3j2ks3a";
-      name = "libkface-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksnapshot-15.04.0.tar.xz";
+      sha256 = "1577ybwpa52lmv5pd0223pz5l3q4h3475fz5qp3sm1rwi0nzmawq";
+      name = "ksnapshot-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ygwdm76ijc39y3blkfl7s6g21328dk1p-kcolorchooser-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "okteta-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8z78fks7wl0rf3077yrz8hzvqvmxn516-okteta-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcolorchooser-14.12.1.tar.xz";
-      sha256 = "1yw1cxg2caddncnhqyck1fh7g43svgcb8pb15wp5rz7qqs0p65mf";
-      name = "kcolorchooser-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/okteta-15.04.0.tar.xz";
+      sha256 = "0svgsy838dlc2krn2rzb65a6i0dfav4xlmi4174d23qhaikl1z42";
+      name = "okteta-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "dragon-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2iwy70md4cqg461x92sbxwbfzmj4y1xz-dragon-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "step-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/argcpdljdar6ga3psyz4wzr3kmvkmf07-step-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/dragon-14.12.1.tar.xz";
-      sha256 = "0wqmjb7zl883mcmx4x8ss0x64r79wrphfxkyva6sifcy596y2wxh";
-      name = "dragon-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/step-15.04.0.tar.xz";
+      sha256 = "1fl4zmj4k3g8c7bas7dj2n82qlbq8k5p3s5bflcillrz6pdd4s50";
+      name = "step-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5n1arbyl0fjp5b5xdlgyha4nwpxbczyz-kjumpingcube-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n3b0rfacc8i5p5hlgal66zr9gjfrkda1-ktp-kded-module-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kjumpingcube-14.12.1.tar.xz";
-      sha256 = "1h7nypr5b8b5az7c2gszihlhq9k2dn92cabjmif9rlkrvl6nahcy";
-      name = "kjumpingcube-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-kded-module-15.04.0.tar.xz";
+      sha256 = "0ijinvp48aixx8fjdc8fxpm8ilzsn9pkhsiinh47wiabyjb8rj3z";
+      name = "ktp-kded-module-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/fxh9hhx7z5bv151xrxw26h91pz09lw9z-kapptemplate-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kwordquiz-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yik5ibmcy9k87y41nk3b03w1j2p3012c-kwordquiz-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kapptemplate-14.12.1.tar.xz";
-      sha256 = "00df6ckfaglnnxizzqmci10h8hiqjv0fgi8xb3x4d3aszb049k1y";
-      name = "kapptemplate-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kwordquiz-15.04.0.tar.xz";
+      sha256 = "10rq7zdd8i8dgmjzxgn6139ixzm5kzwiswal0cmkd42wwbdn6fml";
+      name = "kwordquiz-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/16zwzi9y1215imff1phggjza00j9y4br-ksquares-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/xd5jr85rzdnsrw18ab811q6hcwq1f4vk-kdelibs-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksquares-14.12.1.tar.xz";
-      sha256 = "0b1av02srxfd9ji51f2pcb5phmlqdz2lzik1n97yzn6f0xh19h9y";
-      name = "ksquares-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdelibs-4.14.7.tar.xz";
+      sha256 = "1zhqvyx8gq7514mr0423z0gl1yn33snh53fj2ijkk4blhjga601q";
+      name = "kdelibs-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bovo-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gfficdhz1w80xmvn9842jx1fwpd81lqi-bovo-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "killbots-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nshwyzk14mam2av602sqzcxnwjzpny6k-killbots-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/bovo-14.12.1.tar.xz";
-      sha256 = "08in3ppksxp7zdgrv5lvjxzlvc6srfjcicagqbj2r8nrfmngjlim";
-      name = "bovo-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/killbots-15.04.0.tar.xz";
+      sha256 = "0a9jn8i5hw3v7kr6vqagxkqvvjs6qsb23g2khaxgbw0x0cz5nqx4";
+      name = "killbots-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/pafvmq1gg81mjpwyf388k311qwf7pgcj-ksaneplugin-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/55ksfn4hq342qbl8cm4jf8k8mmra096n-kdesdk-strigi-analyzers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksaneplugin-14.12.1.tar.xz";
-      sha256 = "00bsd58kfvhp36rbwsmbk3yqjx8gca3r42q5z3fvd0jpf7y8xxip";
-      name = "ksaneplugin-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-strigi-analyzers-15.04.0.tar.xz";
+      sha256 = "0k00ip8ll1i96cazs78c6al1yjcnvpr1awb6g7yvvq019icjmzvn";
+      name = "kdesdk-strigi-analyzers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "rocs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/n25f8hphjdbwbk9z488i4bjmfai5vzsx-rocs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/90s1naljnqa6r99nl2dpjsf8rjb3k7cp-ktp-send-file-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/rocs-14.12.1.tar.xz";
-      sha256 = "033irmbjs6d8q7zdvz7vzx61d0gmgxb96cypwlwjmww1czgy9zcg";
-      name = "rocs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-send-file-15.04.0.tar.xz";
+      sha256 = "03i6irask1ccngwapirnc9vpk4nw7r82zl6jdnh7w9988c2wdl22";
+      name = "ktp-send-file-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kompare-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ikirdy65sp1w2w38p28nkzic0zhw5iyp-kompare-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n2vy60sdgnx3gb6fmmgd03d4jnn29nmz-dolphin-plugins-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kompare-14.12.1.tar.xz";
-      sha256 = "1js49gfffbv6nplr907dkcq3j6xi6h1276n0fbkpd7y31cca6mi7";
-      name = "kompare-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/dolphin-plugins-15.04.0.tar.xz";
+      sha256 = "0a1f1si598cmqd0j9v6pz0w8s6286xg2wcfxzrmkr994bfkydd8c";
+      name = "dolphin-plugins-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/4zh8mah5lsisbnv07nas6wqv6xvsqzy4-kalzium-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksystemlog-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1wy9hsww32i53nv94bnzj83hfqw3x1ir-ksystemlog-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kalzium-14.12.1.tar.xz";
-      sha256 = "180qq9h046hax0jl13iy9mzbzhn66y41p8cj5447qgrnjbdk5qa8";
-      name = "kalzium-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksystemlog-15.04.0.tar.xz";
+      sha256 = "104yg6mjnhznsylpv8faqih9rpdxyp4667dagq7f1kfajy59jh1y";
+      name = "ksystemlog-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1pbw74v9j5r9x36b2r7yq5k8n9fbcvwz-ksudoku-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/x1qmhlskhz0ibs1pnxcb30bj1yk3f447-libkeduvocdocument-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksudoku-14.12.1.tar.xz";
-      sha256 = "1majccia02g7icqh8pad3m91nj94j228s66v25szlwacg2zc86zr";
-      name = "ksudoku-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkeduvocdocument-15.04.0.tar.xz";
+      sha256 = "0lqp2qfsdjkchnb5xrbj9hax2bf4ls1wk7pmb364qvkkhfia8qv4";
+      name = "libkeduvocdocument-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/2ifpmknn9aw760hsz4j7cf7kc6x704hl-cervisia-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmines-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3vf7rffgww1k7byna7p05d0115p6924y-kmines-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/cervisia-14.12.1.tar.xz";
-      sha256 = "1xgvk1qar2mg5awkwsc0wzyzmskgv9r6bgbczyy0fjjd9xh0mp75";
-      name = "cervisia-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmines-15.04.0.tar.xz";
+      sha256 = "015xximi3xydkbygzlka7y8nmls3dc8jvr3dvvidl57gl1szmx73";
+      name = "kmines-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/3qpkmwxn855x58k5za6r67rniyzkj006-kcharselect-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkgeomap-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/amqrx3hwvwrz8rgk3dljj11bvfpx4plm-libkgeomap-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcharselect-14.12.1.tar.xz";
-      sha256 = "0rb4dr7ygiks45c73nwab9wg9zdn1xgq93yhkpp23bkfq9ca7z4f";
-      name = "kcharselect-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkgeomap-15.04.0.tar.xz";
+      sha256 = "0yd17xa085rvxsnsah6ny7w88lbs7c1ilxrvbpsf2rvjkbl96giv";
+      name = "libkgeomap-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mvjdshn07gw1jn31y7igfzrzdmkpw98d-kbruch-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "umbrello-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5lahf10pz3vdh0dngi3fsmyn9g8cmk5v-umbrello-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbruch-14.12.1.tar.xz";
-      sha256 = "180gbax6lrn5qr1l7x1c3i0i2kh1by4j80bif66jxwra505by50z";
-      name = "kbruch-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/umbrello-15.04.0.tar.xz";
+      sha256 = "14lw9rnqv7bgni1rxwmgm4jnx2l2x5524wysqlhyp7np35mzdnlc";
+      name = "umbrello-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/y0pg73qfkvfdrk3r7xz7yfgzl2s24vg5-knetwalk-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "bomber-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7mf874dsxa6wj59zfr6s1n7399rvl7m9-bomber-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/knetwalk-14.12.1.tar.xz";
-      sha256 = "00b2zkiv3i99k6ri3xljas2fc2ihri84cmckgwrzvpxbdha8wpj8";
-      name = "knetwalk-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/bomber-15.04.0.tar.xz";
+      sha256 = "1hpss9jmjsjl2shm2y50s5js33rpn0gd20il6wq454wm0k0q7rpj";
+      name = "bomber-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/7vjjf69hw3kkwxmnlxfcg44wh7yy1s5i-palapeli-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "jovie-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/35zcglbjikb4ayp14d9l6hgs5myv5i6l-jovie-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/palapeli-14.12.1.tar.xz";
-      sha256 = "1zdbhn7dfrzb18k3rjgm934gjib5kazkgblsl15jxlzw2yfy458i";
-      name = "palapeli-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/jovie-15.04.0.tar.xz";
+      sha256 = "1sa6agn9zp12n98v7i9rxng2yn25b4yf2s8q8rjb3qg93kmzzx4v";
+      name = "jovie-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "okteta-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/mk87jrnhqgcarmc658k4f2fpm1181i3g-okteta-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9vacywnw3knldygpgxjghjbw2nfqdszn-ktp-auth-handler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/okteta-14.12.1.tar.xz";
-      sha256 = "1mw32cjj2kw36frki26nycwi48p1s0wi2v9h85v9dwgk6235i7d8";
-      name = "okteta-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-auth-handler-15.04.0.tar.xz";
+      sha256 = "1hj3vc6wj768xdpr02v64p9wbrh1y61zg2fal3bk3fzrlz2yslg5";
+      name = "ktp-auth-handler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1mbdk8jijasnkhrzavpv89mzbfrz9b6n-ksnakeduel-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kubrick-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9rjk1xbzbnc2qqrni0ng2spbzailrb25-kubrick-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ksnakeduel-14.12.1.tar.xz";
-      sha256 = "14ryx9ydwi23lhf5xr5mn77ixzkirwdg43mrh2cc0rnq440mzalv";
-      name = "ksnakeduel-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kubrick-15.04.0.tar.xz";
+      sha256 = "1qxyymrqav9hwa2ldqqpr49aj5sqzmiin6c4rmbirxmaasmyqn6a";
+      name = "kubrick-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/nky571v70dk45hy9jfvii63amga1qx55-kdelibs-4.14.4.tar.xz";
+    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/l2lbbhnr6r0q1sf3rzzjnwina7gvlllg-kgoldrunner-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdelibs-4.14.4.tar.xz";
-      sha256 = "0h255hhl46r7ax9hm9sr7qddljwzfky2ssh695ml3svfwg52mihl";
-      name = "kdelibs-4.14.4.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kgoldrunner-15.04.0.tar.xz";
+      sha256 = "1hsrjszck17gqnnpxzbdknj579n7xpmbq813a77736cmi95qr4h3";
+      name = "kgoldrunner-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6sfiw6s55wnsnsyh0sas9s3f8fbpwnw4-kdesdk-strigi-analyzers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "filelight-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pr78axnbpxwah326z7jqhq4cz1p7h7wr-filelight-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdesdk-strigi-analyzers-14.12.1.tar.xz";
-      sha256 = "1bsf1dgb2039jjzqy6pr66yw08kxbn5xpna0bfmrbiw4pprlmbi4";
-      name = "kdesdk-strigi-analyzers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/filelight-15.04.0.tar.xz";
+      sha256 = "18vcm8f8wgl0hqlycljv7kbq8iip5vadrsyhr58pw60cr8h36n0s";
+      name = "filelight-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/hcxrbw696pca5z4p95ws7373x55bi9lj-svgpart-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kajongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/13030n2xwx0rnbd0myy87pfzrd93rpkw-kajongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/svgpart-14.12.1.tar.xz";
-      sha256 = "18r6n6wh8yg5wmd5wyc8sf6k994ghfknanlp7l1pcqwqa6wfv6rx";
-      name = "svgpart-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kajongg-15.04.0.tar.xz";
+      sha256 = "0aa2c2c4322lv4prwxkhanw0lbrv1145w6fz473f6ybfhg9isc7d";
+      name = "kajongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dazj5495njhw8bdyizpx0af9r20bvj5a-kdenetwork-filesharing-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kw08x6m9wzrmhm6av38hz2nd18agxapj-ktp-contact-runner-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-filesharing-14.12.1.tar.xz";
-      sha256 = "0id8qmr432ygkfmcq3mfr3zv0w58393w0z5pd86k8nnkz43nh208";
-      name = "kdenetwork-filesharing-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-contact-runner-15.04.0.tar.xz";
+      sha256 = "179q9707cxmd57iyadasdr9rvcqxwrahccc8vjylzh1x5p2arib8";
+      name = "ktp-contact-runner-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/11nyk47q1i4qh92kdzw3l6gi5nqhja5b-ffmpegthumbs-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "sweeper-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yz48bx3mdyvapyz52aa846f32102jh7w-sweeper-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ffmpegthumbs-14.12.1.tar.xz";
-      sha256 = "1q6ayhxrsq3y5yvrawsvr88pzl7vcz5ms6dq0sgd4mad83kwl5yj";
-      name = "ffmpegthumbs-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/sweeper-15.04.0.tar.xz";
+      sha256 = "15amamnrg7d52l0agkw66k96xk0j5shk2667wc9p2jy6g96cw53c";
+      name = "sweeper-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmix-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5y3gdnaa0a8nhpd5a2abp3ixcdnmg9im-kmix-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kfourinline-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/s96mhycwzwrv5w708mz6appsbf1vivz7-kfourinline-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmix-14.12.1.tar.xz";
-      sha256 = "1zk1c1m1zihb4wih2330a95gd1skakwsx0vccxp8np3nsh71z3fa";
-      name = "kmix-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kfourinline-15.04.0.tar.xz";
+      sha256 = "1wpcdzlpy8jdnlzzhys8n08pknk7ncq41dchs2ii3v30w1dnwln2";
+      name = "kfourinline-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/6h2dlw28xi87axxdglbkjz2jyjl78ijv-audiocd-kio-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0q8wks5hqas02y3j384lwqy2a1npvmch-ktp-common-internals-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/audiocd-kio-14.12.1.tar.xz";
-      sha256 = "1wi3mwx9v7lh71ciar29c1bprwh2lgq46yq3kx5gq7wz20cx54hh";
-      name = "audiocd-kio-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-common-internals-15.04.0.tar.xz";
+      sha256 = "0y6jwqaxvkzjqdz4j3b4z5ybz4d3ci09x8apfr3h0q5pf4crkv8p";
+      name = "ktp-common-internals-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "lskat-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/awrjks0ihywpqygz8aqwrxn53yd8sljb-lskat-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "krdc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ch18h2226p60xnyjndy40r8fgwajd80p-krdc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/lskat-14.12.1.tar.xz";
-      sha256 = "19q5qzfh1dczkdz612hw21849h438dhl21ghbfm5hi5m04vmn8rc";
-      name = "lskat-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/krdc-15.04.0.tar.xz";
+      sha256 = "1ikm5a8lb65iljdvs16ipclkassjjdf7i49whcvz71rx8agp01hr";
+      name = "krdc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/kk2rlvdl5hm4b0ms3i5pvs1r6lh5ipbh-kmahjongg-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/05dzvpk81hhrfp0yncmgnq8q8nlps3z3-kdeedu-data-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmahjongg-14.12.1.tar.xz";
-      sha256 = "1pbq9f6zb96v98sz94kz979z5scpqzvc5fp4nxs2dg1rx1la8qxl";
-      name = "kmahjongg-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdeedu-data-15.04.0.tar.xz";
+      sha256 = "1r157dbi75ayxww57vhww3cjxv1z2y2mv54xh2cf3zfjv6kmp7lc";
+      name = "kdeedu-data-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.15.tar.xz" ".tar";
-    store = "/nix/store/pmn8vgwjdszsl46pra65vn5i7pxfj7g4-kde-workspace-4.11.15.tar.xz";
+    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1z4nb0mp0d654n7wmyddxslx82rh2y10-signon-kwallet-extension-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kde-workspace-4.11.15.tar.xz";
-      sha256 = "1y7df6mar72lzy1dan7v5wwgf2w669b0hkrdb6ai1s3whmqr611a";
-      name = "kde-workspace-4.11.15.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/signon-kwallet-extension-15.04.0.tar.xz";
+      sha256 = "1s3nm7vrwwgin278vif6w8yyi1vg9hk401swvlhwmn9305bxqm01";
+      name = "signon-kwallet-extension-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1l6fwf3bb28myf3k3hsiv27gk8ar6gz1-libkdeedu-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kcron-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8qjk4ri8l2cvvqaf5qpmzwz33gx0n9kn-kcron-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkdeedu-14.12.1.tar.xz";
-      sha256 = "03jic27ghfz2gpbn2nb69qiiip4vgy3y4as8qx328cl39l5vh8d4";
-      name = "libkdeedu-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcron-15.04.0.tar.xz";
+      sha256 = "0srq463k37klfbvrclhrni1kbn2bxxsfzp8l8lbx4dz8p93fcvdp";
+      name = "kcron-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wvgsj2m324xic0rjr6kyi7pfwqnfpmzq-ktouch-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ksirk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/hngc4aajjzr5qszkxi745fi8l28k8wp4-ksirk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktouch-14.12.1.tar.xz";
-      sha256 = "07z1nkyc4hxjd39pczkv1z6dxdjn3334wnv778mdrf98lm77vjxd";
-      name = "ktouch-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ksirk-15.04.0.tar.xz";
+      sha256 = "1rl2c1yjiiw3gy4kblxgf2lh2sd5bpwz36hi9kv1dvf00bwi1w0x";
+      name = "ksirk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/wgjmvym6jg44xr5mzgw3pb77w1ya8s2h-kblocks-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/br98dpkixyvcr4dwp6fqfcgzrvgqvps1-kdenetwork-filesharing-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kblocks-14.12.1.tar.xz";
-      sha256 = "0qk5g5karl29g4hbpl7lfgahv71as3mj6j604cpd2wiwma05qa2s";
-      name = "kblocks-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenetwork-filesharing-15.04.0.tar.xz";
+      sha256 = "1296rg0axk6gc765kv3wnqqb7mp45sqw8rvhz631ybbsvcy9vk6c";
+      name = "kdenetwork-filesharing-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5ppmqjmqizw31x1yjnzmicybln433l9a-kqtquickcharts-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "okular-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8lzrv2slw0ck39i94w8ms8zm5vfx2x9v-okular-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kqtquickcharts-14.12.1.tar.xz";
-      sha256 = "026am7l64m721vv3l79z6v3avxq94z1vrzx1ifwf8p001inf4ydy";
-      name = "kqtquickcharts-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/okular-15.04.0.tar.xz";
+      sha256 = "1xfj7hm8149xn5g9yy56zd93bjs38k10009l6d2xynvqcd2k5sl7";
+      name = "okular-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1nwklpfvdggaxadjc3396j8qgwdl619h-sweeper-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-runtime-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1zj95rkrgbp4s8khzd7hjdnz9ndib9q3-kde-runtime-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/sweeper-14.12.1.tar.xz";
-      sha256 = "0c3kqnjwi5q24k7b05dr5mygd3ps0r1s9cbs49r9zikswz7gky1d";
-      name = "sweeper-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-runtime-15.04.0.tar.xz";
+      sha256 = "0dpbmg8w5b2hq3fw38v3fa4w45lm1p06sh72rscsz2mc2ly6bkxr";
+      name = "kde-runtime-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kopete-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/gcj1qvbh1m7hbbyfdsl1nypc07nzy0yn-kopete-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "konquest-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p08rr4gqznxl4w3gfd7na11v8l1s8afq-konquest-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kopete-14.12.1.tar.xz";
-      sha256 = "1pkgzlq7scz0pvmn2dis128rh2hdfxhbg6imn4mwrizmlpaycb98";
-      name = "kopete-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/konquest-15.04.0.tar.xz";
+      sha256 = "154vbny41axcckdi4dw928kvhfvw8j5b34l79dqa15lnsml92m6f";
+      name = "konquest-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/w5dhnrmkm982i7kw1j9j5rf09z22cka9-kbounce-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g2j9js2pgakja03ljw9zl4xp9v2pn8l4-kde-baseapps-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kbounce-14.12.1.tar.xz";
-      sha256 = "1x726x5x6cpdnig0wmam7zzigj33afwswdmxxgspnpimkybwpy0f";
-      name = "kbounce-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kde-baseapps-15.04.0.tar.xz";
+      sha256 = "1xiv9qmv7x6djv7fg7khsqhzrnypr8dg1c3ximi9r32jvcfcda7q";
+      name = "kde-baseapps-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/cxxfxxpmnk70i9cx0cgx7k6jdg32s73f-kanagram-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kreversi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h39cafz2080k7xih81jn5f7scfpvszdw-kreversi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kanagram-14.12.1.tar.xz";
-      sha256 = "07lz09armwr4j594pn30d617ngxcn8n3yxikm79ck5020gx4wvgx";
-      name = "kanagram-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kreversi-15.04.0.tar.xz";
+      sha256 = "0z7rp0d52cgc8lsnjj0p0qh7fydgk1348ljymfmw8kr41848fag7";
+      name = "kreversi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5jhzsqxdfzh1zw1d103np2rm34jdj945-zeroconf-ioslave-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/17j3xfw2gjbvkb6k09ykyf8avx7fip38-kate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/zeroconf-ioslave-14.12.1.tar.xz";
-      sha256 = "12ri1dbbzc9dwx2n843979yvh93a9yrzpprk9jdmjr1hkna8rgmy";
-      name = "zeroconf-ioslave-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kate-15.04.0.tar.xz";
+      sha256 = "1g4dh9d55mbdnxrxp8kyid52gg649rnd6xhv1di3k1zz6x5jjnr1";
+      name = "kate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zcxv7zv41p63pij7d37wdp4hcll77ldc-libkeduvocdocument-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkface-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/f6n75hb70xfprv3rpa78n59icxglv3n8-libkface-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/libkeduvocdocument-14.12.1.tar.xz";
-      sha256 = "0nqjcddjmapgadlkv97banjk5fh7p355hfxcbspksyndsgplz1hv";
-      name = "libkeduvocdocument-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkface-15.04.0.tar.xz";
+      sha256 = "0hm3llyjprfhj5l7y97kyyk61cbis7hmlgpf3qfin958hmip7kds";
+      name = "libkface-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dv7j6rb4688zzlp36l45f2h0vzykvybj-kmousetool-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/frl8ikxyck6mv44rdwlca5dg64vlar20-kdesdk-thumbnailers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kmousetool-14.12.1.tar.xz";
-      sha256 = "0k38qj2hv9k846fba4sxdg1biplbdn5hfmfhx5qmc6g6h8xrs2dr";
-      name = "kmousetool-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdesdk-thumbnailers-15.04.0.tar.xz";
+      sha256 = "1y3wix763ndi3xfwpm3h3cfj3r446jkrslgn09bplm4x36jdd2wv";
+      name = "kdesdk-thumbnailers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/dqi11m0gnkyrfppdlibvgv2gbycpjqm6-kolourpaint-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mxrd14q1c9hbw5lnpvk32s2jb18cjyrn-kremotecontrol-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kolourpaint-14.12.1.tar.xz";
-      sha256 = "15vkd7i35myfi9m11p52g8x7dlkvf06fa400r9vbw321fza2gyjc";
-      name = "kolourpaint-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kremotecontrol-15.04.0.tar.xz";
+      sha256 = "110bcp9b4y1mwpvd6r09zlrr54f1qdncxixliivclx9y0nrf9ljf";
+      name = "kremotecontrol-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/zl0qg5scvgmzsq6c7l4s2rs4dh6v243h-kgeography-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kmahjongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gaj2cqkjp0ynwsywrshpy7glfagz37ds-kmahjongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kgeography-14.12.1.tar.xz";
-      sha256 = "04g2sw2r1i8kc85n9igk15kmk3hc8gdci52lxk4ca04bxcif7061";
-      name = "kgeography-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kmahjongg-15.04.0.tar.xz";
+      sha256 = "0agqvghlvw3n8xr15n44zjidxqghpmpzf5834n7d18yllnkmyqzz";
+      name = "kmahjongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1cknwl7y4djaq1cwjj3g38k8w8gi6zwc-dolphin-plugins-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5vsvkxwxycdr0qk54ksiyrlbdfqxc7qq-ktp-text-ui-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/dolphin-plugins-14.12.1.tar.xz";
-      sha256 = "0sjfm5ry54h56vbbch11js50a70pvwbkinyxxgyvs6g260ngpkx2";
-      name = "dolphin-plugins-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-text-ui-15.04.0.tar.xz";
+      sha256 = "0az6ziraqslcidjflljc25scrg1i2kgkppm93bd8y8zy4a2q1wns";
+      name = "ktp-text-ui-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rbc1h7c1v7bdzgwxqw5xs2x19rn4z9q4-kreversi-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kshisen-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jdmiqffbirvn2pzxx0vfia6v9mq9q1jx-kshisen-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kreversi-14.12.1.tar.xz";
-      sha256 = "1011262n5zh6hji7xxgq3k2hkgh0hqhpvk9krw22plda4nww2xwc";
-      name = "kreversi-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kshisen-15.04.0.tar.xz";
+      sha256 = "011a3gqij509vl74v03s24in83i2qyylrpasi8cpx81hgbwd7zkd";
+      name = "kshisen-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/rwsx6c3s4nc7vkcfk0c39jbp7f5f0rvp-kdepim-runtime-4.14.4.tar.xz";
+    name = stdenv.lib.nameFromURL "krfb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/r0b24gfzlljxq2wxxs6pyfvgacarvp7n-krfb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepim-runtime-4.14.4.tar.xz";
-      sha256 = "08axhahiqv77cr6ssvh1cadqjvv1064w5l94wxadnyq3vz8kl6kz";
-      name = "kdepim-runtime-4.14.4.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/krfb-15.04.0.tar.xz";
+      sha256 = "1j1mfjgza7zs3dsvm7aqr0w3lnia1svxrc47gd5imagqxzi5xb5i";
+      name = "krfb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdf-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/5caacq7s0yh79mqykwj5wydj3b5gyl83-kdf-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qqn7jza6dgshhapkvj97a4i4960dy5da-ktp-accounts-kcm-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdf-14.12.1.tar.xz";
-      sha256 = "1cvd7ydk277crv1wiw7sn72mv9lf5pqk56gylfmzr63mr7dyj5iz";
-      name = "kdf-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-accounts-kcm-15.04.0.tar.xz";
+      sha256 = "1a45apf4vmjpsrbm98ym8k7qivmfaiwsdsf0f65vi91imlkfdd2x";
+      name = "ktp-accounts-kcm-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kiten-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/8dl8yv38wpv199jjgw3kdl8rajxnnc77-kiten-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kgeography-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/arp2vca2a13jqqc37cv5pa03s4aayg1y-kgeography-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kiten-14.12.1.tar.xz";
-      sha256 = "0518zbvgn3w00b7lxfivrgrp8xrpb09rf9cf9zdxdl2z37gxmvmv";
-      name = "kiten-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kgeography-15.04.0.tar.xz";
+      sha256 = "1gm17z7a4dgmqds3gvwf1scgxb2js5xvaq4f74hr1042jq2br0dk";
+      name = "kgeography-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1widcjdd8hzy1dnabg9px06yjc0k7ncf-kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7iwcjypw2l9kkgm8l3dbchm47jziyjh0-kqtquickcharts-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdenetwork-strigi-analyzers-14.12.1.tar.xz";
-      sha256 = "1xdb3hm7iad2wvbwqaa5bbqzgg6xdbbv68xfjajpx8k9cn20kh9r";
-      name = "kdenetwork-strigi-analyzers-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kqtquickcharts-15.04.0.tar.xz";
+      sha256 = "08p53xa49hwgwcp1vgp1c0pghj2l5a2g71s0q30xn7vz7y91bi92";
+      name = "kqtquickcharts-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/k4y83g821js66c35bc6x2r8m1924vd4f-kcachegrind-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/28krw7dahfrcmwlbfqabzd6bmxqx9fia-kdegraphics-strigi-analyzer-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kcachegrind-14.12.1.tar.xz";
-      sha256 = "01fa9b73ymym5qyd5lirb4cf6c37x02a1a9ls2qgzswflm557d49";
-      name = "kcachegrind-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-strigi-analyzer-15.04.0.tar.xz";
+      sha256 = "02zpwqcfi0v0f53y4i2x1yn6d3nynlp8x7xb4ciacvmxzssh9g0i";
+      name = "kdegraphics-strigi-analyzer-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kstars-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/plbszpr250pr7x41578a4b5n329wgl4l-kstars-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "blinken-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pr2d0pipsss9n5xdd9zrgv939smlrvwk-blinken-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kstars-14.12.1.tar.xz";
-      sha256 = "08px9765vl6hpmy39wyhlbm4d3y5wh82w33g2fppx4d9bxmpz166";
-      name = "kstars-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/blinken-15.04.0.tar.xz";
+      sha256 = "1475yf37nlmnqq5sh2gc8x1nbkypxy560qmdyar3m5cs69r77679";
+      name = "blinken-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.4.tar.xz" ".tar";
-    store = "/nix/store/shap58rcwhg13766v7zm28nxr6rn09gw-kdepim-4.14.4.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdegames-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/w7f148vp2gdz22fhs5g65qjzbl9h36kh-libkdegames-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdepim-4.14.4.tar.xz";
-      sha256 = "0jpbc84xv07j2qynkn4mhmwlldbmjg6v7dqc1028kfk7sbcahhf2";
-      name = "kdepim-4.14.4.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkdegames-15.04.0.tar.xz";
+      sha256 = "1rwbr5pqn347rfhz56phswfzxmm37xpnw699si1612mkmmbl92ba";
+      name = "libkdegames-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c4m2nwfbjwqgc9ydq6macg4zkmrsd7v6-ktuberling-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jn27x6czz0lripamkjgkwga4cxyicmcm-kdegraphics-thumbnailers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/ktuberling-14.12.1.tar.xz";
-      sha256 = "1ghymw6ljvkd9wi4j0f1n8gjkhxfkqvmb8n36lasrfr27v57z68v";
-      name = "ktuberling-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-thumbnailers-15.04.0.tar.xz";
+      sha256 = "1p0alpdmhl3fm1r27cqiz80w9r1zmwj7pmdxf4f6mv2pf5q7z5kw";
+      name = "kdegraphics-thumbnailers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/rnz72ryzp7mcxk83l71rw7br3k6hamr9-kblackbox-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kcharselect-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1xvdiwnp84qn7cvcissssf92w4nx8y7g-kcharselect-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kblackbox-14.12.1.tar.xz";
-      sha256 = "0cxyzlsvhw9rg3b9c558zbqr3ijbzyx5as9g92ald8w7qjja5jnv";
-      name = "kblackbox-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcharselect-15.04.0.tar.xz";
+      sha256 = "1jfh1kzcazb4b4wqv6mjy69h8fx78zzf7xk60vzaks07b4c7x9x7";
+      name = "kcharselect-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/c3gmynlqgyhdx3nghhwgk8i85qqysjsj-kalgebra-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "libkcddb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7in63wvw5njm2gqxqbsjvj8sh7j5zbsf-libkcddb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kalgebra-14.12.1.tar.xz";
-      sha256 = "0pn4scp7y7ih60jaq39kanwgsc2aslb41v9xw8322kk8q4gyc8g4";
-      name = "kalgebra-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkcddb-15.04.0.tar.xz";
+      sha256 = "1ldjfkppfhknln6hn3py8519p5jc63pf9apwx7h5jf3z6ci1k29p";
+      name = "libkcddb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/53ksfs7gxzr33sgdbfxk4ydjzzl2c7y3-kdeedu-data-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kstars-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vqrsgg7jlr6h8y6m2cp2fvv0jpbv8jvk-kstars-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kdeedu-data-14.12.1.tar.xz";
-      sha256 = "0hyqwkva7bgi43fgad4caz8q4pcb9kx5czpc3d8nksk5q28a1llg";
-      name = "kdeedu-data-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kstars-15.04.0.tar.xz";
+      sha256 = "0mj6haknp9y03md9j007w5sf66529chififw0xy6a7bvnagaph2g";
+      name = "kstars-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kigo-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/ggvs29ryi85ig0r9z3jq259kvyq1k1h0-kigo-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kget-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cglfzvjxh6b61dyvla9q9g0qnw6rzlm9-kget-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kigo-14.12.1.tar.xz";
-      sha256 = "100rrip6w08ld2xgwdm2dryk8qa92dssdz0a0iykgklddq6dvxr1";
-      name = "kigo-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kget-15.04.0.tar.xz";
+      sha256 = "0v4gfik9ddzpddknrj9vp2d2awn2bjzn74n173njf90pbfnql3y5";
+      name = "kget-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/p445xkdbm1dqqb3p2x10rag6xccidp9c-print-manager-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kanagram-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dh926v6zz23z9lqqqvhia5ilwxazd4lq-kanagram-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/print-manager-14.12.1.tar.xz";
-      sha256 = "1ad9a23cfivyzfgajg1bn10n2glp2ks8yqkl5f0xk5alyldzbir6";
-      name = "print-manager-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kanagram-15.04.0.tar.xz";
+      sha256 = "1iw2vp82ax93kbc7ffmh9wsgjp0a772vb2bxsmm5g5jcmjd8vcr4";
+      name = "kanagram-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.1.tar.xz" ".tar";
-    store = "/nix/store/1hx5ws8bbzh0lnmjp0x8ln1s7rv3x62a-kshisen-14.12.1.tar.xz";
+    name = stdenv.lib.nameFromURL "kteatime-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mrdsmb6qaj32np3p3mcwi3sx38kmgvjj-kteatime-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.1/src/kshisen-14.12.1.tar.xz";
-      sha256 = "1b0csn1ngpcwcl8iwv02hy1gb6hk13453khzgya6ckixk5szcdy7";
-      name = "kshisen-14.12.1.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kteatime-15.04.0.tar.xz";
+      sha256 = "0g1hhlqhag0lllm8s10ylw5a6qwgsmb5hj33l2knbifa2sdg4v0c";
+      name = "kteatime-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "lskat-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/w24lqbmni5n7w2xdmw1khzixg9f2p64m-lskat-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/44z86p3l3axqq54wnvbbjavifp6jrnxn-ktp-contact-list-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/lskat-14.12.2.tar.xz";
-      sha256 = "0c5zg0lkzcgf7ff1hqy6rh8cq5z4935p7rmm463pl933djpbl5bn";
-      name = "lskat-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-contact-list-15.04.0.tar.xz";
+      sha256 = "08k2yplr67s66y4134n007kzsdxnrwgjhv09babprb4cbcm7pdgm";
+      name = "ktp-contact-list-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kpat-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1w6n38dac3mslyfl5blf1cas013m9h8g-kpat-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/a66l0r6622i36x7njknq4rw77wq1z8f1-ktp-filetransfer-handler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kpat-14.12.2.tar.xz";
-      sha256 = "1rhs752b3ncbpbmrc9zknww0dsihh3lvwvh629v1s6xc0vqvcar4";
-      name = "kpat-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-filetransfer-handler-15.04.0.tar.xz";
+      sha256 = "0z50v3bq4i618c1sh5fa67il4vhn8mk5c55wlhxc2q8srr85ii92";
+      name = "ktp-filetransfer-handler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/738qaln8qxvsdnqiy6adk9sh28rfjkgy-kdesdk-strigi-analyzers-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kompare-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lmbjfk56h71c44paw60x7wl6pd58yc0w-kompare-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-strigi-analyzers-14.12.2.tar.xz";
-      sha256 = "08db2nhkw265i2dfbka5q6vm7bxbjywk1p52hhjc57a2qvqfb5ww";
-      name = "kdesdk-strigi-analyzers-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kompare-15.04.0.tar.xz";
+      sha256 = "1pf693s580p208dbjj6d4w11i62bwfifjn3wmn2fd8fip3ajdgxh";
+      name = "kompare-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fl2nm7vv3k36vyf2wml8pv4sskh53ycr-zeroconf-ioslave-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/54xdq0xdkmw2z3j0zhfxi6gjvm60g919-kdegraphics-mobipocket-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/zeroconf-ioslave-14.12.2.tar.xz";
-      sha256 = "0jx35018amdcgmxi9c7alc4c80qywzakqdrzyq5i7jxjcl3y1ly0";
-      name = "zeroconf-ioslave-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdegraphics-mobipocket-15.04.0.tar.xz";
+      sha256 = "00m5i5jdnj92jnjm32ryh8dlf3fzl2mzybm5w5y1a82fq9l7j774";
+      name = "kdegraphics-mobipocket-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmix-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jrmw028qjd86q4mjyasx64iyssaj7wk7-kmix-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenlive-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dacxkxjxhz3afz4165nv4siyn6sb5jws-kdenlive-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmix-14.12.2.tar.xz";
-      sha256 = "1jx2mkrdx5jgrjr02snb199xradpxaw42dw8y7icbpmkihxmxry1";
-      name = "kmix-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kdenlive-15.04.0.tar.xz";
+      sha256 = "1ski64rqa1h1aqr16vwnvpqpww7vgfzbnlki3998k8gbc703q512";
+      name = "kdenlive-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmag-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g87b5njzgp7jrydvwvc2xwpnwv0p33kd-kmag-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktimer-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nab346b2rb5dwkj4gdnjm2pyhnzf0i4h-ktimer-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmag-14.12.2.tar.xz";
-      sha256 = "0bcrr67v6h9vc69341b662z7dbgxm3yrazfkfsdlxp1ahqspl6w5";
-      name = "kmag-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktimer-15.04.0.tar.xz";
+      sha256 = "014jfyx4lizq2bh5yx73zarn9mzp4lkyaxvml0m8i53zdnacnqvr";
+      name = "ktimer-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/35izrbqhb52zlfs2x1qsjc0k1l2d1pkk-mplayerthumbs-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1rqzjg16kl3m8cc6pjf2cakhjx90kkhw-libkmahjongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/mplayerthumbs-14.12.2.tar.xz";
-      sha256 = "1kwpd3j64zm78qwn42q3kgipywdlcpvibng06x032yv6i8wmi6m1";
-      name = "mplayerthumbs-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/libkmahjongg-15.04.0.tar.xz";
+      sha256 = "1912k9h4j8rhly5x03anf4gzjs0aypbwh8ifvhn289gydccqfcyy";
+      name = "libkmahjongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hqsma0ww8philxqp1hk22sk3lf711y4i-kbreakout-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-approver-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ijsjgpid0pnrq1d174gpbma6xfik9989-ktp-approver-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbreakout-14.12.2.tar.xz";
-      sha256 = "12y03rbm13pg1c8xpgclklin5vjzsidyaiamhh5bqpqsxsqcnh5n";
-      name = "kbreakout-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/ktp-approver-15.04.0.tar.xz";
+      sha256 = "0sfi4i071iini7bv9i7d4f952rnd5r89vqnhkqqrzbnmi9bh4rx4";
+      name = "ktp-approver-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cixkkb370365vic33rl9n9846ll44rqx-kreversi-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "cantor-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7rf8al4ncyxkhzg899mssimw3lwf0qy8-cantor-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kreversi-14.12.2.tar.xz";
-      sha256 = "05zkwswpy5sw9ab3gc012pgvl0wq8f2lb0qhdr96rvxgp8m273j5";
-      name = "kreversi-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/cantor-15.04.0.tar.xz";
+      sha256 = "0npl1p3gwflfl9rrvbi9ql28af6m1h2w46vkqh4ksp4d6jh9lx3p";
+      name = "cantor-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "jovie-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xmvafr9hszzwndqazdzsn9i90cwi0afs-jovie-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kbounce-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9b915jv5dcm7kinwvj9yrxs72vbsravw-kbounce-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/jovie-14.12.2.tar.xz";
-      sha256 = "0yfn5n3n3knacvpr3cqiii0hldbxc6m09k1g53hlksay61s2r56v";
-      name = "jovie-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kbounce-15.04.0.tar.xz";
+      sha256 = "1jllvam65kjfanry4wl2yhhgi5hak0swiradyh15b73rb89w2lj2";
+      name = "kbounce-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yhs96yv9mv61pp521mpay8i0dgqlmm1y-kde-l10n-sr-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zhlxa8x34g7yz6wwqnhn062d4yxgl214-kcolorchooser-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sr-14.12.2.tar.xz";
-      sha256 = "07f8x34q8bdcsvc3a76zpd0sjxnq5ja6ghl3d9a0a4ix0hyyv8zd";
-      name = "kde-l10n-sr-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kcolorchooser-15.04.0.tar.xz";
+      sha256 = "0g51v8641712fyycm3d6pkx8mlxkpp832l5i77f557lgi3dqfnh8";
+      name = "kcolorchooser-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l2499bc6hfv5x284cs4bjvqbmbxr0aij-kde-l10n-hi-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gcg36nagmfjc9w510pbihc44gz765nh6-audiocd-kio-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hi-14.12.2.tar.xz";
-      sha256 = "12ky5zmds18n2sgivrnpds8qjkd64397ia9h8h9s5s9l3cwgipb2";
-      name = "kde-l10n-hi-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/audiocd-kio-15.04.0.tar.xz";
+      sha256 = "05by4zrd3s2rkv915dq3ri6rhq39sl9wkw46diajkwzqdg6ajbiz";
+      name = "audiocd-kio-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kpcnzwp6wg76slwd2zdmzmg09iydims6-kde-l10n-tr-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kgamma-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zd7r3mali9j223lm28w0xx6fl4jkiyfd-kgamma-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-tr-14.12.2.tar.xz";
-      sha256 = "1d326cxhfx0434x45lq9wgn5csvmclgd6fmyqzwlax88vm57gg62";
-      name = "kde-l10n-tr-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kgamma-15.04.0.tar.xz";
+      sha256 = "17xfiaz751q38q29s20k6fffshd3jndydnj54q4bd5l08fwmxmq6";
+      name = "kgamma-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/p36g7i6w8hgsz3wdax3ldxzv3djmw258-kde-l10n-pl-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "knetwalk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/65sm832j0rnm215vmd7gcrnnbj1gd2cj-knetwalk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pl-14.12.2.tar.xz";
-      sha256 = "0knjhk0941qf28l4izz2ssfri88s09k0vxd3d6xblg51r6m0b2sk";
-      name = "kde-l10n-pl-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/knetwalk-15.04.0.tar.xz";
+      sha256 = "0ljwgb5sb8x2g2qrvnl1lzmk34zcg6g1qfyp6p74h8lbhfk1vbgl";
+      name = "knetwalk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iyab41x341l7b1acprqv7azbdbxbd0lw-kde-l10n-km-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "klettres-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bnd0dnbv8ybywwzaskjlx2dvdw3l9afc-klettres-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-km-14.12.2.tar.xz";
-      sha256 = "108pcxflcbhisixivg6153sm8rrbdrrh6rbvxib307dh1q1sl7ix";
-      name = "kde-l10n-km-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/klettres-15.04.0.tar.xz";
+      sha256 = "1kzcqj1w5dcmc54v96q3s6v4fj86kgc9vdllg7l98bv9d2zcxpph";
+      name = "klettres-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sqlfyy4bhzgnv75msvyv2m7sx8vwhb0g-kde-l10n-eu-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kapptemplate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qg0q54wpsmr1y9dfa72y24fjr1faqd8y-kapptemplate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-eu-14.12.2.tar.xz";
-      sha256 = "0x8dihag23ljyw50qpg3bqyhfg8p4f6k1daz2102wkqdbwhzk1ch";
-      name = "kde-l10n-eu-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kapptemplate-15.04.0.tar.xz";
+      sha256 = "01ldjxgsv422l9lay5yg5b9y0cbbwpfl8x41a1wvm9h2l4k0mn3r";
+      name = "kapptemplate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/63qi174y5jw1cs3q0wzb5jk4j64q4zqp-kde-l10n-nds-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g3mfvybxvh2rws76bdsvd7fcnkc3cjdh-kjumpingcube-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nds-14.12.2.tar.xz";
-      sha256 = "1nyz71cpin9cqffjaca9wv9s5v9n358agb1ncamg5iqj176cxvrl";
-      name = "kde-l10n-nds-14.12.2.tar.xz";
+      url = "${mirror}/kde/stable/applications/15.04.0/src/kjumpingcube-15.04.0.tar.xz";
+      sha256 = "0mj33yz2565px6ljlw6k0pgd2ljq9gsjx4x9jzq6wbcjg6vbiyah";
+      name = "kjumpingcube-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/f4jmy4xgm9a50a4r6nlvjz61ihw3w14j-kde-l10n-et-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccessible-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/51djz0y5i1mr90pv9fmxi0vwzrrj2ygq-kaccessible-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-et-14.12.2.tar.xz";
-      sha256 = "1a4kih4lb4sqwasvqhqj06r37rj00vjlhwihlr7jk8z373yg6kk3";
-      name = "kde-l10n-et-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kaccessible-15.04.0.tar.xz";
+      sha256 = "1q90ak7yxvvi5scxajb3d4nid2h7y7xfvdbqfd9a6w312r6lcvz8";
+      name = "kaccessible-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/j4jf2n3bikb23kzg55i538jjhz7gn2jx-kde-l10n-ko-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kuser-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4q0xn6h1mf6plwikl16v490hbcm1c3jf-kuser-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ko-14.12.2.tar.xz";
-      sha256 = "0vv4xdis64nc66i81fnilnkl8max6wm07kzwiqahdnrbrza8vqab";
-      name = "kde-l10n-ko-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kuser-15.04.0.tar.xz";
+      sha256 = "0fgjfd76iiyp98013x9la61qxnw454kcrl7vpikg37hqaqbzmgkh";
+      name = "kuser-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ha5w0palyj9b7ajwd5xdqppgjnx1vsv0-kde-l10n-kk-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kiriki-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p393dfammjyxak0wm3vblzcb8n7r0gnw-kiriki-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-kk-14.12.2.tar.xz";
-      sha256 = "0bvghaggmzm8a12gl2z6ykgf8qabiagjmmddiqihbnvdi27ia78c";
-      name = "kde-l10n-kk-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kiriki-15.04.0.tar.xz";
+      sha256 = "0cg4iijyk96lwc48ifs5arip3y51wpb4fd4slgjbkhvg4fc859sa";
+      name = "kiriki-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9cjm0q29zj5p7if67m6ax4vp9bsp1xmq-kde-l10n-hu-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/819bf5a5q4b4l0w9yi099capf9il9whz-kdepimlibs-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hu-14.12.2.tar.xz";
-      sha256 = "0s2h123kbylc9ijxv6yfj5l593zgy5ar843rn82jjpvfbq3qj11n";
-      name = "kde-l10n-hu-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdepimlibs-4.14.7.tar.xz";
+      sha256 = "1cmqyx0shm0ss48pjh9jm9g9bghkkl6fg5wgw4yhs4dgz1nj9qn1";
+      name = "kdepimlibs-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v1zrvmd2lvn0y3brh0j4h5k97sgqj6jn-kde-l10n-ca_valencia-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "amor-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fmbdfhm9703yaq7x619d1s97il6prp7r-amor-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca@valencia-14.12.2.tar.xz";
-      sha256 = "0ivr9rxk220rxdw37yx5ipdd8ik43jn43b50cbanw6hx3h39bpiv";
-      name = "kde-l10n-ca_valencia-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/amor-15.04.0.tar.xz";
+      sha256 = "167j2qqkivrc2pid11nmnllw2m2amr8d9jvafy54j3i7mcbs788k";
+      name = "amor-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l1nsi3pqrb0wv2v650sa8xax75kpinxx-kde-l10n-fr-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "knavalbattle-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/y9k66adhrcr1vxyzdvsx3zymkd7b4zaa-knavalbattle-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fr-14.12.2.tar.xz";
-      sha256 = "01lkgx857vmxl90si1b55gyz27iqdbk7qkn5v40n356zzaicrxva";
-      name = "kde-l10n-fr-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/knavalbattle-15.04.0.tar.xz";
+      sha256 = "0hgwx63g1lrzrszajya4va2pidh2xm1qy7b8iw5xi1yz1khn6cvd";
+      name = "knavalbattle-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qmf7y72b47pnq0b0gmxhw3slsgmy2awf-kde-l10n-sk-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kiten-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zb4wpb0g4vbkrnwrk7d54l2dd88cz4b2-kiten-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sk-14.12.2.tar.xz";
-      sha256 = "0diajsp56l6dg96m9nij834dmky1gh48wd8ji5zs37fvpmdc96r0";
-      name = "kde-l10n-sk-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kiten-15.04.0.tar.xz";
+      sha256 = "0lpvwm20zr7zq7p09igbacqhm7pv4bv7r701nijw5l9l4d58hq3y";
+      name = "kiten-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/var4wc2isqx94ay6lq8fnnynb1566sgm-kde-l10n-es-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kwalletmanager-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4i8v7c1a44idrlpdqc6yk41w6r34259x-kwalletmanager-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-es-14.12.2.tar.xz";
-      sha256 = "01ha5db71rzkr3a0mlq80ag0fagivvjh26ck0y8da101lgl01i4r";
-      name = "kde-l10n-es-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kwalletmanager-15.04.0.tar.xz";
+      sha256 = "0c5r6pfinb509a0mn2k31wksiya9b52pjm77bbaq60k1y39fsizc";
+      name = "kwalletmanager-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3h7wyirznwm4zh6flqq1j2hacayvm423-kde-l10n-ca-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kalzium-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6ivi9a4yilhb621zj0kz07yzbxa5wpxs-kalzium-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ca-14.12.2.tar.xz";
-      sha256 = "1gcypc9l95iry45vh4pl1i7hwrdnm4lgnwnfnw1l7016lhgfjr8m";
-      name = "kde-l10n-ca-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kalzium-15.04.0.tar.xz";
+      sha256 = "1x3vdi9h5px84cm7k1nbrlakkb13xrc25d6yw22pnfsf3v4n66f5";
+      name = "kalzium-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mi03yzrjslab56mj7qw22d2lzl2kk4pj-kde-l10n-cs-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kfloppy-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7w91cal36byklnn0mzzclgjj5hpjzb2j-kfloppy-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-cs-14.12.2.tar.xz";
-      sha256 = "0rb6wnw0944zpllm4cac063r7hl5rq28x3b5a6has0cz4mqk9jw9";
-      name = "kde-l10n-cs-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kfloppy-15.04.0.tar.xz";
+      sha256 = "1nmcdzd7zhr4vfxb8lgl7dxfs01wy81kcag36s43hg7mfs5xb0k4";
+      name = "kfloppy-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9lw0j1h2pwvl1zpcl8cjba2xqc7lwkp9-kde-l10n-ar-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kolf-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/76g0y1k03dlc50d5wfdgpb2grsy9p0qa-kolf-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ar-14.12.2.tar.xz";
-      sha256 = "0nkv2pj4f3hjrv25l8kqm9cqv0j7h3crrzyqzq026zzz6znlq190";
-      name = "kde-l10n-ar-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kolf-15.04.0.tar.xz";
+      sha256 = "0nzqvq5y2mvh7x2lsq8prkyn99j8137hq5pyk5d9yhla4lpq2lr4";
+      name = "kolf-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ix18mmzjf395q3wj2qcbpm1z9jvywm4k-kde-l10n-nl-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "print-manager-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rmvqcnl3b77hxhcw7z22vx03pi1gk3gp-print-manager-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nl-14.12.2.tar.xz";
-      sha256 = "0izpvjmlh8yk1nnzpxa59n6lv4fk7575j8nwjapy0ynrknps4fff";
-      name = "kde-l10n-nl-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/print-manager-15.04.0.tar.xz";
+      sha256 = "0yn8dhvpxv5dxdn41c6rzar66gvlqmgb3m9f0rdrxzqmw9xidzrg";
+      name = "print-manager-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xa7h417v8b57fzimvggiyfx7hys197kz-kde-l10n-de-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "poxml-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kinljjyys5d6s5rfyhl6jzmh8z5bm92d-poxml-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-de-14.12.2.tar.xz";
-      sha256 = "1y54csccymc7hpbsm8kjw4v9ypgvxqcqahwvan2x84fvn7p80inb";
-      name = "kde-l10n-de-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/poxml-15.04.0.tar.xz";
+      sha256 = "1cziw2ydylsx45s5hrg1bfwk8qv9jbvji3hyzwi6jqc72fpv9q5x";
+      name = "poxml-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/44rprv2vwz090i48pnykzws4blyryxw8-kde-l10n-fa-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kblocks-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jjkr9khw6fzh7hb4xss9jx2qwz05jral-kblocks-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fa-14.12.2.tar.xz";
-      sha256 = "04qxb6qaj1cb174m6svd83m34fv8hwws8v4a20igkh09b5bl3dsx";
-      name = "kde-l10n-fa-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kblocks-15.04.0.tar.xz";
+      sha256 = "0q32xvajnv7x3fmhax1bmc4f7530cijisn48hpnpkm4g4mn68qb0";
+      name = "kblocks-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5051arszznb40q77d34zcwnaaxwv5wx1-kde-l10n-wa-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdf-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1wrgspd1n890ln1dffghslw86z2ynfz3-kdf-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-wa-14.12.2.tar.xz";
-      sha256 = "08il92kssd4d1zdkks4777pk8l2n3k4abv589x8rja4rlmpxrscq";
-      name = "kde-l10n-wa-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdf-15.04.0.tar.xz";
+      sha256 = "18i9rbl210vj370n3irjy2ai4vrhg26ivfs37wl0zdvz4i81ncg7";
+      name = "kdf-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hvcw01d444zkmyw1zpds2mnw7xmx4wca-kde-l10n-nb-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkomparediff2-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/krsghsp3cs3wmib774g36933smh1bldv-libkomparediff2-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nb-14.12.2.tar.xz";
-      sha256 = "1q461np49d0n0zhby9dd8knf7y3w9vi1r49bzlqwd1y4hb3alnms";
-      name = "kde-l10n-nb-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkomparediff2-15.04.0.tar.xz";
+      sha256 = "0i9vyc4bfqj22a1v48f3gyfkxl3pi9smsg0lql1bs0x8rsn7iznd";
+      name = "libkomparediff2-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xqqsvrfab53ybxfm0hq63bnlqpn6pz62-kde-l10n-uk-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/659kk26hrkssc4xkyda1kwf41ri00csx-kde-dev-scripts-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-uk-14.12.2.tar.xz";
-      sha256 = "0avr2c9drnkv7ndz9mqjayf6pivk6hbghmj6rli91lvqavjp6vlb";
-      name = "kde-l10n-uk-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-dev-scripts-15.04.0.tar.xz";
+      sha256 = "09r8wcln0m5akwjs939dbbz20kdqyxag91028vfmwzkw9r99604y";
+      name = "kde-dev-scripts-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kc6d1lkncc3djfn8zybhz6xzz7nzickb-kde-l10n-ug-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepim-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/i8i89jlpkd3rmgyfbw8xbv67az4xkmjq-kdepim-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ug-14.12.2.tar.xz";
-      sha256 = "17jizdwkfh3gfi9ykpszqw49fzswgps7xlbq9j8pjflyk36rya9i";
-      name = "kde-l10n-ug-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdepim-4.14.7.tar.xz";
+      sha256 = "0hnmpjrcv0qcyn6hagpayza2bjkyd2v8y02rriifq9q99j7rwyj0";
+      name = "kdepim-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/35mka79zjlplbis7b6dhiz48wls25gc6-kde-l10n-zh_TW-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-km-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/xdmcjjrfxhwwigf32sbafbakczc9jfyd-kde-l10n-km-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_TW-14.12.2.tar.xz";
-      sha256 = "0h3nfp51w7r601d6rpi55nzrmpywp3dalwqjwx4a6rnlawf3s2hr";
-      name = "kde-l10n-zh_TW-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-km-15.04.0.tar.xz";
+      sha256 = "1rv7pp35sgqppqs320pnlpqrjs0ljix9dd92fl2jrfpag15fi887";
+      name = "kde-l10n-km-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qs4xzws3s0vamj17m98fxcqqvp8hyyw7-kde-l10n-fi-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-es-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0kz1fd8ha3m8r5kmqa9phr607ayry1ds-kde-l10n-es-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-fi-14.12.2.tar.xz";
-      sha256 = "1q8j8v7i7lz3qk22adr1cj0bs6qw36540bj0vdzpa3390fn3i2ra";
-      name = "kde-l10n-fi-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-es-15.04.0.tar.xz";
+      sha256 = "0bjh1x3snldbmfvdamgid23cxv1sn3qwsdpy92h1djb49zbm51a0";
+      name = "kde-l10n-es-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yz0rzw7m437glx49xdxp4zz7ic51g5nq-kde-l10n-el-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/brvc7zjfmcvif2y8n4zrmlva72v243md-kde-l10n-fi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-el-14.12.2.tar.xz";
-      sha256 = "0wcbzs0s1nqafa0hi0abb17yw3jnxcq2mxyk4h5p9g7q7pkvh6s8";
-      name = "kde-l10n-el-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fi-15.04.0.tar.xz";
+      sha256 = "0xh66i7wgapi6bhig712mlq8dkaml9dpzsj43dic58xw8bx4n6s4";
+      name = "kde-l10n-fi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fcqsn91fsip4bi7y763y07i3ii4ji8zs-kde-l10n-bg-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h0hfrfigk06zqqgl0crsah3sqgh05syp-kde-l10n-nn-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bg-14.12.2.tar.xz";
-      sha256 = "099af2qdxjy8whfaw0hzmlywb7l7bmpssga90xyahr7nh6l8vwnz";
-      name = "kde-l10n-bg-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nn-15.04.0.tar.xz";
+      sha256 = "1d2yvvl6rralsw77vg6hmbi84dswf116dpab7r5039nqgxnr8k81";
+      name = "kde-l10n-nn-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nbb6gg7pc3yzjxs3gj7l0363i5d1bq1h-kde-l10n-lt-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-it-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/r2mbi7gj1a4f71cp6xgjxfkbmx1qzzrp-kde-l10n-it-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lt-14.12.2.tar.xz";
-      sha256 = "1lkjmcj77mmk6lvh1h51k8i9nn33b0q9vgbampj33qgax1d7a4mk";
-      name = "kde-l10n-lt-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-it-15.04.0.tar.xz";
+      sha256 = "1izidgcrzyvxka143cpnvrcnf2ddzp8384sjw6bvw32wsxi3v0mp";
+      name = "kde-l10n-it-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/92dr7l2vrh1j4bxj2zy21prpfb1v9ba6-kde-l10n-pa-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kxaxpwzy0bs1675by3qhhvj1hlvvig7a-kde-l10n-pt_BR-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pa-14.12.2.tar.xz";
-      sha256 = "1fagcrjjm7s0kpkfflkjx6rbgzprf7qidpbgwzw3jjf501vfdpkn";
-      name = "kde-l10n-pa-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt_BR-15.04.0.tar.xz";
+      sha256 = "0s6pc40ig83zjqbgqwhfkxzhp9wcrgac6hs5qhcxbs3awfmxi5hn";
+      name = "kde-l10n-pt_BR-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2iqdi982l5gbh3ajibgznzxg6ryjn49p-kde-l10n-hr-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mxmsybkjr2pr2xwfrxciwf6jjn2mp1vj-kde-l10n-kk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-hr-14.12.2.tar.xz";
-      sha256 = "11dabhhz676ria4nwvkx49igzm481fl9996j3p6rzd4kbhrksgq0";
-      name = "kde-l10n-hr-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-kk-15.04.0.tar.xz";
+      sha256 = "0czb1dmrdciim910bnazvsvi7lcvq27bj055f36w6y6l1zgvv8c3";
+      name = "kde-l10n-kk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rfkj26fa9pi0mraxd8mgnh758dhp0m7n-kde-l10n-bs-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cj9bhf10x4rcvcia97l9qhjnzll979ls-kde-l10n-fr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-bs-14.12.2.tar.xz";
-      sha256 = "1x4m0cksbiy25s8pynskmasy7kkzm8i8mp5dvsx3wsh0msf4pg1i";
-      name = "kde-l10n-bs-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fr-15.04.0.tar.xz";
+      sha256 = "0g94wik9q6c9w5x851k76qfk0fknv6ga497vwqka1h4yrmdmc1vl";
+      name = "kde-l10n-fr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sw87zcl7ddd68wlws5689h7r7g5bbcgl-kde-l10n-ga-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-he-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pyl52lwdrvfi3xpby5yyi93204jp3mjx-kde-l10n-he-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ga-14.12.2.tar.xz";
-      sha256 = "0ayambdzdfnky6bwnk5ghnch18y4ran6inrb8v4i1c407zn74ydx";
-      name = "kde-l10n-ga-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-he-15.04.0.tar.xz";
+      sha256 = "0hpnn6rci0bavl6hqs6v2ylz26sjyf5siwi2klfc3fsw6a04in43";
+      name = "kde-l10n-he-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/id89acc90qgfqjcidjfsx1sn62yk7c56-kde-l10n-zh_CN-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rn2hih1b8fdbjahg1va76kn7cdjq05g9-kde-l10n-nb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-zh_CN-14.12.2.tar.xz";
-      sha256 = "0876r1bp36w0iljrlhlnxfizapvw0h2qmpjnf5s7vf5iisrvsbrb";
-      name = "kde-l10n-zh_CN-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nb-15.04.0.tar.xz";
+      sha256 = "1mz3bcm92745zr6gn7q85p72l57sh19bcvvkpg40c63k34xpwpan";
+      name = "kde-l10n-nb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rki0855bdgqwi8ajwmnl9jdm1hgn18xs-kde-l10n-ru-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8mvkdlcf0azzq8y5g1r2bbq15z92b8df-kde-l10n-fa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ru-14.12.2.tar.xz";
-      sha256 = "0i2fb0fa1drg99m5k5d8sdv04g809c3dz507wlrb9bnmarapahhn";
-      name = "kde-l10n-ru-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-fa-15.04.0.tar.xz";
+      sha256 = "1jmwjlbnlciy4k9szqi7vjwjpx94faixjg2mmg42cjfx5as9ws5x";
+      name = "kde-l10n-fa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xhqd4bxhv3p1mwr4j7h59858dc782ycs-kde-l10n-gl-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/01ryc8gdgvjawaki8qaw5dpbyibvng63-kde-l10n-nl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-gl-14.12.2.tar.xz";
-      sha256 = "1mpzxlk93bf50ajk3m9ly19fdn34rnpznap6bad05zj9wczin9km";
-      name = "kde-l10n-gl-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nl-15.04.0.tar.xz";
+      sha256 = "0a3c7fkw0cczdd5733c7klfsffpi5ah1i6alqknm15y534bsigzc";
+      name = "kde-l10n-nl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8p2ygqhbbzxmnrjjxyris3281bdklbm9-kde-l10n-da-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g71kfpca8y88a0dmcrphban2vjvyr85m-kde-l10n-cs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-da-14.12.2.tar.xz";
-      sha256 = "1lqs9fpp1dj8r0mpnjy8m7aa9jg8iv30k7wdpxpcf634m2p06911";
-      name = "kde-l10n-da-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-cs-15.04.0.tar.xz";
+      sha256 = "1bl0w1qhk05xqniv1piik9gkj5nlcsb90bpxlvj0sd5ivcqxma53";
+      name = "kde-l10n-cs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gdrvx87d6y9q47alc0s2251dzm04wpdi-kde-l10n-sl-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/afq8qa9cr7yli1djasn7xs9fg781b3dd-kde-l10n-ko-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sl-14.12.2.tar.xz";
-      sha256 = "01yj9wh5zr72vgxman2j49ihhcyxr2yw820g2cz68bbqh829riiq";
-      name = "kde-l10n-sl-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ko-15.04.0.tar.xz";
+      sha256 = "181gzqhg6lc5z045l05zxz4zrc6hx36fmb91v62sfn2w70dc6jmd";
+      name = "kde-l10n-ko-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qcs4fdkjrkgva632nqyi1z24h517fvl7-kde-l10n-id-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-is-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0whvwp9h1lrnqcf68qihaq5mlz73lm5b-kde-l10n-is-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-id-14.12.2.tar.xz";
-      sha256 = "1cc1yfps29fakra3xfnnzf6blqsydx4r9scsd0w0f8xxk3mr87j7";
-      name = "kde-l10n-id-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-is-15.04.0.tar.xz";
+      sha256 = "050fdym6mlj1m1m594jglhjcxwk8dx4hc6p1428ldc19m4b9q06c";
+      name = "kde-l10n-is-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/klsqxbpagy7jj2ha51hqr7h9qpd4qg9s-kde-l10n-ja-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fd72fjmwlgy7znmi7gz71qzd6fb9w5k7-kde-l10n-zh_CN-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ja-14.12.2.tar.xz";
-      sha256 = "0i7x21yvj3ipg96jmfqs7kaixqa82f5s58mpi34vyypcc1ap4731";
-      name = "kde-l10n-ja-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_CN-15.04.0.tar.xz";
+      sha256 = "0klkxznhfc5sfrlnz80fqf06lzk8g411cz2v0wpd2wjafk1pyf56";
+      name = "kde-l10n-zh_CN-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lmg22mpi05l0944ihv9z72jg1i8xs2zc-kde-l10n-pt-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g1nxxpcihfcb0kwk0bm53acvv8b0yfgh-kde-l10n-hi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt-14.12.2.tar.xz";
-      sha256 = "123j4h4bhy0xdhazl18yccp17283k98s4f09f24r5b54yzw5cs0k";
-      name = "kde-l10n-pt-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hi-15.04.0.tar.xz";
+      sha256 = "12qgzwiy0igz7i352dwk5ipsxhia0spi74ibk70xr7irr9axgidr";
+      name = "kde-l10n-hi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pgw29ki339a22l9c7incm93qvmjhvwif-kde-l10n-mr-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/knj0hcr1dirq6rlhmw9dg1vl5ag52h6k-kde-l10n-ja-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-mr-14.12.2.tar.xz";
-      sha256 = "02z4hq74gxgvcnx0za74zlyx01m407bc3219wiqb88ly5b6g59af";
-      name = "kde-l10n-mr-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ja-15.04.0.tar.xz";
+      sha256 = "1b8741fzhimf3bch6mc9hzdj040y50gf7fgd7ja5n5ipi0ma2drf";
+      name = "kde-l10n-ja-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4p5v5j7l1j5xvz83jilwmmg22v5pl1y0-kde-l10n-he-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lg8jgickpm35z3mfypigxhngq4r93c2h-kde-l10n-mr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-he-14.12.2.tar.xz";
-      sha256 = "02lmsvdyw878hk55r5dqm065n3f1czgq0icspi25ibxgvhf0nmji";
-      name = "kde-l10n-he-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-mr-15.04.0.tar.xz";
+      sha256 = "0v2mcmrpqz31yix7z7kcjcfpwpghsifnvwmdf1k1lif0a9mq5qq1";
+      name = "kde-l10n-mr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pzpmizw0hsfczli3wk7mihsad2ziwnjy-kde-l10n-it-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yq2f4v4vfafxk8j1j1v97jbh39bklnag-kde-l10n-pl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-it-14.12.2.tar.xz";
-      sha256 = "09sfiv36q40sy9w3nqld89lgmpd8kba6xav683a28a1i0ipsjjbc";
-      name = "kde-l10n-it-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pl-15.04.0.tar.xz";
+      sha256 = "002nladxsgh9pamcaibsx7z7dcvcpbii9dyql8v3845wqjpgj8wk";
+      name = "kde-l10n-pl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/7gphdvwvll05pn6dn3wxydy66d4an0hc-kde-l10n-ia-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1i36fnf4018v9zc0awz7raqbv7269cay-kde-l10n-ug-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ia-14.12.2.tar.xz";
-      sha256 = "03jkjrbgp59xiwrbj9hp55y3qhpcyg1gxwv0vcbvxaxpg1zg7s1x";
-      name = "kde-l10n-ia-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ug-15.04.0.tar.xz";
+      sha256 = "094x3jnaby75q1j7q6c79y0sw63hsqqvw1qv0dzjgghky7qs584s";
+      name = "kde-l10n-ug-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6xryf5sf70rqzsp6zirfc85hbq8mq93q-kde-l10n-nn-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0svv0vq2dl7cm4wihdsp459m404jvimk-kde-l10n-pt-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-nn-14.12.2.tar.xz";
-      sha256 = "1wr73m10liqvd7fkq3gqh4y2ibwgm200cbk6dv58xr25jjh1ji2l";
-      name = "kde-l10n-nn-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pt-15.04.0.tar.xz";
+      sha256 = "177b455rgdrm021lvwlx6xgbnk3mh38l6080i2v52rzjm6bmchsy";
+      name = "kde-l10n-pt-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zjdd8bp4639ylb7wr2h0a6zl4ka4hv5j-kde-l10n-ro-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h1i1cg1qhsxfiffalx4j4bar3nbwjpjr-kde-l10n-gl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-ro-14.12.2.tar.xz";
-      sha256 = "0p4b7bngb3j2xsixk3s5wks7050famwbh00cgdpq8gd02i01iplc";
-      name = "kde-l10n-ro-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-gl-15.04.0.tar.xz";
+      sha256 = "0l27hrsd1pbk3w0lgz34zspmc6b4cs4y0p8i6y1sq51sd5p8qwd4";
+      name = "kde-l10n-gl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hm9hivcnjbbhxnr2k1p95lfa57y9qpa0-kde-l10n-is-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vsqwvz9r39nypa1hcxnn3figzyngpf6v-kde-l10n-ar-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-is-14.12.2.tar.xz";
-      sha256 = "1fz1azj7z127zpf257hzavsd0r3k7j1gd3wgw5i9prr3n0xp589j";
-      name = "kde-l10n-is-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ar-15.04.0.tar.xz";
+      sha256 = "04djbcdq3z4iysbvdiai2qd7wm9zx5fp400k3zsw36150g93ar7q";
+      name = "kde-l10n-ar-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hp26lgcf3jrgcqsrai43kvimlpq9gs48-kde-l10n-en_GB-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/sc5haa7ci8zwglc03s60bc5and8ydqgi-kde-l10n-uk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-en_GB-14.12.2.tar.xz";
-      sha256 = "1vmgrbx31683j47na433h2sps961h5av1rkqrmspdpls32g3hjq4";
-      name = "kde-l10n-en_GB-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-uk-15.04.0.tar.xz";
+      sha256 = "0n01ypzyqr8k30hakahpm68430bgr207yv5mbw2parzj3xbwzpbl";
+      name = "kde-l10n-uk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/y18jr4kswbh1qlhw83xyig9rri07yya3-kde-l10n-sv-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-el-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fn45av76smcp2bj01aphy1m49na74jlz-kde-l10n-el-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-sv-14.12.2.tar.xz";
-      sha256 = "1a702cyyhg5dk9bmfxmpsyj4h9lk2hrm8rcdzwy6lmhvclgc4iqj";
-      name = "kde-l10n-sv-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-el-15.04.0.tar.xz";
+      sha256 = "0xxfqc1hzf3nbvja8c6aq6axpwx64ifqz32nxw4171valjj1faqv";
+      name = "kde-l10n-el-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bcssbybfddwdy45n5sfr8aw2a6xxpn27-kde-l10n-pt_BR-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-eo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ijscp8qiliavdzda0k4vzgmfp30a065q-kde-l10n-eo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-pt_BR-14.12.2.tar.xz";
-      sha256 = "0lvjzcpv6j4i3xavkcbjbz17mxzj59rqiq9gxhvqnk6wihzwr3d1";
-      name = "kde-l10n-pt_BR-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eo-15.04.0.tar.xz";
+      sha256 = "12j9ggkgjbz229iwzpb19hjnl6zy2fvgkk68mh133ij3ik70i3bd";
+      name = "kde-l10n-eo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xszl4r8c43w086w15mf61lis5ar4ig24-kde-l10n-lv-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lm8d1vbsplg0r6z7ksir7z9nqjy7c0pj-kde-l10n-hr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-l10n/kde-l10n-lv-14.12.2.tar.xz";
-      sha256 = "1i8xd2apf8gr657w8jzc2vj4s7izh1kpqnz1n75yk2b8gbr0aiqq";
-      name = "kde-l10n-lv-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hr-15.04.0.tar.xz";
+      sha256 = "0a0p1bspv849zdja86rw7lvg60h6rgl1g5hc4zajmq9sviknsy3k";
+      name = "kde-l10n-hr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5bknljgh37bx5v4c0vnmigasa3xq3cka-ktimer-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bm9c9n9jln8aadmjmqhjqh67vd2d3126-kde-l10n-lt-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktimer-14.12.2.tar.xz";
-      sha256 = "15bar1j2var6i1jawq0nc4zkifl1qghciqyqavx39sm1cxphqirf";
-      name = "ktimer-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lt-15.04.0.tar.xz";
+      sha256 = "1l899bj9zw5db9wf6zhd6f9mpyynwagk907q8ws2xh6nlgrs9ydx";
+      name = "kde-l10n-lt-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xmalh942dl6rygwk4jxpirabx2l8n0j4-ksirk-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-de-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bp31anbdx5f3blgdnhl205vrqw9jgfx0-kde-l10n-de-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksirk-14.12.2.tar.xz";
-      sha256 = "0ab8vbk5640jaq6r0f0f5nidf0xx62lb140hq42flmid0hw6ls57";
-      name = "ksirk-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-de-15.04.0.tar.xz";
+      sha256 = "1hd0pz2n0l1hs5dy8426n53w8d0a4mys7m7wyihs0a7akf76cy4s";
+      name = "kde-l10n-de-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hl424krxwgahhhykhwhq2lxmrjdvfrxh-kdenetwork-strigi-analyzers-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0a57w09ilczqr5dwwz8x8qvgqq4wbzpj-kde-l10n-ia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-strigi-analyzers-14.12.2.tar.xz";
-      sha256 = "1802iy6w5wchj2lj6b7yp32nj4pbh1pn44v2pvhafg0nj49rn0iv";
-      name = "kdenetwork-strigi-analyzers-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ia-15.04.0.tar.xz";
+      sha256 = "03wir3y5hz3fnkqqv97bcjv4rc768f953y8dqsc362a61zidw70l";
+      name = "kde-l10n-ia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "cantor-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/sv2xx8whd4smmx447iaxg3akivyk74gs-cantor-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/whhz3930c4q5n50v7n9xbzc6l4xblf3m-kde-l10n-tr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/cantor-14.12.2.tar.xz";
-      sha256 = "0hcxr28083qadm7b6pjqh959dvj79dvymkigxv851ainvspr82km";
-      name = "cantor-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-tr-15.04.0.tar.xz";
+      sha256 = "0h1997x62ycisnfnbawjfqfwblh6fhqqscns79f7d7krxhfyq7cr";
+      name = "kde-l10n-tr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ka3asqxgpas752w1h3agc2c1ka3brp19-libkdeedu-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/22fjrzh19zha3ldbwkb7l64gnnq60i5h-kde-l10n-zh_TW-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdeedu-14.12.2.tar.xz";
-      sha256 = "0w7wkcr46fp3gidfgm4gp3q26vxp4szfbqmk4624ysrdi85aa6br";
-      name = "libkdeedu-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-zh_TW-15.04.0.tar.xz";
+      sha256 = "077pr968z7d8ldnv87vsfn9j13llx3qqw9gwc041c9av73vp4ccg";
+      name = "kde-l10n-zh_TW-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bomber-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dw2kr8sgmcrw2p3vy1cqdq2jk93i7rmr-bomber-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/16bpvmlzzw1cqjmrlvznd5751p1fsi18-kde-l10n-sr-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/bomber-14.12.2.tar.xz";
-      sha256 = "12ff8rikxb1x7j4b5jg41ph5pgp60vn133npzalq5vsldmrgj3h9";
-      name = "bomber-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sr-15.04.0.tar.xz";
+      sha256 = "0yicfyaj6zckk0x9skw9q3qnh0f0vz6pmahgh1pd5ayl3sqs8dhk";
+      name = "kde-l10n-sr-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kopete-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iifrjlqyrylq47kvmb7idgig4y05yp69-kopete-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zv04hsibpg539rzkg1g7h2nfm946pz8h-kde-l10n-lv-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kopete-14.12.2.tar.xz";
-      sha256 = "025pwhvcidszg4mv8hw8hya9xvgw08yvkzigxsk4pjn5vm49y16i";
-      name = "kopete-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-lv-15.04.0.tar.xz";
+      sha256 = "1r2fahydjybk5zparmn4wjciys5kjsjps2mkhlk1x5k9aa0wimjg";
+      name = "kde-l10n-lv-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/c1s7763fzbnnslcn95spcv0swp6gx3xb-oxygen-icons-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/04hs3q4dknk3b305zqibxskqnzm4f6r0-kde-l10n-hu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/oxygen-icons-14.12.2.tar.xz";
-      sha256 = "0dc0zkl7ivigcf5vf72gqnijm8p64bq4ibqkr02k8yv7yqq123wz";
-      name = "oxygen-icons-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-hu-15.04.0.tar.xz";
+      sha256 = "010d3x7l1kadp3wj2v9jg0bjd9d3xw2q3ql7i21705s2zi2any7k";
+      name = "kde-l10n-hu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ff917gin734l0i1w84xdq2s6hjkjjmwp-kmplot-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5n06i2kass6wqnl6ql28s1ryrbj2399y-kde-l10n-nds-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmplot-14.12.2.tar.xz";
-      sha256 = "1j7fnqi02pqwc0pgv0qgykm2hih5ncg7pbkwyskj5sds8xs86f55";
-      name = "kmplot-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-nds-15.04.0.tar.xz";
+      sha256 = "0asgj3dkbjgcabl4qrz3i8dv0i0348dg6q0fk1sgicm4257y0a7l";
+      name = "kde-l10n-nds-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jv7gpjyhacvmdvbdy5j34nrm06zk2aig-kmahjongg-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ai53nz76fbqj1adsl4lb0byvvcn8bg2v-kde-l10n-sl-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmahjongg-14.12.2.tar.xz";
-      sha256 = "0dc9majrsg2fgl8s8wqyhyjl3d40qf4m7wxx9m7076sa2h8hj4g9";
-      name = "kmahjongg-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sl-15.04.0.tar.xz";
+      sha256 = "0jm6b37irpp0jabad4jpqlvpw6ir5ygc0cs49138hb58kcjwi54v";
+      name = "kde-l10n-sl-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kolf-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/x3c14mkaxp4swyxaa7js7yq1rgrx7gvf-kolf-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p18pga44549fxqa0ksijc057dd5phbd6-kde-l10n-ro-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kolf-14.12.2.tar.xz";
-      sha256 = "1yiq1sw6a74s8pq7cs4rl8rvawcb3rrw2kbwdgcaqvq0krgnlc8h";
-      name = "kolf-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ro-15.04.0.tar.xz";
+      sha256 = "1lmjz5578b1xbgdgrrlgv6vyiara2n5595kd0pg70s1ixvd986as";
+      name = "kde-l10n-ro-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "bovo-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/habi2k9mvpz6l5lj2i2yfig6ghxrkf5g-bovo-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6grb8a1wydjjdkn2vkv2sj1dd8wp4317-kde-l10n-ca-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/bovo-14.12.2.tar.xz";
-      sha256 = "0z20lywx4x4pqdbqqhz0m84vzml6kxn53sl17z0lgnf74zh0vqam";
-      name = "bovo-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca-15.04.0.tar.xz";
+      sha256 = "16n29ja4d83g001js682ijibblhfwfb8pww561bcvda84qbvhham";
+      name = "kde-l10n-ca-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qjs07i14179wq2gj40gcj99q0i7fgsmr-audiocd-kio-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/izn9fzf1r2xyc57rj889rc6ziv9kjsiz-kde-l10n-ga-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/audiocd-kio-14.12.2.tar.xz";
-      sha256 = "1lix6yzradscrr79b4fj5lqs1f6wlrzyr0qwk5mvb9g326p8c4sr";
-      name = "audiocd-kio-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ga-15.04.0.tar.xz";
+      sha256 = "1n8prxqxxr8r76ry0jaszsn446y8vdk9b629ypj8s4d0byz336bq";
+      name = "kde-l10n-ga-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/byi9jaq7vijdfqzbqyyl8plk0mgb6cf2-kaccessible-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pbaf3bd49drbap8bx58pgz85xllqvjhh-kde-l10n-pa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kaccessible-14.12.2.tar.xz";
-      sha256 = "1xq40cl7pqm65k9h3yvhn7zjb80z3lpqyp823wm6nz6qld4hr4bg";
-      name = "kaccessible-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-pa-15.04.0.tar.xz";
+      sha256 = "18rqlh26qc4h7jbsa6jq27k5d1d5kwdbrd1slm8fcw67r6iw72ai";
+      name = "kde-l10n-pa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "konquest-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/47visnxvfz3h8wa0485wiq5659y5li8k-konquest-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-et-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/311y10ml4kxpkicjlja7k6wwm05yd75p-kde-l10n-et-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/konquest-14.12.2.tar.xz";
-      sha256 = "1h9ql9alyprh8ykfzfgj3nkch40hdp1vyfkshm5kaab15b657bgy";
-      name = "konquest-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-et-15.04.0.tar.xz";
+      sha256 = "0hkh800rx03w5gvy1lc7fn0s5kldihcaml5ryvx0g1qrj5k61b3r";
+      name = "kde-l10n-et-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ccx7yrjpgljpv0f61jlczmx738y7skpd-libkdegames-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lld8r34x3lclrb30p8w0qr6gw117h923-kde-l10n-wa-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdegames-14.12.2.tar.xz";
-      sha256 = "1pxq9gzw5m5i8d1v1d34mvmfr138hwfvq5z9pg2h9zw5y3hs9g7s";
-      name = "libkdegames-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-wa-15.04.0.tar.xz";
+      sha256 = "0mivzilb2f3fp5wn2vc6c3z20n0l4cdpckyk43fdb4h9sys02xs3";
+      name = "kde-l10n-wa-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "dragon-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/swpywmriiwy1npn7k3gcazisra9gfzqb-dragon-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ajsr93ly7db9pwjjbrkvr5r4n0cx03fx-kde-l10n-bs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/dragon-14.12.2.tar.xz";
-      sha256 = "0gd9zr9fj4r2789bi6f836y7m6df08p05vizdy04cf9s2hjkr9wy";
-      name = "dragon-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bs-15.04.0.tar.xz";
+      sha256 = "0zw2q22lm73k04c3nb0596xd3hknfhc7gq9i4n7kj55sblv0mqzz";
+      name = "kde-l10n-bs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "juk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nsrq6d9bini4804hkkzsny91rfxcgp01-juk-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-da-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/45bg2qd1nyjnnqi4yzpkkwcimlnr5fs5-kde-l10n-da-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/juk-14.12.2.tar.xz";
-      sha256 = "08brdx7hfm48hmhc0rg0r3c4brb3mkb0r23j2ps0y210pwarkwh0";
-      name = "juk-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-da-15.04.0.tar.xz";
+      sha256 = "1v07bazlq6420zkfy6m3jvwcyy2snz93967209204jnxkzf3ssk6";
+      name = "kde-l10n-da-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vjbvvbnqg3fjghc19159ikqm6yii6z30-cervisia-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-id-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ack1f3vdjkjbzpdsai22ki3lncc5v6s9-kde-l10n-id-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/cervisia-14.12.2.tar.xz";
-      sha256 = "120a8brfllk6jybn4zpyj0w5bpv2dvibcqbh37qh9ld2h6v9rrr2";
-      name = "cervisia-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-id-15.04.0.tar.xz";
+      sha256 = "10mr2d24akz5la2bz88y827dcv061sqrbi9awbiirgd2wqisnn8z";
+      name = "kde-l10n-id-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1nli1nsr1a3j7wprpjhwmmy418l6ibx4-kdesdk-kioslaves-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gcnmv26q44ya6jb2xwhm4kvp8aqr059l-kde-l10n-sk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-kioslaves-14.12.2.tar.xz";
-      sha256 = "14vk4aqdwny4iidsvznfzss51k1376lp4v65bmqbpwf2kg6mis2s";
-      name = "kdesdk-kioslaves-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sk-15.04.0.tar.xz";
+      sha256 = "13v871ahfj3bwaj0ha6fm6gpn7x9qw9m5dz89mfg3h5vskqv7akl";
+      name = "kde-l10n-sk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/cr9ncrb5lfgi7nyrdqlrh2c3xlj2a5rp-kdelibs-4.14.5.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/v7ln63jsr0v32l86rqyg6fpinzpjpns0-kde-l10n-bg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdelibs-4.14.5.tar.xz";
-      sha256 = "1jizh61vz83za06mb23hhakx99jf2c59c02fz5kld9mnxzzl5fgm";
-      name = "kdelibs-4.14.5.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-bg-15.04.0.tar.xz";
+      sha256 = "1p4y9rbxwwnghslwjk1m32a26h6pnssyj73ns1az3saqyfb85gkw";
+      name = "kde-l10n-bg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9vi7j77n4x5qpl4jphl3cc52cc34wymq-kmousetool-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vaih1nkjz81vm6vgfy25iqd8dxrivsqc-kde-l10n-ca_valencia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmousetool-14.12.2.tar.xz";
-      sha256 = "06ifiay1mxcfb0bzzcf14xkvd4iwy9va37x3jm0xxhy9641cxq7i";
-      name = "kmousetool-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ca@valencia-15.04.0.tar.xz";
+      sha256 = "0ij9xp47mv63hgdbri7cmvld3zgg0sfgip0gg7iqinzkj1cifj9f";
+      name = "kde-l10n-ca_valencia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4v4hcxa9v1hykiypb159p0618nf0dij9-kalgebra-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rkbbjy12la1p7l7vm5xk4hwy72f4piys-kde-l10n-eu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kalgebra-14.12.2.tar.xz";
-      sha256 = "10iz0vjn8mscgkb0vra8ac0rbdyw45xzz5rydlkczr9w3hxnccyy";
-      name = "kalgebra-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-eu-15.04.0.tar.xz";
+      sha256 = "129k6m59x8f63f393jxx61s67f9gmaab9ilaqy2978d64l3z0bpv";
+      name = "kde-l10n-eu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "granatier-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ilynhcqbrfbhafhvmbag1j7nrkiicszs-granatier-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fzwxz4747hfpjisg7n5kc77gb92dm3c8-kde-l10n-en_GB-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/granatier-14.12.2.tar.xz";
-      sha256 = "16v0pyjby6yyrqm64p4a0lkxf0bb50smkz680b1yp3mcc5nm22mw";
-      name = "granatier-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-en_GB-15.04.0.tar.xz";
+      sha256 = "16c255j3klss711iqk41k1kcf5nn0lwg0qr74c1abvgrnpsm261h";
+      name = "kde-l10n-en_GB-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klines-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/64fb2pidpaccqzk5wddvvxma515fk6nl-klines-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/49fv8h0b5lzf4cm5qc6baj9sk9k29pnz-kde-l10n-sv-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klines-14.12.2.tar.xz";
-      sha256 = "10km97mbz9z816ki12jki46mb0h2829l24spiai9pk8mbvkyqx3w";
-      name = "klines-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-sv-15.04.0.tar.xz";
+      sha256 = "17z9yvw9mrjb7h3qa4zc18f5z2n6b0gr4y76s7jfnh8kpjgm1sgr";
+      name = "kde-l10n-sv-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmines-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1g8n4bq8p2dn5mvncb6a046kjmndgfpy-kmines-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/30j0lkfk4p7pwv4nyknvm1wbd93cfji7-kde-l10n-ru-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmines-14.12.2.tar.xz";
-      sha256 = "04axmsgq3wcim5fs9jgwgbb9z7p0a96qxhm50s5dwk4lv6fhzzv9";
-      name = "kmines-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-l10n/kde-l10n-ru-15.04.0.tar.xz";
+      sha256 = "18l7wnfr1indy8im131lxd45da9x49ii1iavi8g1lzmqq0av097z";
+      name = "kde-l10n-ru-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/l32ji88v0j54mhvsqdg7ysqqalnwjx4p-superkaramba-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kcalc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4qsl43z86wq82bpspki2y4gfn8iy6xag-kcalc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/superkaramba-14.12.2.tar.xz";
-      sha256 = "0y3ld6hpbjjqkpmrpbxmznv5vjdiyh3rw6dqbygap33qvw6b3d0d";
-      name = "superkaramba-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kcalc-15.04.0.tar.xz";
+      sha256 = "0rkvxbz9s5wqa054bf1xg3rza95plvnakydlny04iw5w8i33i5yc";
+      name = "kcalc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/67i12gxqd5p15vdl8b5a87xl28fn9aqv-kdiamond-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkexiv2-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dnl3qi3ldzmf1yl7m8yzlgxyzvj6bm4k-libkexiv2-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdiamond-14.12.2.tar.xz";
-      sha256 = "0g3al1p68q4ypdjrnq6sf738w84x3a2l71fpg7qb5kgpaixpspjj";
-      name = "kdiamond-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkexiv2-15.04.0.tar.xz";
+      sha256 = "0zv8yjgwfdvkl2ss2gyv6bqbc3qgnz3hryhcjdyfa56kys6xz7n3";
+      name = "libkexiv2-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kigo-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/inss9axxxz7szp7icfwsrms9jyc4c855-kigo-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kigo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yvj9sxfh55nvnlvcz4b12iqqgnd3p33y-kigo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kigo-14.12.2.tar.xz";
-      sha256 = "09b5hdfh46mi5qpgq0j02qw2wfrsach6lw9ydg0ybplyfvmp27l5";
-      name = "kigo-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kigo-15.04.0.tar.xz";
+      sha256 = "00ggvrs3mm5f2q6zkdsxbrhw8vgb0h4p4dk3v0agf3q4bqr86akr";
+      name = "kigo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5dh19ycmzai2k5xwgiwmpi05nn60k089-kdenetwork-filesharing-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kopete-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9yn7mj3csimgx1r4q6bp9gknh5bqnw49-kopete-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdenetwork-filesharing-14.12.2.tar.xz";
-      sha256 = "08parv67kilxh2nzgbmj3q9g6pzncjjr23rl6ylh3vv8p2vr2v5h";
-      name = "kdenetwork-filesharing-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kopete-15.04.0.tar.xz";
+      sha256 = "01wl7n535j9l21zbzjhix33rhr0i4rg2bb25zxwk6sc2ahbsqcp7";
+      name = "kopete-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/px8xd5vjs7y6g7h4vyyiksn818waffy0-kajongg-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccounts-integration-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qpc0c00mhc367aivilvkp329a4g6iqj4-kaccounts-integration-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kajongg-14.12.2.tar.xz";
-      sha256 = "1863hczxmzrwvkv2y7kj2anf56fpwih70plsa25mkmli6l5x120q";
-      name = "kajongg-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kaccounts-integration-15.04.0.tar.xz";
+      sha256 = "1g2rn256wfl78ajxircaikq3hpj5nxfnk0294wz10srmg5a4hgji";
+      name = "kaccounts-integration-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/670zy2wyah5qw0rp7kmzdv9q3hl2cl25-kdepimlibs-4.14.5.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdeedu-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/wyk34ah7lc3vvrcq4ldik6brm2jk9fiv-libkdeedu-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepimlibs-4.14.5.tar.xz";
-      sha256 = "12p03dljr6sldl4pxww4gb18mrvdi61r85ippmljknr4sq26kd8m";
-      name = "kdepimlibs-4.14.5.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkdeedu-15.04.0.tar.xz";
+      sha256 = "140ri9whmvxjlj2i0bdpyr07zwspyl5d1bh91vm8hv2zdgmxh1rl";
+      name = "libkdeedu-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nqwz22sa222dkr9a6mmgyc2k9xahbv8h-ksystemlog-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "superkaramba-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1ck2s3vi0dksdlis3cghy8advap8y5a3-superkaramba-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksystemlog-14.12.2.tar.xz";
-      sha256 = "1j22944ham5x3y8qf7gka81nnq66f81lwrc65zmzvbf7vyj813kq";
-      name = "ksystemlog-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/superkaramba-15.04.0.tar.xz";
+      sha256 = "05j93sa39m78vlxdy4haqj5913dyi6kab5sspi8ky0why17zmaav";
+      name = "superkaramba-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aw9ahw1ywy5m8k8j0a2l5qfg0n2n2yn6-kturtle-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "klines-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1zsl1wawlhzgyr53hfrn5dzqwii51ib8-klines-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kturtle-14.12.2.tar.xz";
-      sha256 = "087wfff2qpl2shxjwj30lna480skx8j1z4rlvkbyywc645gd0afb";
-      name = "kturtle-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/klines-15.04.0.tar.xz";
+      sha256 = "0c0saaybxjshwap5rydc0606xkwmzl696r41fhkvr26c077p09p4";
+      name = "klines-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kppp-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6w3pnklzw2kd761dfg3ya4k0xawnyp27-kppp-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "cervisia-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qmkqp9sgai9djwishibis5qckhl9dnrf-cervisia-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kppp-14.12.2.tar.xz";
-      sha256 = "1hdywnsvpybfc5hcja2msfdim9g37pgggkjp4kkahc9gv62z1m0i";
-      name = "kppp-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/cervisia-15.04.0.tar.xz";
+      sha256 = "097hayf2k2fv3d90jnhlh4iq4qvk3v0qg7ywchgipzsz0w6nayki";
+      name = "cervisia-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bbi9jdxjb1hm2cd6flh08h7ql90m9ppw-kde-base-artwork-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ark-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nms2hq3a33k03lmhh8y7swiggglcysxv-ark-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-base-artwork-14.12.2.tar.xz";
-      sha256 = "16jg0pm6wqqsl5g8hf55iacgxjh5x92shmf9263xpc1fiq29770c";
-      name = "kde-base-artwork-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ark-15.04.0.tar.xz";
+      sha256 = "09jcz7x5rjazz8xvxy3kx32v21ig736m5gxyxhl48inxaypxxd21";
+      name = "ark-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/iq6qjaw0n37gq49r4lmkjzyasvghcss5-artikulate-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "palapeli-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zsh3ssjxmxggzf54kw9f73kzpy7y3n9d-palapeli-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/artikulate-14.12.2.tar.xz";
-      sha256 = "09jvjal3r6bl77aby1wzbpyr4rxqmghc759yrg1rbqca1filzd5w";
-      name = "artikulate-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/palapeli-15.04.0.tar.xz";
+      sha256 = "1iql188gysjnhym1mj9h2cizydgd97pal37zkxljc9qhqb58wq3d";
+      name = "palapeli-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dawjc253wxbw6624zjr0v2yrq9i47v75-libkdcraw-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ksnakeduel-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9qg39s2sb7r8sdy37hm185jn7dsv24q1-ksnakeduel-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkdcraw-14.12.2.tar.xz";
-      sha256 = "0xj3dhyz7mf65dqiw2zz6mp3xmfaczmr7axhy0h6z1ynbyl1vkcm";
-      name = "libkdcraw-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ksnakeduel-15.04.0.tar.xz";
+      sha256 = "1i32mrc50isz0q0gzfkd0fz8in2hhc8d61q55dprq3ps28lgd77n";
+      name = "ksnakeduel-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zb2sqh3qjd53nmqhs9m24kag1f3dxiah-kdeartwork-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kollision-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qxc07ckfn60wcyb8cs75dy2d8gbj211z-kollision-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdeartwork-14.12.2.tar.xz";
-      sha256 = "1svw3ah03g751iy37i06kw4d6jzgc8yy9cjayf3xp80m37fpjlws";
-      name = "kdeartwork-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kollision-15.04.0.tar.xz";
+      sha256 = "0ch3h3g0hgm52l13v6wdrvacabwkvzx537bhfib05prb9604vkn8";
+      name = "kollision-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klickety-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dmi1azffqm3c8gjk1d300a0a2jps2j4v-klickety-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kamera-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6l8pgg55qph99rmprrgz56vvv621zbjk-kamera-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klickety-14.12.2.tar.xz";
-      sha256 = "0rlp4bgzg7i892a89zrgaj0m1zwbb2g8ap9np3dpqljaf2la9rg3";
-      name = "klickety-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kamera-15.04.0.tar.xz";
+      sha256 = "1mjpbcslba9wnxrvm4xg6kfy11msn7kvxln98ak55gvpfh7zhm5r";
+      name = "kamera-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/f5ycj631mpfnyb8mngzxmvgngyk6lsw8-kspaceduel-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "klickety-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/iwlkabdklb3v1md6vdsjw8x09vv0kzzv-klickety-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kspaceduel-14.12.2.tar.xz";
-      sha256 = "175n2jbx9m3yhsp10bj1fk9d2vfv2dlqd1qw7l3kmca5nr7ripzb";
-      name = "kspaceduel-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/klickety-15.04.0.tar.xz";
+      sha256 = "0l8vk4gkfjs71xfzw9lg18g9xg4yf4l9jy1f9plikw9gfm7br90p";
+      name = "klickety-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/49b5c3cm0ysi2w89a161ysmirpmckcls-kate-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kolourpaint-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h5x9pzbiq62jgwfln5gx6agzcfyz2j3s-kolourpaint-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kate-14.12.2.tar.xz";
-      sha256 = "0n6b5jcyb428gx9xflsqjs1jhk51n12yxyfzl6cvg29vai453fff";
-      name = "kate-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kolourpaint-15.04.0.tar.xz";
+      sha256 = "00vyblqgp7hqigid6xgj31b8jkqb8jlsvnbd2ci4zg7s778l10sz";
+      name = "kolourpaint-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ddc07v0j09547gnspl7c7fgcrbvv0fk0-kgpg-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-base-artwork-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zdqama1r97132n4ks422yzr4zhh6fjmq-kde-base-artwork-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgpg-14.12.2.tar.xz";
-      sha256 = "1ihxkcx162jp4b2qgpwa65iq90n1bz21l6fli1z530247h7vzlbw";
-      name = "kgpg-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-base-artwork-15.04.0.tar.xz";
+      sha256 = "1r3w4ab9vls7wyzy6g7ashnnixxid894ghqc5yzhpn4x999y65lp";
+      name = "kde-base-artwork-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "khangman-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jvxwahcgixjygdvvyiprgwhi1c70cb5k-khangman-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "gwenview-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3wkajcx7p2wdzldbjb94brqlfqhdn54k-gwenview-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/khangman-14.12.2.tar.xz";
-      sha256 = "0piyyqvfawgk3mbm51saigaswcpbk86my5v8mvha220sgzamnj9l";
-      name = "khangman-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/gwenview-15.04.0.tar.xz";
+      sha256 = "0h8ndywh8w9wx0zisl1b9681d7zqx2d3ki40zxdgk4clyl34aijb";
+      name = "gwenview-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/whd0iampjk6i5fm234gcsly38sxh5nb6-kgoldrunner-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lgapni2v7qsl3wsi8wx0vwcav9almhs8-ktp-desktop-applets-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgoldrunner-14.12.2.tar.xz";
-      sha256 = "1ijykdnfslp2vp3y0ji0bbf9zj83rbcywvg0kgiza963vzhf7rcw";
-      name = "kgoldrunner-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-desktop-applets-15.04.0.tar.xz";
+      sha256 = "1byv8dk864vwl4s5c18xjh3ckdzr9d7gq1mjrlaslxang7fr97cx";
+      name = "ktp-desktop-applets-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bvj41rw9x0014q6k67d2f6w8xqwpf9zi-kdesdk-thumbnailers-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lqdl7ks619gxdhnaa9q0axni4pz3h5v5-kdesdk-kioslaves-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdesdk-thumbnailers-14.12.2.tar.xz";
-      sha256 = "1jyn507y7h2j8cb6nblc2lcf16ld9rn9cvi4xhj4sq9ccz0w7vz1";
-      name = "kdesdk-thumbnailers-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-kioslaves-15.04.0.tar.xz";
+      sha256 = "116xj9i3iwzbz41n3bka6xg0yq88iwzw066dy5dbs3yxbpmky19g";
+      name = "kdesdk-kioslaves-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "amor-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kpv805bhwfkn95rnp8hzl42c26h8678l-amor-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dymdah33hpq9qn07qcz402ijmwc67bvd-kdenetwork-strigi-analyzers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/amor-14.12.2.tar.xz";
-      sha256 = "0wqh3csi0isfj3zpmsay5p38sbajfbrhkv6lms5nqr4k81kcpq55";
-      name = "amor-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdenetwork-strigi-analyzers-15.04.0.tar.xz";
+      sha256 = "1zsa3ky6plfksm8k8hgd93d0awrsi5gqz3qbqfbzj3a2qic7nim6";
+      name = "kdenetwork-strigi-analyzers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktux-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jfkymr2flr7p986z1larn1i2qndrij8i-ktux-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kmix-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ql4a0i42ij33kd9y7qg4ng1a0p5j2sqs-kmix-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktux-14.12.2.tar.xz";
-      sha256 = "1pml908z08y0ik4d0rncavrg26lqvchza113kxmyxc7ak95bwypd";
-      name = "ktux-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kmix-15.04.0.tar.xz";
+      sha256 = "0yj0byy98243c83bw938i1x8yxgbib8vr2s831hpmqi8h3v7xvyg";
+      name = "kmix-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "rocs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vn70b248ilfjrxv9sz30c4m1czb5n6fl-rocs-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktuberling-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7cp8mnviqns6ij94xxz3mpizdc1avln9-ktuberling-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/rocs-14.12.2.tar.xz";
-      sha256 = "1nb0xq051081wps0i3g6p6vawj89vaa27di1hi2nhm1y0hx95m1j";
-      name = "rocs-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktuberling-15.04.0.tar.xz";
+      sha256 = "1kqz1g0r3icgx3brd8qlln29mxcx9b54kvl8wdar04r8ckk0m733";
+      name = "ktuberling-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fxn7qcaa57vxyc2qfnxycfv8hpvqn190-kcachegrind-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kturtle-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0a3rrj74sfwhqwjql88gqzw8qbmf8llr-kturtle-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcachegrind-14.12.2.tar.xz";
-      sha256 = "17v1ap9jfzlk30xhx9m5456bqky4m0iywvq34r8zpwkbg4a49la9";
-      name = "kcachegrind-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kturtle-15.04.0.tar.xz";
+      sha256 = "00r3lzqa0sazccy28kmackqgqwcyqsl3mzjs7vpg4i76f0agfx4h";
+      name = "kturtle-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bishs7m7snrvyrvcxhly4p4d148rmfxy-ktouch-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-dev-utils-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gszm27h7rghsvkvhyf15xnp5bgjj18in-kde-dev-utils-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktouch-14.12.2.tar.xz";
-      sha256 = "1c7mi9cs17z72hg9v44yki85lqsnl96vgrckz5qcvca2b4w3bjd3";
-      name = "ktouch-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-dev-utils-15.04.0.tar.xz";
+      sha256 = "1vvrrb4c94apc67fg3gpzgfmhylx6m7xfyq0y5kjxk8l91fl2bdi";
+      name = "kde-dev-utils-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3l7a1yydrkd824xfjsxla8swzcv7r8rx-svgpart-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktux-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cd126p5pizh2ha1jadg82csdzazlln49-ktux-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/svgpart-14.12.2.tar.xz";
-      sha256 = "1zkc6p8ycpm4pa2p9yq4ajkcnqi8m3mmv8ghdgi2q3a58fvf2zz5";
-      name = "svgpart-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktux-15.04.0.tar.xz";
+      sha256 = "1j5h65vdigym6ldz7fpn2kidxphfl02l4afg0jmj55wrym1vvc0r";
+      name = "ktux-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xwq02smnzwz54i165vpgm8aaamcy02xp-kmouth-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "mplayerthumbs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/xbdr5s1xf4f58lpshppamii1j5rl5ll8-mplayerthumbs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kmouth-14.12.2.tar.xz";
-      sha256 = "0qmh1kpl1asy5av976461i9fp81qan00jbqvfhi5dnli9zfrfmb9";
-      name = "kmouth-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/mplayerthumbs-15.04.0.tar.xz";
+      sha256 = "12d60nkmfp16pgrfh5brl80n1y7crmdzk5k3ad313l4ani99z45r";
+      name = "mplayerthumbs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vv15hxdzvvgj3xhw5pig0kbzm3206j72-kdegraphics-strigi-analyzer-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kblackbox-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/72rhcbzax6ahi3myznpi1fkh0x9cq6ay-kblackbox-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-strigi-analyzer-14.12.2.tar.xz";
-      sha256 = "1acfdcg0h9kb6171lqqrnihvgynrp0har6frq0igpkz475crmkid";
-      name = "kdegraphics-strigi-analyzer-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kblackbox-15.04.0.tar.xz";
+      sha256 = "1w55nzadmkgspngxwazm6nfdf3s72rw4l0absx1jhinln7mif8w8";
+      name = "kblackbox-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kruler-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g13aw9ppjbwj5rcyy46ccp9yw81bxa2d-kruler-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktouch-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0p1m96gmy2rw5pyy029j4257b32ziyvx-ktouch-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kruler-14.12.2.tar.xz";
-      sha256 = "08rwsmjbbaapgn98avagn8i3qmvw5fzq84snxy4a74dzf14aph5z";
-      name = "kruler-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktouch-15.04.0.tar.xz";
+      sha256 = "16gd6rghz1caw88yh32728kcxj79688g4hw3dkmgkayb5wcwnwl0";
+      name = "ktouch-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kollision-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lzky584al80dy5xrwvax7xs974p5s5xq-kollision-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "dragon-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ha0s2dfbqb6gjgwq5451gbcgq6h3q16r-dragon-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kollision-14.12.2.tar.xz";
-      sha256 = "0v6hq3biiybrdd4lblzcadh5kpy21kjlkb5iqga95h7xxm6vd4dq";
-      name = "kollision-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/dragon-15.04.0.tar.xz";
+      sha256 = "0rzyra1xqjyrnx7926dql2fw9avy7rwx9x86v894xppcjqsyr3jx";
+      name = "dragon-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g6zkyj2i5s910qb9snnabr4ivklvgajn-libkcompactdisc-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "katomic-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dzv478dhlwj11gpfd0k7npmyw8z09yfw-katomic-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkcompactdisc-14.12.2.tar.xz";
-      sha256 = "0xi1yrls8nsq9flll9250yfqx076p0xdxrywpiivx3yv64znjz7h";
-      name = "libkcompactdisc-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/katomic-15.04.0.tar.xz";
+      sha256 = "0vbcv973ppijip8l1y2kkj93rjxbcj3xw6pypw50w3pg168s1ylv";
+      name = "katomic-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/fcm4sghdd7dl98zagm7xfg7lfcbhpi6p-kcharselect-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kmousetool-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8ws0s6acsrrq7x0lvy61vy4sqhndbakm-kmousetool-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcharselect-14.12.2.tar.xz";
-      sha256 = "0fsmh3wsiz49wgc2l1p8caclhx03mmf4q7v7l72yf59c3pczh74c";
-      name = "kcharselect-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kmousetool-15.04.0.tar.xz";
+      sha256 = "005y7jp52f4x9193dxql8wwmimbylkazl671di2gfvrmcrh164n6";
+      name = "kmousetool-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/r7gzmhlg6wlbhhxyx11n88pnd3qs1nbg-umbrello-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "rocs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/palrbcvrwp2vxf67myadgcvr5wl8v3pq-rocs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/umbrello-14.12.2.tar.xz";
-      sha256 = "1p9sdwalzi5j59xplzzd96m8dsvzc1r1isbljgj55h8pc3sn1am2";
-      name = "umbrello-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/rocs-15.04.0.tar.xz";
+      sha256 = "03ibi17331vcjzfc38agalbybn7k06favm0sgcyg68qribpcwmg1";
+      name = "rocs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kapman-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1dqlriz6zxb6ss4gq2ccswn6swzxk1fp-kapman-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-wallpapers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/b7716r5kxhznfdlp9cwp3vf2vhsv1r1c-kde-wallpapers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kapman-14.12.2.tar.xz";
-      sha256 = "00qdq5fabm6pljclchiqi0wa3cxdfxbiqs5vw86190ki23qgqfkw";
-      name = "kapman-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-wallpapers-15.04.0.tar.xz";
+      sha256 = "0ckvbsdim0485h4f9sz1z0qgbb61n8l7ncwr80zm7vpnx46xzavm";
+      name = "kde-wallpapers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "marble-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hwhbjrqg3qycpsq6kxd17fmmic1iv1ls-marble-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdiamond-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p1f9xs4wkbdi9cmry7wc5686dxy2fvsg-kdiamond-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/marble-14.12.2.tar.xz";
-      sha256 = "04khv00h3w0i6igp8b4zh0xyyl7a3aqhbszj2qlpydghr1ghz2js";
-      name = "marble-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdiamond-15.04.0.tar.xz";
+      sha256 = "01ri6nj217dmg2xgm4ra4gdsabk28c8bkw6z69x5smbczjshdcr4";
+      name = "kdiamond-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/b17whbxz6q409ghxcxaia83v95adkdrg-knavalbattle-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkipi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jckns8avmk0k34k62f77bdrl9cbf01nr-libkipi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/knavalbattle-14.12.2.tar.xz";
-      sha256 = "07a9z0s12v2f5irs3d93pqjsrwv4zs7sckgvsbgaklbxwar1p26n";
-      name = "knavalbattle-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkipi-15.04.0.tar.xz";
+      sha256 = "0c90y8f70k83pxxfx6mk6ar6zw7lf2l7mib526x8s7j534ya57ad";
+      name = "libkipi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "klettres-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/krcpms45cvn7dnv22rp9bdri7v76bcvd-klettres-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdewebdev-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/wlx7pxcwlq5f0w2hrlms5gfxfixzfzbc-kdewebdev-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/klettres-14.12.2.tar.xz";
-      sha256 = "0ca23y3d2s2m4mzqvw3jknsns0da3gzhqa7g4hicl35v4cbi8w7z";
-      name = "klettres-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdewebdev-15.04.0.tar.xz";
+      sha256 = "17gizsgvw5ihibsf8z2rmczzkqp1gp5jbyvvsairgzv1izryi6ah";
+      name = "kdewebdev-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/b247bpgxvgl1msrrfah432n99hi6h4h2-libkipi-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kaccounts-providers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3vyd044k6qmjnxc7sfig6q90g2dr58lf-kaccounts-providers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkipi-14.12.2.tar.xz";
-      sha256 = "0dp3n4awc4glwlnygq8k6119hxl2lq0l66a8a2m84bhgf1xqn05j";
-      name = "libkipi-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kaccounts-providers-15.04.0.tar.xz";
+      sha256 = "1b5cp6winxa9slqaq6mrf4y4py1d7ps55088gs35qcwrzyna04l7";
+      name = "kaccounts-providers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "step-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/djjlbx20jk6pv82jrk626k183hkn65qx-step-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "marble-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7kh58mg7dnd0yr6nksbfki20rncdqm1w-marble-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/step-14.12.2.tar.xz";
-      sha256 = "1r11csc1hlkrydrznprdvq5sxnmhlpb1v08ns96bs27nxbz29zw4";
-      name = "step-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/marble-15.04.0.tar.xz";
+      sha256 = "0d6i7wwf220790ld5qgd30gph9y71a75ybjjfg81k13a4jg0ndk4";
+      name = "marble-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kompare-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/n3w571knhskpnv263dv67vncy1h4613i-kompare-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkcompactdisc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rrdyv611nn7kbnkr1fnvn6xkd01k8zwb-libkcompactdisc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kompare-14.12.2.tar.xz";
-      sha256 = "0ma1kwn7psrffs2fn80did8gmv3cr527lb40n1jrvksq15fcfl5k";
-      name = "kompare-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkcompactdisc-15.04.0.tar.xz";
+      sha256 = "0nisrgpcgf4r83q7p82b8xfpzq96qjk8362i6dalsb0jcakia4c2";
+      name = "libkcompactdisc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "krdc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/r4q34i2lsi4dcpqvpqzc8c628l99nrh1-krdc-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/fjrkx2vwb6m4kfl01sa4r23wbvmsmh05-kdepim-runtime-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/krdc-14.12.2.tar.xz";
-      sha256 = "069gp9ahq78pl2ax77c4k0sfvb3g70gl9ph8ariarhh3f5lvzh25";
-      name = "krdc-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdepim-runtime-4.14.7.tar.xz";
+      sha256 = "0ywg703sqidxif853gfmqriymkkp9xzkfxd863p1sw35n1zhfkam";
+      name = "kdepim-runtime-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/0wq7q4n2xxkw0vn49ajjv07b9yc316b8-kbounce-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "oxygen-icons-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/akq8y3wjkvbzwyzwxyd1vkmqygmc78p4-oxygen-icons-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbounce-14.12.2.tar.xz";
-      sha256 = "1iw6gwy01ri7kqc5qkk296rzbz3j1swhshxkv05vqpv69vwnfxpp";
-      name = "kbounce-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/oxygen-icons-15.04.0.tar.xz";
+      sha256 = "1ysy82war9n1dm5nwj69aasz9abp2zf5dmw92gv8brzyrn8svn9d";
+      name = "oxygen-icons-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kbkrcfralyq2hal04r5qbsc9cw40yf2d-kolourpaint-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kpat-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/af38swaxzd4yavh6iaxq3ha8xn3q9gmf-kpat-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kolourpaint-14.12.2.tar.xz";
-      sha256 = "1r0xs4pisaqg53nc6zgn7bh95346wsb9756d9lq6zgp8jf2lcs4h";
-      name = "kolourpaint-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kpat-15.04.0.tar.xz";
+      sha256 = "076jrjrs97353pw39gbanjf5s8l4cj8g2zapngyc1kwm6q0jry5w";
+      name = "kpat-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kiten-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nb1lzzscqr6g5m770aw8zjqxmng6c23s-kiten-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "juk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bbvywnmrg713gdmzxkndkcyjs7jmdazj-juk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kiten-14.12.2.tar.xz";
-      sha256 = "1y1anhvdmcflkmhya24my80c2hfpnhw8w1b2mqqr4xyjbl0plaqs";
-      name = "kiten-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/juk-15.04.0.tar.xz";
+      sha256 = "160n9wpx0krf1nlpa3hbj0b1yblgq68mw3c9is2j41k0p2b7divi";
+      name = "juk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/la8lyk56j0crfjfj1h9yjxgws3f9shbl-libkomparediff2-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kspaceduel-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zx8jk8s9mrfga1467a42hfdz0w144p66-kspaceduel-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkomparediff2-14.12.2.tar.xz";
-      sha256 = "122078hvi34zg183r8i2ni37xi00bzv7nr5251lhgh0fd45d565i";
-      name = "libkomparediff2-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kspaceduel-15.04.0.tar.xz";
+      sha256 = "0drb3628l47qp35h8vyz66ma6ph5v9sg2k9dp0fghrhwp1x983fv";
+      name = "kspaceduel-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kscd-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/h9n5pglbgwqxiwdpxf0zrkyfcnqvjgyh-kscd-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "picmi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/rrqb0hx0kb96y9x2j65vbyq12pk4m875-picmi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kscd-14.12.2.tar.xz";
-      sha256 = "055fdr9l79xjcrl33sxmk82dsbchjjwgmd75dw0sbhwfxs99dvif";
-      name = "kscd-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/picmi-15.04.0.tar.xz";
+      sha256 = "0abas2qx83a35dghrr5gbsvgc0lg0vk0br18nizi82sbiawls24w";
+      name = "picmi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ah46p15xxk89lrydhxzvyl83q3jjs5mr-kde-dev-scripts-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "artikulate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/a4vr2g2m7hr6svmbdkg89na3zvsh4fg5-artikulate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-scripts-14.12.2.tar.xz";
-      sha256 = "1fclm5wvz58565fx366sia4cjqrb2cr843skw4jpzhh4wb1v9v8i";
-      name = "kde-dev-scripts-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/artikulate-15.04.0.tar.xz";
+      sha256 = "1ghffybaq2p9jx7cppbji8jk0dbblw3mh3czfzfms92ahy9xzcbz";
+      name = "artikulate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ark-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/v5cdrabvrfx1dvjibhzj6a1m200p53ks-ark-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeartwork-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3yyj9dcqj7b2zjrz5w7j20h0pv10gnid-kdeartwork-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ark-14.12.2.tar.xz";
-      sha256 = "1aj7dshigv25qki93drpfwgzdycvvh3kl52a0im7g2k6aj1yjg6b";
-      name = "ark-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdeartwork-15.04.0.tar.xz";
+      sha256 = "0kwscj036gjvai5knw1jpxjacllza4y8wnlv24lp19f2s61jqq24";
+      name = "kdeartwork-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kamera-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jgnxszypng4x7wlhz0rg8390bkh87lgf-kamera-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ksquares-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ayr2hry1z8z3v8q8a4iamck9bsxy1pdw-ksquares-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kamera-14.12.2.tar.xz";
-      sha256 = "16zjdx7b1nqh0nfbz0qplvqhl2jnl6l0jc3lfxifiqxsbzr9wlrr";
-      name = "kamera-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ksquares-15.04.0.tar.xz";
+      sha256 = "15a605pc7jfsrsj1jj3lqy42z1bnw4pppx0hv51xlhiza00s2kww";
+      name = "ksquares-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mfrl2pk66facvk13mm0609ign7ilympz-kapptemplate-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/4kb7k1cfzksinnw0d08nginvli44rwx8-zeroconf-ioslave-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kapptemplate-14.12.2.tar.xz";
-      sha256 = "18dpbvdhi8qpfxhrcjkk71cr4b7gf6achg24gn6i4rcq8bbbv07m";
-      name = "kapptemplate-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/zeroconf-ioslave-15.04.0.tar.xz";
+      sha256 = "0fqqx0ji1v0cz87qb0kig9kkfdigmdfmz5qw1y2kx25mb0rp1g2i";
+      name = "zeroconf-ioslave-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/nqh3y6b9y2zgrkb07yrs07sqcxqmwwsv-libkexiv2-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "svgpart-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n8v8kbzq9vsghk0nc47rl49zqfz1w182-svgpart-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkexiv2-14.12.2.tar.xz";
-      sha256 = "0fjrvk2dcd4xzbs5v6nrabchkqbvf4qhljlc10797a378sdc8znp";
-      name = "libkexiv2-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/svgpart-15.04.0.tar.xz";
+      sha256 = "0985jjy2mghs57sy53mkas5p9ya0makrkklq99s04rgl93f2akj1";
+      name = "svgpart-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cf4mzk51419c0v7ld561gb8jk496qgaw-kdegraphics-mobipocket-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "bovo-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/sigbrnva6hymkgnjd48aw65s7vrysi2g-bovo-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-mobipocket-14.12.2.tar.xz";
-      sha256 = "1n2n2pd8ca5lnyv2r98jr4k9sm7lsvc5plw11xy28q829aayg8jj";
-      name = "kdegraphics-mobipocket-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/bovo-15.04.0.tar.xz";
+      sha256 = "0iffvb4m9bszpxh8s8yrpyzawyflwcbkajib5h1lw8xsgi6vcqhc";
+      name = "bovo-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yl49rnhq8zxyprh004g1qnqiw148x8kj-ksquares-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kig-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lv7d5hvgs42razrzhd3g60i1gpzb8w06-kig-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksquares-14.12.2.tar.xz";
-      sha256 = "11hznb7jdamq8hnbxggdj33jrhdnxzrhapc1rsj1ms546z01flnb";
-      name = "ksquares-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kig-15.04.0.tar.xz";
+      sha256 = "1v9p9f9dk3f2bfbwic1vf8ky5ziac4vx0vh8wxshzbjjb89kxkq6";
+      name = "kig-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kget-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ahgf7lvgcy0fzg9wzwc0agi77bj652lx-kget-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8g1l1dd5cccy6ncaywfhpf1x2633dk37-ffmpegthumbs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kget-14.12.2.tar.xz";
-      sha256 = "1jadb5x8bn80gwviw73cq715sw9hzx8lpj33d19vv18l2sqyb449";
-      name = "kget-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ffmpegthumbs-15.04.0.tar.xz";
+      sha256 = "0j0x8b0gcwyzx307rvhrx4k4g530lgyl5rzvdpkjqpga2qjg8q96";
+      name = "ffmpegthumbs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cv1vcvvi2nfic2p51vv6jf1nc2dwv7jm-kde-baseapps-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "parley-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/piznlrz9g0kvy1262p87db03830mx6by-parley-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-baseapps-14.12.2.tar.xz";
-      sha256 = "05j034g5h9cd2xw64h5zyjl8biq66p3b0z4z0z0i4min4hp52f7w";
-      name = "kde-baseapps-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/parley-15.04.0.tar.xz";
+      sha256 = "1f6nmnjz84cm8yk53whjm7k471y2vj106m7q230xj1g56mb5adrc";
+      name = "parley-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2rxc1y0r19zx61g6n9kgfp1rzgbs44xw-kcolorchooser-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "lskat-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6bdihbmhk9vdr9mzj52alqhvav2x1lc5-lskat-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcolorchooser-14.12.2.tar.xz";
-      sha256 = "063ahsbzd1mfrkc45gjsnhj11v68x7d1a718lxsabkjjx59qpbck";
-      name = "kcolorchooser-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/lskat-15.04.0.tar.xz";
+      sha256 = "12mnvbisbaiychdgk6fb464lwvpjlkrwdz5101sdrw466c16a2a2";
+      name = "lskat-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "okular-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dg4a3cj0wssfw3z10bwqxqrkjk3dmqaj-okular-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kgpg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/fys5hj4c13arjjqrh4kn8vyk92zrgz25-kgpg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/okular-14.12.2.tar.xz";
-      sha256 = "1ahw7a8i1hxa8hw0407f9x1s02zn659nprx9bfi1mvxhcn5zbwq8";
-      name = "okular-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kgpg-15.04.0.tar.xz";
+      sha256 = "1n37jh3zl4zb3dnb9lvjpni7gl6sb9s1jwmvf4jvqmqnlqny1b4f";
+      name = "kgpg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "killbots-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/x89vahdh994ax46rl3mx3dxyigph3zq4-killbots-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kruler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/2c9221fqxkz6ajx8g2l7xnhcfj8iivki-kruler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/killbots-14.12.2.tar.xz";
-      sha256 = "1zvjwimbjld408hplb439f4k8rm6aanlvycpmf4fdiwrcg4zjq6c";
-      name = "killbots-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kruler-15.04.0.tar.xz";
+      sha256 = "1pnhram0g6hfi2k13xhixwpr9vx1dhkvivn1y1ydvwk26klala1w";
+      name = "kruler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "krfb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3d0583a63pwkq8sszvl172d69j648gnq-krfb-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kscd-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9yidmqhziwp6sj4l0pzh1gvmhi5g1ny6-kscd-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/krfb-14.12.2.tar.xz";
-      sha256 = "112bv9yyhg7zyhkqavjqgvkzbjm54hw4nfqrj3jmcwbjbnlzkkxm";
-      name = "krfb-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kscd-15.04.0.tar.xz";
+      sha256 = "079sj1g5mn32b2l2l9qap55s5sr6bv44a9ncswibkr49vwq7va10";
+      name = "kscd-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6sm1200z80xxra4ibjmpgi5b626is1kc-kfloppy-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdcraw-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5y5x3vr7zibkhk5pk7hz5ibkza56d54s-libkdcraw-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kfloppy-14.12.2.tar.xz";
-      sha256 = "0a738m6r54g4ibinxwh70d7sp736r8lr63ca8hx90a1yl5samr1b";
-      name = "kfloppy-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkdcraw-15.04.0.tar.xz";
+      sha256 = "0h7m6m27jsp4xh6ywrbxad3c413ipzfgz357ahffqcafdjw6yfx5";
+      name = "libkdcraw-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/i36hvnhadldbxl9yl9sgwzgbmip6nazh-kblackbox-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ksaneplugin-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0z48pwb041r7sfwzvsxdqyw46bxy6d7d-ksaneplugin-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kblackbox-14.12.2.tar.xz";
-      sha256 = "1j9d33k8732dbwdnv85kr51jmjvnlcljya5q2zp6m97cy7xrf3n5";
-      name = "kblackbox-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ksaneplugin-15.04.0.tar.xz";
+      sha256 = "1wh83c31x1n7vipi6m29hsinrpzwsvjnj3psg6s7bywnb6if2ir7";
+      name = "ksaneplugin-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hnk7d2fjhvzd1j1c0pjc4kqh3a4zv7bv-kalzium-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "lokalize-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5by08m2jgiap41wrk8kg7lc8b6q6ifwh-lokalize-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kalzium-14.12.2.tar.xz";
-      sha256 = "16ngwp9lf15l06yzazymrdbszkq9sx14wh4k8w1sydryl15xl77n";
-      name = "kalzium-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/lokalize-15.04.0.tar.xz";
+      sha256 = "1nikpfjnmm3ws2qd46zq6g5v64dbfa7pmbp8nw1sv7dcin3k42ll";
+      name = "lokalize-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkface-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/a6cidm1dwqxq34q0wffn8b553xwg3sxv-libkface-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "granatier-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/w9bkpa3frqgnh07gbaln9m15nhj0vdcj-granatier-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkface-14.12.2.tar.xz";
-      sha256 = "1mp19n7jhs9x74b8rlnrdc7ig1dx0v5pjvl6b4fmzfglk9akhh7v";
-      name = "libkface-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/granatier-15.04.0.tar.xz";
+      sha256 = "1s5jkwqzjlcd343sm6akzx56a48yvx7z9n3cww9gxrjl76q1a19c";
+      name = "granatier-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zi3aqkz4w4s4ldzscvwby1r6xkldxpdb-kremotecontrol-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ksudoku-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0ssavwdndi5h0mc3cjrgn1vpfz20wmdm-ksudoku-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kremotecontrol-14.12.2.tar.xz";
-      sha256 = "1sbzycb2b4s7v1lr6d7g4xqadwcxh5jlsl01jl3dpni83phxzk3q";
-      name = "kremotecontrol-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ksudoku-15.04.0.tar.xz";
+      sha256 = "0bxcjqpkqr5zbjrx8drmjvjgnyjvpqbvmqgyfsidm8rgfg6mi3fz";
+      name = "ksudoku-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/bpi59fwiqf4rn8xgkzkhyzr6ajv1d2la-kblocks-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kmplot-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/76appqh3cg62681baq1cy6fymadaq2c8-kmplot-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kblocks-14.12.2.tar.xz";
-      sha256 = "0wcb6sgbr7gm9hh3gb31zmw6rqmflzis44ry1zb7yql0kf95y5ka";
-      name = "kblocks-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kmplot-15.04.0.tar.xz";
+      sha256 = "0fnvjixnp2iyjg0hgm6lkry407f0fh39kb184jzaakrp703m3jmi";
+      name = "kmplot-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g4xg6d0syp06k3znj4xyiyv9ykiq64pf-ffmpegthumbs-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kcachegrind-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ys2xzw0hck8gp7g79m933580y7rix754-kcachegrind-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ffmpegthumbs-14.12.2.tar.xz";
-      sha256 = "1261dkxyj07gjs6rk7wh8vkxk9554b675d68w4yfzf4agb8kdb8b";
-      name = "ffmpegthumbs-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kcachegrind-15.04.0.tar.xz";
+      sha256 = "1q1z0w7c7j8ii97n4vcd80qi6hb7gsg6j9l3md37ls8c4qvhknx7";
+      name = "kcachegrind-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/0s00l7a87bg4qzbd43z7yp6pqff1icn4-kdepim-runtime-4.14.5.tar.xz";
+    name = stdenv.lib.nameFromURL "kbreakout-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/x4rsvf3qzl921vgamzjxkvwjw971r917-kbreakout-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepim-runtime-4.14.5.tar.xz";
-      sha256 = "00pmiifhf6km9v2hn3xiapr4vwrrijnvyjirprs99p8h39kifblc";
-      name = "kdepim-runtime-4.14.5.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kbreakout-15.04.0.tar.xz";
+      sha256 = "039g4qmmkf3lq8jx5vgasvqx19k3xbvfkm0j9his61z021ldjxla";
+      name = "kbreakout-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/1cdzh2b6wq0nmkvjx6spl70pj3538sl9-print-manager-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kapman-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/82vlfb4yna41mip5zpkal4kpy67w4kjv-kapman-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/print-manager-14.12.2.tar.xz";
-      sha256 = "02vz69aj56hx9jdckacjd7yzr1cmwmlqd7b3n92zmn9bx152sx86";
-      name = "print-manager-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kapman-15.04.0.tar.xz";
+      sha256 = "0glc8hcjs89s5cxa77f12pzlnmvr74kiqhcrk7djz98pnqwlsn5v";
+      name = "kapman-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdf-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vk3f3512rv381dpcwihmxgx4av3d92af-kdf-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kalgebra-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/346qqpdqx5hdzyvd4dlkag3ir951fjp7-kalgebra-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdf-14.12.2.tar.xz";
-      sha256 = "14dgcrmny2gvi3m4y95di6w3gv1bld6pbj5i5qaphhxk5gl489a0";
-      name = "kdf-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kalgebra-15.04.0.tar.xz";
+      sha256 = "07czg7i344qq93y95f46qvk3zpghkl3gcr8cd8wgc0v0b1mdmyfm";
+      name = "kalgebra-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rslsx2zc6zf7hls6l1m598a04r6l2h7k-kde-wallpapers-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "pairs-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cd5q5wchjl2ncm44pwl156jks832y96z-pairs-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-wallpapers-14.12.2.tar.xz";
-      sha256 = "1q9p1ay2n4anr822wx7lc45hwwyyl1328ick704x6kd1rz1qwjiq";
-      name = "kde-wallpapers-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/pairs-15.04.0.tar.xz";
+      sha256 = "1d1va0b55fwivsvcz3izr680nl4zbyn44fdnirglw7q25278p7bh";
+      name = "pairs-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2zkg1fh4kr78r8qg5nrn72k431vxd96z-kdegraphics-thumbnailers-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "khangman-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/krpgzhpksq4kr9r78w9f6rk2q0963lwv-khangman-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdegraphics-thumbnailers-14.12.2.tar.xz";
-      sha256 = "0kvqbdmjnrn5fx9ci9f4fnwk8b20d9cvxdb966cwrzz6x6rik7ww";
-      name = "kdegraphics-thumbnailers-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/khangman-15.04.0.tar.xz";
+      sha256 = "0cnaih6xhg11wrg0c3v7lir2yknc4k6m490aw7bhraz98kfxr905";
+      name = "khangman-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/pb6xr7b484aszpwr3pvd2pywliij31y0-sweeper-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "konsole-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qb3gypyd97v9cakicf44q7xnwfmyqsyz-konsole-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/sweeper-14.12.2.tar.xz";
-      sha256 = "1k0brig6m5y5pv05lmpmc0m6wiz981jyx1brhy3ixv40bivm4cf6";
-      name = "sweeper-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/konsole-15.04.0.tar.xz";
+      sha256 = "10qgynn6x7cxyp6lgri0vggmzmcvckwvrg9mrycdnwwrsfabscrc";
+      name = "konsole-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "picmi-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6im1sz3rqm53siyfapz4p518vaa05nvz-picmi-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "analitza-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/c9xwpgl8bdp582w91zrchhywr1j9xm9r-analitza-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/picmi-14.12.2.tar.xz";
-      sha256 = "1xnxsvpigsf4mjnxxp5w5nvp817az7c7p11z960z5f18adxg7frr";
-      name = "picmi-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/analitza-15.04.0.tar.xz";
+      sha256 = "03kaaa8kp92lsva5shzqb9497wmhksm79pc39ip5l50lqac9gr1l";
+      name = "analitza-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qprvh7y50d15356kdspb4cxqvm9xc30i-ksnakeduel-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libksane-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/6qn668dc4yppjwyc1ms0698nkmxj4sxm-libksane-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksnakeduel-14.12.2.tar.xz";
-      sha256 = "1gw9sv67jnwcxsm4qw21hjbv3fbnxw6ibr4l8zrcccahlz3lc8x1";
-      name = "ksnakeduel-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libksane-15.04.0.tar.xz";
+      sha256 = "0rnja700hwjn4bvy06lijndic2zryn64kybvj71ip6knq3nx77x6";
+      name = "libksane-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/yak0kczv35nhxbgr15mqr6zy9ncvg5jh-ksnapshot-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kbruch-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g1hbkl20wkzglhaabxizzhrl1xpkfiy2-kbruch-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksnapshot-14.12.2.tar.xz";
-      sha256 = "15ka0h8bc7n5023ghwgxvq36bjaipimcs09nrg3z4nvdzds6xsfr";
-      name = "ksnapshot-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kbruch-15.04.0.tar.xz";
+      sha256 = "1662hqqsf1rnfwrqwx5wpl0cvr9313sh8bla2sig8v2s8v2lyyi6";
+      name = "kbruch-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/xz6x2nvcwz2k7df7p8s8wx42309a2rhd-kgamma-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kmouth-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dwkbfqj5a21hcryw42dwqw9lq1r4ld0d-kmouth-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgamma-14.12.2.tar.xz";
-      sha256 = "1lzvgdqh3i8klnj243rfak6sksnh3z10diki65zzl8wsjyagizq9";
-      name = "kgamma-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kmouth-15.04.0.tar.xz";
+      sha256 = "1swvdrlcfxv312kncihvxba0cklmv47qyr2dbrkhb9s9v6jbiqb3";
+      name = "kmouth-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "okteta-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ydd7za8ax4jb54rap067rzkwfv2ars7y-okteta-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kppp-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8c2srwnwg41aypvjqzs08129wm391p2q-kppp-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/okteta-14.12.2.tar.xz";
-      sha256 = "1xdyg54zzylj8s6zr4z5npi9pvqx3bjma68j3p7ymqvaa71a1c0n";
-      name = "okteta-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kppp-15.04.0.tar.xz";
+      sha256 = "1ml5lc20jg05zfq9d274vqp7k7fh5369zshp073bi6zjj4cm7gss";
+      name = "kppp-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/99n02c3v71ycxvywrqn14zrsjgli2nkz-kgeography-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kmag-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gi6kw8zlmpy8gjijr34620dzp858h657-kmag-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kgeography-14.12.2.tar.xz";
-      sha256 = "10bzwbxg4k487700mnkmk642b5jzvpadcmd8y3h3af91syd0v7zp";
-      name = "kgeography-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kmag-15.04.0.tar.xz";
+      sha256 = "0wmarmybn56mppwb33cjg96906hh4vbnwxqpw2441axn5vqmf90j";
+      name = "kmag-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6z45z434l9dw981lqixg0jw7mb2s1j47-knetwalk-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-workspace-4.11.18.tar.xz" ".tar";
+    store = "/nix/store/b65xpr56hpmfinssggl4fq88lky5czlm-kde-workspace-4.11.18.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/knetwalk-14.12.2.tar.xz";
-      sha256 = "102bd37i3z57xkq6rs7l2s4qlwayaky4qb07bh3c589g2s9nxl28";
-      name = "knetwalk-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-workspace-4.11.18.tar.xz";
+      sha256 = "1rvi88flk8c1j6qdkxak3sy1yf646ql3zipxw2azchwzd4k54mzv";
+      name = "kde-workspace-4.11.18.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ypdsbibg2isd991n9bmdkgi5wi59ibnk-libkeduvocdocument-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ksnapshot-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zim1ydmdxhwv0cypdviqdnn0nwz2d66q-ksnapshot-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkeduvocdocument-14.12.2.tar.xz";
-      sha256 = "1rf2signnpx7ik3p7vrvlkbv0g3m280pc1qz1fxzw2kjn9ais2r7";
-      name = "libkeduvocdocument-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ksnapshot-15.04.0.tar.xz";
+      sha256 = "1577ybwpa52lmv5pd0223pz5l3q4h3475fz5qp3sm1rwi0nzmawq";
+      name = "ksnapshot-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/i5wnc7wqbmnac1awgd45iz9d91b7misv-kdeedu-data-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "okteta-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8z78fks7wl0rf3077yrz8hzvqvmxn516-okteta-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdeedu-data-14.12.2.tar.xz";
-      sha256 = "09ch89pghjipxsr9j50a58xww6cxhrkh9z7ns6bh5kg9b6hc47rq";
-      name = "kdeedu-data-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/okteta-15.04.0.tar.xz";
+      sha256 = "0svgsy838dlc2krn2rzb65a6i0dfav4xlmi4174d23qhaikl1z42";
+      name = "okteta-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "parley-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/lix9qbdd1ganlhwap696qdcyhq3awjgz-parley-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "step-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/argcpdljdar6ga3psyz4wzr3kmvkmf07-step-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/parley-14.12.2.tar.xz";
-      sha256 = "0kq0nm732x723f1yml0cq3w1p7ah5m3q0lj0pvrvg5z393a1ki14";
-      name = "parley-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/step-15.04.0.tar.xz";
+      sha256 = "1fl4zmj4k3g8c7bas7dj2n82qlbq8k5p3s5bflcillrz6pdd4s50";
+      name = "step-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.5.tar.xz" ".tar";
-    store = "/nix/store/b3kdfd6nv23lziv5nf21g00wl7di3vz9-kdepim-4.14.5.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-kded-module-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n3b0rfacc8i5p5hlgal66zr9gjfrkda1-ktp-kded-module-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdepim-4.14.5.tar.xz";
-      sha256 = "07bg60b96wg107sn49h4phks55z6h69kdsznpfr09dsxf53vl2sc";
-      name = "kdepim-4.14.5.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-kded-module-15.04.0.tar.xz";
+      sha256 = "0ijinvp48aixx8fjdc8fxpm8ilzsn9pkhsiinh47wiabyjb8rj3z";
+      name = "ktp-kded-module-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "blinken-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aip7i17kab1fcv43qx999cxwr8b05gdp-blinken-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kwordquiz-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yik5ibmcy9k87y41nk3b03w1j2p3012c-kwordquiz-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/blinken-14.12.2.tar.xz";
-      sha256 = "1dkdgfmpccbpb4i4h34dg407q6h18mq7x4k2d66bly0pkwhkwkbw";
-      name = "blinken-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kwordquiz-15.04.0.tar.xz";
+      sha256 = "10rq7zdd8i8dgmjzxgn6139ixzm5kzwiswal0cmkd42wwbdn6fml";
+      name = "kwordquiz-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/hc68363pfz7k528lcv6p8gfj4r3bi061-dolphin-plugins-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdelibs-4.14.7.tar.xz" ".tar";
+    store = "/nix/store/xd5jr85rzdnsrw18ab811q6hcwq1f4vk-kdelibs-4.14.7.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/dolphin-plugins-14.12.2.tar.xz";
-      sha256 = "0lc6l84p3ixk2wzj4hbxwgvsmin3kw8xw40b3jrq2w1y21zbvf3h";
-      name = "dolphin-plugins-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdelibs-4.14.7.tar.xz";
+      sha256 = "1zhqvyx8gq7514mr0423z0gl1yn33snh53fj2ijkk4blhjga601q";
+      name = "kdelibs-4.14.7.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/6ycc8cckv9ybw5fj6qwn53ccn5dghcz0-kwalletmanager-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "killbots-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nshwyzk14mam2av602sqzcxnwjzpny6k-killbots-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kwalletmanager-14.12.2.tar.xz";
-      sha256 = "0bynykq9j6xh0a712934vyvq3yr94676xhdvf1iazky1cwwmiryi";
-      name = "kwalletmanager-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/killbots-15.04.0.tar.xz";
+      sha256 = "0a9jn8i5hw3v7kr6vqagxkqvvjs6qsb23g2khaxgbw0x0cz5nqx4";
+      name = "killbots-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/vd8smizcfqw4zsks5sbf03chbxk9dqiq-kfourinline-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/55ksfn4hq342qbl8cm4jf8k8mmra096n-kdesdk-strigi-analyzers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kfourinline-14.12.2.tar.xz";
-      sha256 = "14s4lb9kygaa16sq4xfmmabv31kg3rw7dw7k2f4vwqqh3s1168yc";
-      name = "kfourinline-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-strigi-analyzers-15.04.0.tar.xz";
+      sha256 = "0k00ip8ll1i96cazs78c6al1yjcnvpr1awb6g7yvvq019icjmzvn";
+      name = "kdesdk-strigi-analyzers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/rvr5bpfppyd168gfqimfavs9g4ys2412-ksudoku-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-send-file-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/90s1naljnqa6r99nl2dpjsf8rjb3k7cp-ktp-send-file-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksudoku-14.12.2.tar.xz";
-      sha256 = "10c148lksrh49mfvlx7q5i7xxjanhngm2s9d7ifx5xyqlpik2zcv";
-      name = "ksudoku-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-send-file-15.04.0.tar.xz";
+      sha256 = "03i6irask1ccngwapirnc9vpk4nw7r82zl6jdnh7w9988c2wdl22";
+      name = "ktp-send-file-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/j2pwfcwc6n5r8klnbxf0gpal2pinan7g-libkcddb-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "dolphin-plugins-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/n2vy60sdgnx3gb6fmmgd03d4jnn29nmz-dolphin-plugins-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkcddb-14.12.2.tar.xz";
-      sha256 = "088hhnnm09xfqkc0j2l252qgl7nlqmsdbchbr5cninf8n9ivz99d";
-      name = "libkcddb-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/dolphin-plugins-15.04.0.tar.xz";
+      sha256 = "0a1f1si598cmqd0j9v6pz0w8s6286xg2wcfxzrmkr994bfkydd8c";
+      name = "dolphin-plugins-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gz25xkmky3kpl4hw2x9ahzr5xp3113f9-libkmahjongg-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ksystemlog-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1wy9hsww32i53nv94bnzj83hfqw3x1ir-ksystemlog-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libkmahjongg-14.12.2.tar.xz";
-      sha256 = "0min3bpd2h0lch4412ybryk1bn3rs2s4936kcjn6mn0412xyjvdf";
-      name = "libkmahjongg-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ksystemlog-15.04.0.tar.xz";
+      sha256 = "104yg6mjnhznsylpv8faqih9rpdxyp4667dagq7f1kfajy59jh1y";
+      name = "ksystemlog-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/g7hglkwmv8kdw0cjly5pysb3i4piapkx-kcalc-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/x1qmhlskhz0ibs1pnxcb30bj1yk3f447-libkeduvocdocument-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcalc-14.12.2.tar.xz";
-      sha256 = "0vm861cd9y8ax7mfnv2aszip2z0grmjvhzp10x5f7gq1fhm1db64";
-      name = "kcalc-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkeduvocdocument-15.04.0.tar.xz";
+      sha256 = "0lqp2qfsdjkchnb5xrbj9hax2bf4ls1wk7pmb364qvkkhfia8qv4";
+      name = "libkeduvocdocument-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/m69i89q12sb8mpc1bhs0a2miyrkfnq7y-ksaneplugin-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kmines-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/3vf7rffgww1k7byna7p05d0115p6924y-kmines-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ksaneplugin-14.12.2.tar.xz";
-      sha256 = "1scgp9p2jb5vwwdvbgmsbr3mmijiq40m5x7nd9qx7scwn2wqjvq9";
-      name = "ksaneplugin-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kmines-15.04.0.tar.xz";
+      sha256 = "015xximi3xydkbygzlka7y8nmls3dc8jvr3dvvidl57gl1szmx73";
+      name = "kmines-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/cynl1ai536dqs4cnlji5db1jybpzh7s6-palapeli-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkgeomap-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/amqrx3hwvwrz8rgk3dljj11bvfpx4plm-libkgeomap-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/palapeli-14.12.2.tar.xz";
-      sha256 = "1fg2ikq19g92bqfp3j27mawl284xqiwd1nr8dg94khbb111210r7";
-      name = "palapeli-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkgeomap-15.04.0.tar.xz";
+      sha256 = "0yd17xa085rvxsnsah6ny7w88lbs7c1ilxrvbpsf2rvjkbl96giv";
+      name = "libkgeomap-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libksane-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/4qwqpcwraxr0a8wy81plb3l3ij3jh3s5-libksane-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "umbrello-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5lahf10pz3vdh0dngi3fsmyn9g8cmk5v-umbrello-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/libksane-14.12.2.tar.xz";
-      sha256 = "07nw3mjc645angwyllzff0hb7i7lp6wl3fw88zqd380w5j13a46h";
-      name = "libksane-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/umbrello-15.04.0.tar.xz";
+      sha256 = "14lw9rnqv7bgni1rxwmgm4jnx2l2x5524wysqlhyp7np35mzdnlc";
+      name = "umbrello-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.16.tar.xz" ".tar";
-    store = "/nix/store/afz1vd72namq3xca96zx1c9l6n8jzk4p-kde-workspace-4.11.16.tar.xz";
+    name = stdenv.lib.nameFromURL "bomber-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7mf874dsxa6wj59zfr6s1n7399rvl7m9-bomber-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-workspace-4.11.16.tar.xz";
-      sha256 = "11mzr55vr7x2yym4gdaj9bcvp2qpbs3vlbfmhs74r5n08vmsdq3s";
-      name = "kde-workspace-4.11.16.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/bomber-15.04.0.tar.xz";
+      sha256 = "1hpss9jmjsjl2shm2y50s5js33rpn0gd20il6wq454wm0k0q7rpj";
+      name = "bomber-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/wbjy41ymgplkg26cm94k6vny2vjl6160-kqtquickcharts-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "jovie-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/35zcglbjikb4ayp14d9l6hgs5myv5i6l-jovie-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kqtquickcharts-14.12.2.tar.xz";
-      sha256 = "0v5ng9spcbv22lhpx4hzfg3n56wfrjdxg6nls6sw52zbq12lagqn";
-      name = "kqtquickcharts-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/jovie-15.04.0.tar.xz";
+      sha256 = "1sa6agn9zp12n98v7i9rxng2yn25b4yf2s8q8rjb3qg93kmzzx4v";
+      name = "jovie-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/zl8sxjy6mp1z6r3dajvf5ly5zsiasxjd-lokalize-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9vacywnw3knldygpgxjghjbw2nfqdszn-ktp-auth-handler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/lokalize-14.12.2.tar.xz";
-      sha256 = "04jmsysvx6ysyl3126bq7xg76y7ppzjfd55j7q7i18nrkcgw4y4i";
-      name = "lokalize-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-auth-handler-15.04.0.tar.xz";
+      sha256 = "1hj3vc6wj768xdpr02v64p9wbrh1y61zg2fal3bk3fzrlz2yslg5";
+      name = "ktp-auth-handler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kig-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/0sf32n3kd0fyvp4sdyv5yk4abn8gy54w-kig-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kubrick-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9rjk1xbzbnc2qqrni0ng2spbzailrb25-kubrick-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kig-14.12.2.tar.xz";
-      sha256 = "0c137jnkzpzv43yf7crymghybgz70d6q6mlfww53if2119sznzd4";
-      name = "kig-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kubrick-15.04.0.tar.xz";
+      sha256 = "1qxyymrqav9hwa2ldqqpr49aj5sqzmiin6c4rmbirxmaasmyqn6a";
+      name = "kubrick-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gscz4fvz0xh0szcs0jr95xiif4115vj2-kanagram-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kgoldrunner-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/l2lbbhnr6r0q1sf3rzzjnwina7gvlllg-kgoldrunner-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kanagram-14.12.2.tar.xz";
-      sha256 = "1s2zn876b3css74r79acq6wys4qlq9xgb3z376xfl71rzadvisvf";
-      name = "kanagram-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kgoldrunner-15.04.0.tar.xz";
+      sha256 = "1hsrjszck17gqnnpxzbdknj579n7xpmbq813a77736cmi95qr4h3";
+      name = "kgoldrunner-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "katomic-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/mljg8qpz9axmnzw9jarzz82a4qarvbwn-katomic-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "filelight-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pr78axnbpxwah326z7jqhq4cz1p7h7wr-filelight-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/katomic-14.12.2.tar.xz";
-      sha256 = "0ns6apxaild1iiix03vjzvz45ba442agn4aqkbgik9x9wdr9yr7l";
-      name = "katomic-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/filelight-15.04.0.tar.xz";
+      sha256 = "18vcm8f8wgl0hqlycljv7kbq8iip5vadrsyhr58pw60cr8h36n0s";
+      name = "filelight-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "filelight-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/3mm64rsb14p9cyhw31jzvqbs6nppva9x-filelight-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kajongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/13030n2xwx0rnbd0myy87pfzrd93rpkw-kajongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/filelight-14.12.2.tar.xz";
-      sha256 = "047bki2gnwvflb57vij1576d12ml4ga9b1q44dz9rq97wwfbwqnj";
-      name = "filelight-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kajongg-15.04.0.tar.xz";
+      sha256 = "0aa2c2c4322lv4prwxkhanw0lbrv1145w6fz473f6ybfhg9isc7d";
+      name = "kajongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcron-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/9whfiwhxk7v4cfj1s863w6i789kgcbpf-kcron-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/kw08x6m9wzrmhm6av38hz2nd18agxapj-ktp-contact-runner-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kcron-14.12.2.tar.xz";
-      sha256 = "02s782x69xrymv3wbjcfm52v246gn3illdga7g1rmhs7kmi6q7rg";
-      name = "kcron-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-contact-runner-15.04.0.tar.xz";
+      sha256 = "179q9707cxmd57iyadasdr9rvcqxwrahccc8vjylzh1x5p2arib8";
+      name = "ktp-contact-runner-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kuser-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/dj7svyjh962g9c3j2bgprhmmnyi45pbj-kuser-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "sweeper-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/yz48bx3mdyvapyz52aa846f32102jh7w-sweeper-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kuser-14.12.2.tar.xz";
-      sha256 = "0p2qwv24qxzx637v5fjwzscvxa7j84j91s4c4gj5hq8939anx7q2";
-      name = "kuser-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/sweeper-15.04.0.tar.xz";
+      sha256 = "15amamnrg7d52l0agkw66k96xk0j5shk2667wc9p2jy6g96cw53c";
+      name = "sweeper-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8zydgf0ncr96fgvyya9rg32ahavxm4c0-kteatime-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kfourinline-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/s96mhycwzwrv5w708mz6appsbf1vivz7-kfourinline-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kteatime-14.12.2.tar.xz";
-      sha256 = "1vq21jw50w56i9bwx91hlw6a2m46q83mz2mg11cdc1nxk5gm1359";
-      name = "kteatime-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kfourinline-15.04.0.tar.xz";
+      sha256 = "1wpcdzlpy8jdnlzzhys8n08pknk7ncq41dchs2ii3v30w1dnwln2";
+      name = "kfourinline-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "analitza-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/im52lp4p99k9fn2ja5hch6m6glmlk7da-analitza-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-common-internals-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/0q8wks5hqas02y3j384lwqy2a1npvmch-ktp-common-internals-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/analitza-14.12.2.tar.xz";
-      sha256 = "0sjlsh8x4qzyg59zkvmrd312qvbhmf17349l0b989xm0m1nwmqfx";
-      name = "analitza-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-common-internals-15.04.0.tar.xz";
+      sha256 = "0y6jwqaxvkzjqdz4j3b4z5ybz4d3ci09x8apfr3h0q5pf4crkv8p";
+      name = "ktp-common-internals-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/5rmimmbz973alzhx2xm4r80lf556v14c-kde-dev-utils-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "krdc-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ch18h2226p60xnyjndy40r8fgwajd80p-krdc-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-dev-utils-14.12.2.tar.xz";
-      sha256 = "007w4761cv2wxqhkk7mz2pgk7zmvzkfbmy0biriy836vx99xjdky";
-      name = "kde-dev-utils-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/krdc-15.04.0.tar.xz";
+      sha256 = "1ikm5a8lb65iljdvs16ipclkassjjdf7i49whcvz71rx8agp01hr";
+      name = "krdc-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/91wk4lximnfqs5ly2q340rqn87h84axl-kde-runtime-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdeedu-data-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/05dzvpk81hhrfp0yncmgnq8q8nlps3z3-kdeedu-data-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kde-runtime-14.12.2.tar.xz";
-      sha256 = "0cs07gbx7v6ilrbp4bgl20h1yrbh07sbrrf167pyd4lfx5rz9cgk";
-      name = "kde-runtime-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdeedu-data-15.04.0.tar.xz";
+      sha256 = "1r157dbi75ayxww57vhww3cjxv1z2y2mv54xh2cf3zfjv6kmp7lc";
+      name = "kdeedu-data-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "pairs-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/whl3f2bs6018bg3i10akdsjvky2wgvwd-pairs-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1z4nb0mp0d654n7wmyddxslx82rh2y10-signon-kwallet-extension-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/pairs-14.12.2.tar.xz";
-      sha256 = "0gs76fgyszs9lrvszi57vldx6avfyiz8hdg5axb7nmyikiqnislm";
-      name = "pairs-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/signon-kwallet-extension-15.04.0.tar.xz";
+      sha256 = "1s3nm7vrwwgin278vif6w8yyi1vg9hk401swvlhwmn9305bxqm01";
+      name = "signon-kwallet-extension-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/adksl0r448kybmvhs10crw43isw90i3y-kiriki-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kcron-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8qjk4ri8l2cvvqaf5qpmzwz33gx0n9kn-kcron-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kiriki-14.12.2.tar.xz";
-      sha256 = "0r7i6fh9apjhxc7khqb4lachqr95ypiagk7cr52kwpl8bd9zcz2p";
-      name = "kiriki-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kcron-15.04.0.tar.xz";
+      sha256 = "0srq463k37klfbvrclhrni1kbn2bxxsfzp8l8lbx4dz8p93fcvdp";
+      name = "kcron-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/qz2v6fj2akwll4s904z638pzwpyf18yx-kwordquiz-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "ksirk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/hngc4aajjzr5qszkxi745fi8l28k8wp4-ksirk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kwordquiz-14.12.2.tar.xz";
-      sha256 = "03isbq1dbq5w0pd8jpb93hp6z4nwi28q5ccszvldisfna5abpkjf";
-      name = "kwordquiz-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ksirk-15.04.0.tar.xz";
+      sha256 = "1rl2c1yjiiw3gy4kblxgf2lh2sd5bpwz36hi9kv1dvf00bwi1w0x";
+      name = "ksirk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/jhh4r8rqhcx1jbqycy1i0x5x4ivqgjhg-kjumpingcube-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/br98dpkixyvcr4dwp6fqfcgzrvgqvps1-kdenetwork-filesharing-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kjumpingcube-14.12.2.tar.xz";
-      sha256 = "1a030z8bcxyj70in7g574p80hsm32b8s7mqnl3abmw4315dc43kf";
-      name = "kjumpingcube-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdenetwork-filesharing-15.04.0.tar.xz";
+      sha256 = "1296rg0axk6gc765kv3wnqqb7mp45sqw8rvhz631ybbsvcy9vk6c";
+      name = "kdenetwork-filesharing-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "konsole-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ahyi8a1vsdyr3zdkiljrwmjz73dxknwi-konsole-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "okular-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/8lzrv2slw0ck39i94w8ms8zm5vfx2x9v-okular-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/konsole-14.12.2.tar.xz";
-      sha256 = "06rrhmmx8sdq084wb2a2pgvmi43fkjbmjsikr695c548qp76yzig";
-      name = "konsole-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/okular-15.04.0.tar.xz";
+      sha256 = "1xfj7hm8149xn5g9yy56zd93bjs38k10009l6d2xynvqcd2k5sl7";
+      name = "okular-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/gm8jph57vbjm15f2w0k2qijghdm9v9yw-kdewebdev-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-runtime-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1zj95rkrgbp4s8khzd7hjdnz9ndib9q3-kde-runtime-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kdewebdev-14.12.2.tar.xz";
-      sha256 = "0n4p7jflrrjq47wcy20avgjiz1c5qgwmw8nqxmaaxj8vnwk2vx37";
-      name = "kdewebdev-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-runtime-15.04.0.tar.xz";
+      sha256 = "0dpbmg8w5b2hq3fw38v3fa4w45lm1p06sh72rscsz2mc2ly6bkxr";
+      name = "kde-runtime-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kstars-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/s6n79j8914ms33xvjrx74s22axlh20b3-kstars-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "konquest-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/p08rr4gqznxl4w3gfd7na11v8l1s8afq-konquest-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kstars-14.12.2.tar.xz";
-      sha256 = "0fwfpjmr4i9kh1f3360ahhk01m8zrkipvdj0wn16a3mxvghr6vki";
-      name = "kstars-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/konquest-15.04.0.tar.xz";
+      sha256 = "154vbny41axcckdi4dw928kvhfvw8j5b34l79dqa15lnsml92m6f";
+      name = "konquest-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/kqvqadr6n5n2200w3gr5h978y6376gbv-kubrick-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kde-baseapps-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g2j9js2pgakja03ljw9zl4xp9v2pn8l4-kde-baseapps-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kubrick-14.12.2.tar.xz";
-      sha256 = "0r7w6787gc2kcvjgddr0lw0liihis4a5s8rim3ycjlmh60bfw2ac";
-      name = "kubrick-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kde-baseapps-15.04.0.tar.xz";
+      sha256 = "1xiv9qmv7x6djv7fg7khsqhzrnypr8dg1c3ximi9r32jvcfcda7q";
+      name = "kde-baseapps-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/2m09vphyfk4wfl4pzxns8lgh00nin1pa-kshisen-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kreversi-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/h39cafz2080k7xih81jn5f7scfpvszdw-kreversi-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kshisen-14.12.2.tar.xz";
-      sha256 = "110fv7iqbv63sw0q8m1fj0x45ivmmhw2v32sx7my0hvch4rxif1f";
-      name = "kshisen-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kreversi-15.04.0.tar.xz";
+      sha256 = "0z7rp0d52cgc8lsnjj0p0qh7fydgk1348ljymfmw8kr41848fag7";
+      name = "kreversi-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/aq90r77wq4qs67j8dvw89zppbrj5rhgz-gwenview-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/17j3xfw2gjbvkb6k09ykyf8avx7fip38-kate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/gwenview-14.12.2.tar.xz";
-      sha256 = "0ky9f8v3473f7ic2gaymc89f6yqnpi6vsbwlnqgjfwbq8ry47w4n";
-      name = "gwenview-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kate-15.04.0.tar.xz";
+      sha256 = "1g4dh9d55mbdnxrxp8kyid52gg649rnd6xhv1di3k1zz6x5jjnr1";
+      name = "kate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/29vsbhggrymqqgvs490jxykrf6mhvmhg-kbruch-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "libkface-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/f6n75hb70xfprv3rpa78n59icxglv3n8-libkface-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/kbruch-14.12.2.tar.xz";
-      sha256 = "12gs4l5wazkym3krcfc0sjzx9kji6ca3blmprw7hfwk1yqgd36rk";
-      name = "kbruch-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkface-15.04.0.tar.xz";
+      sha256 = "0hm3llyjprfhj5l7y97kyyk61cbis7hmlgpf3qfin958hmip7kds";
+      name = "libkface-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/ccqbkxaxm7swcm1qf9rkvjs6fgfiafay-ktuberling-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/frl8ikxyck6mv44rdwlca5dg64vlar20-kdesdk-thumbnailers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/ktuberling-14.12.2.tar.xz";
-      sha256 = "0y5icsgkypcr2z9w8zbhn9z877dak2kjf0if5ag1lpmjlj0y397h";
-      name = "ktuberling-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdesdk-thumbnailers-15.04.0.tar.xz";
+      sha256 = "1y3wix763ndi3xfwpm3h3cfj3r446jkrslgn09bplm4x36jdd2wv";
+      name = "kdesdk-thumbnailers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "poxml-14.12.2.tar.xz" ".tar";
-    store = "/nix/store/8i8lf5v6bi77ijr3b8xwny3yrapqnxrg-poxml-14.12.2.tar.xz";
+    name = stdenv.lib.nameFromURL "kremotecontrol-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mxrd14q1c9hbw5lnpvk32s2jb18cjyrn-kremotecontrol-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.2/src/poxml-14.12.2.tar.xz";
-      sha256 = "0d2iqgpxxfzvi9aim2xsz96gjpy1zcjr0f5fsha0hns6m6mdp1lh";
-      name = "poxml-14.12.2.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kremotecontrol-15.04.0.tar.xz";
+      sha256 = "110bcp9b4y1mwpvd6r09zlrr54f1qdncxixliivclx9y0nrf9ljf";
+      name = "kremotecontrol-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkexiv2-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wx9ll48ipram4w163143ixab3lcdn9iq-libkexiv2-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kmahjongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gaj2cqkjp0ynwsywrshpy7glfagz37ds-kmahjongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkexiv2-14.12.3.tar.xz";
-      sha256 = "1rj7ac318rxl995cz70vdivk065mpsxk3sw0zqj7y0a2cgg67qrl";
-      name = "libkexiv2-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kmahjongg-15.04.0.tar.xz";
+      sha256 = "0agqvghlvw3n8xr15n44zjidxqghpmpzf5834n7d18yllnkmyqzz";
+      name = "kmahjongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kbruch-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2bqk35id2iwy0hx56a4fqlj9hmzwn6z-kbruch-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-text-ui-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/5vsvkxwxycdr0qk54ksiyrlbdfqxc7qq-ktp-text-ui-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbruch-14.12.3.tar.xz";
-      sha256 = "0vrs1mn701jydqjzlshwjq2366c65qwiz2gf37l31ha0nk8lxcxh";
-      name = "kbruch-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-text-ui-15.04.0.tar.xz";
+      sha256 = "0az6ziraqslcidjflljc25scrg1i2kgkppm93bd8y8zy4a2q1wns";
+      name = "ktp-text-ui-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/14cmjnxm524ik9dmjb5p08c9hpr0xzlv-kde-dev-scripts-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kshisen-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jdmiqffbirvn2pzxx0vfia6v9mq9q1jx-kshisen-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-scripts-14.12.3.tar.xz";
-      sha256 = "17xwh4gwbagzdyfxb0wbl6hplrza7mj82mf1dhz5b6p1jjlfji96";
-      name = "kde-dev-scripts-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kshisen-15.04.0.tar.xz";
+      sha256 = "011a3gqij509vl74v03s24in83i2qyylrpasi8cpx81hgbwd7zkd";
+      name = "kshisen-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdeartwork-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/r9f281gb1312wvy0dg8g8g5gd4f29mlv-kdeartwork-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "krfb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/r0b24gfzlljxq2wxxs6pyfvgacarvp7n-krfb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdeartwork-14.12.3.tar.xz";
-      sha256 = "14m5hb1rzki0h4fdpg5bm9s4bm6lfx2i939jncjvxik8l5rk8wkh";
-      name = "kdeartwork-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/krfb-15.04.0.tar.xz";
+      sha256 = "1j1mfjgza7zs3dsvm7aqr0w3lnia1svxrc47gd5imagqxzi5xb5i";
+      name = "krfb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "libkipi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w8s7d4pm150c4m392plhax8y1aawr8c3-libkipi-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qqn7jza6dgshhapkvj97a4i4960dy5da-ktp-accounts-kcm-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkipi-14.12.3.tar.xz";
-      sha256 = "1k20q3f5vgvndny7zj90r6xxdvilh1qg9vksvqn1vydz9wn15by4";
-      name = "libkipi-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-accounts-kcm-15.04.0.tar.xz";
+      sha256 = "1a45apf4vmjpsrbm98ym8k7qivmfaiwsdsf0f65vi91imlkfdd2x";
+      name = "ktp-accounts-kcm-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "okteta-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/388ffmw8i1b8bwdkwyr697fhq5cwghg7-okteta-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kgeography-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/arp2vca2a13jqqc37cv5pa03s4aayg1y-kgeography-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/okteta-14.12.3.tar.xz";
-      sha256 = "1wlimwi9j5x9y0j4zsx6d4c8xl8k7sr4wclbm6bi42fk34w27f56";
-      name = "okteta-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kgeography-15.04.0.tar.xz";
+      sha256 = "1gm17z7a4dgmqds3gvwf1scgxb2js5xvaq4f74hr1042jq2br0dk";
+      name = "kgeography-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "analitza-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0ar4zk7r20w3xgnvv79n6kcx3p0fjvai-analitza-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kqtquickcharts-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7iwcjypw2l9kkgm8l3dbchm47jziyjh0-kqtquickcharts-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/analitza-14.12.3.tar.xz";
-      sha256 = "1xlv47lgybw0wkmws6fkgjzskdmyzgrwgsfkixi2jj9yh8wj7jpi";
-      name = "analitza-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kqtquickcharts-15.04.0.tar.xz";
+      sha256 = "08p53xa49hwgwcp1vgp1c0pghj2l5a2g71s0q30xn7vz7y91bi92";
+      name = "kqtquickcharts-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kdepim-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/kbi014f4cakyzj22fviawpqzqkfdc2f8-kdepim-4.14.6.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/28krw7dahfrcmwlbfqabzd6bmxqx9fia-kdegraphics-strigi-analyzer-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepim-4.14.6.tar.xz";
-      sha256 = "1c1mcxj10cirxwkzb71y2sik0xk45j2a1yhkpl5lgs1k6xwivslv";
-      name = "kdepim-4.14.6.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-strigi-analyzer-15.04.0.tar.xz";
+      sha256 = "02zpwqcfi0v0f53y4i2x1yn6d3nynlp8x7xb4ciacvmxzssh9g0i";
+      name = "kdegraphics-strigi-analyzer-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kteatime-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2m3n25m9xjnig9q4vqbwg00li866lsg-kteatime-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "blinken-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/pr2d0pipsss9n5xdd9zrgv939smlrvwk-blinken-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kteatime-14.12.3.tar.xz";
-      sha256 = "0k35gmpkmsc7fqp31l7jf5as0f25lk8kqpj300alryyr9m5i960d";
-      name = "kteatime-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/blinken-15.04.0.tar.xz";
+      sha256 = "1475yf37nlmnqq5sh2gc8x1nbkypxy560qmdyar3m5cs69r77679";
+      name = "blinken-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "pairs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xgcvm6ic3xjzlbd8xblayybdjz5f8ah0-pairs-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "libkdegames-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/w7f148vp2gdz22fhs5g65qjzbl9h36kh-libkdegames-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/pairs-14.12.3.tar.xz";
-      sha256 = "1460wvjl17vzak74x5wgnx44db1vv900whl45hm6fjjciqpanb77";
-      name = "pairs-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkdegames-15.04.0.tar.xz";
+      sha256 = "1rwbr5pqn347rfhz56phswfzxmm37xpnw699si1612mkmmbl92ba";
+      name = "libkdegames-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kreversi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1q3i7f47j4mx8nrm0hl5hjjljn478a35-kreversi-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/jn27x6czz0lripamkjgkwga4cxyicmcm-kdegraphics-thumbnailers-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kreversi-14.12.3.tar.xz";
-      sha256 = "1l0pmaqwcdlzi48dcyywzlrswfr3jkywcpv93zdgxx9fba5iyhpj";
-      name = "kreversi-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-thumbnailers-15.04.0.tar.xz";
+      sha256 = "1p0alpdmhl3fm1r27cqiz80w9r1zmwj7pmdxf4f6mv2pf5q7z5kw";
+      name = "kdegraphics-thumbnailers-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcachegrind-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8wiir69l2blpqd1w4b7mcmylsm8j2q15-kcachegrind-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kcharselect-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1xvdiwnp84qn7cvcissssf92w4nx8y7g-kcharselect-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcachegrind-14.12.3.tar.xz";
-      sha256 = "1xgn2a3ahwnx00fish7n5djx2ci89shf8mjrrq8lkg3grka6cv6m";
-      name = "kcachegrind-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kcharselect-15.04.0.tar.xz";
+      sha256 = "1jfh1kzcazb4b4wqv6mjy69h8fx78zzf7xk60vzaks07b4c7x9x7";
+      name = "kcharselect-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kmouth-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hcy2r6snkvxxmnkr93y8yb5nhrzvk8a2-kmouth-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "libkcddb-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7in63wvw5njm2gqxqbsjvj8sh7j5zbsf-libkcddb-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmouth-14.12.3.tar.xz";
-      sha256 = "1awkwq4h89qp04fid6d6df03b7fj7rdk0vjs683rpkz52qq8xwny";
-      name = "kmouth-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkcddb-15.04.0.tar.xz";
+      sha256 = "1ldjfkppfhknln6hn3py8519p5jc63pf9apwx7h5jf3z6ci1k29p";
+      name = "libkcddb-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kcron-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7sxzmrmp6y6xn4nq7zfqbjg2cf8y4zhb-kcron-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kstars-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/vqrsgg7jlr6h8y6m2cp2fvv0jpbv8jvk-kstars-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcron-14.12.3.tar.xz";
-      sha256 = "0w33d82253yasrhzswmpccc75mrjyrick2s6s3gibskcy3c9rx5a";
-      name = "kcron-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kstars-15.04.0.tar.xz";
+      sha256 = "0mj6haknp9y03md9j007w5sf66529chififw0xy6a7bvnagaph2g";
+      name = "kstars-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q54chzx2w5p1ifvkh3dkmqwxz6q35m0m-kde-l10n-sk-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kget-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/cglfzvjxh6b61dyvla9q9g0qnw6rzlm9-kget-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sk-14.12.3.tar.xz";
-      sha256 = "0nfikvbf10gklcn33pmwamiix1rcgdxgxk84a360rkahafw3xb1l";
-      name = "kde-l10n-sk-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kget-15.04.0.tar.xz";
+      sha256 = "0v4gfik9ddzpddknrj9vp2d2awn2bjzn74n173njf90pbfnql3y5";
+      name = "kget-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yn6w6h0ypqv34595f10l0jd76v8r3mdh-kde-l10n-mr-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kanagram-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dh926v6zz23z9lqqqvhia5ilwxazd4lq-kanagram-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-mr-14.12.3.tar.xz";
-      sha256 = "0wmkg9rwl60q354y4kz0qmbwbv892v12ybps2wj4mplwq333d03m";
-      name = "kde-l10n-mr-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kanagram-15.04.0.tar.xz";
+      sha256 = "1iw2vp82ax93kbc7ffmh9wsgjp0a772vb2bxsmm5g5jcmjd8vcr4";
+      name = "kanagram-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/6azx1w8qq6g0aqz3jgz971k12va1si42-kde-l10n-et-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kteatime-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/mrdsmb6qaj32np3p3mcwi3sx38kmgvjj-kteatime-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-et-14.12.3.tar.xz";
-      sha256 = "1zpj0w3v1hwxpkfmba9k46w37qi41yndhm3ymdrgyl5xgfbajdrg";
-      name = "kde-l10n-et-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kteatime-15.04.0.tar.xz";
+      sha256 = "0g1hhlqhag0lllm8s10ylw5a6qwgsmb5hj33l2knbifa2sdg4v0c";
+      name = "kteatime-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nx1jxyya8da77jg1l5jrlb46xwdn9fbp-kde-l10n-zh_TW-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-contact-list-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/44z86p3l3axqq54wnvbbjavifp6jrnxn-ktp-contact-list-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_TW-14.12.3.tar.xz";
-      sha256 = "0qwykxa72c6pdzdd7kpwigrjv4l7d7kb1h06rwrcg9kk5q9hn31q";
-      name = "kde-l10n-zh_TW-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-contact-list-15.04.0.tar.xz";
+      sha256 = "08k2yplr67s66y4134n007kzsdxnrwgjhv09babprb4cbcm7pdgm";
+      name = "ktp-contact-list-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sajpc2529bhnd5p86sn0k35wyqj302ip-kde-l10n-ga-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/a66l0r6622i36x7njknq4rw77wq1z8f1-ktp-filetransfer-handler-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ga-14.12.3.tar.xz";
-      sha256 = "17mqxz2dpqyi1ngi1p2ivxg1qixivlkhzzd1id7ihff1i50f5gdf";
-      name = "kde-l10n-ga-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-filetransfer-handler-15.04.0.tar.xz";
+      sha256 = "0z50v3bq4i618c1sh5fa67il4vhn8mk5c55wlhxc2q8srr85ii92";
+      name = "ktp-filetransfer-handler-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m3gp02jxirgh246njwsslprfq627d13y-kde-l10n-hr-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kompare-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/lmbjfk56h71c44paw60x7wl6pd58yc0w-kompare-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hr-14.12.3.tar.xz";
-      sha256 = "0zv3rvrfn5khmbd495iqnsr579m6igz3fr6h729wcwmizm03kl7p";
-      name = "kde-l10n-hr-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kompare-15.04.0.tar.xz";
+      sha256 = "1pf693s580p208dbjj6d4w11i62bwfifjn3wmn2fd8fip3ajdgxh";
+      name = "kompare-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ghlk4l1xill1v93qnv6sp4d9ybm2m2p1-kde-l10n-uk-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/54xdq0xdkmw2z3j0zhfxi6gjvm60g919-kdegraphics-mobipocket-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-uk-14.12.3.tar.xz";
-      sha256 = "0jh17m47783vrv3c9wf7j67r937ni4xc670m758casjccwy9ldcb";
-      name = "kde-l10n-uk-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdegraphics-mobipocket-15.04.0.tar.xz";
+      sha256 = "00m5i5jdnj92jnjm32ryh8dlf3fzl2mzybm5w5y1a82fq9l7j774";
+      name = "kdegraphics-mobipocket-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/g4l10q0rg746928lmy4jfk63aa0y063r-kde-l10n-fa-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kdenlive-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/dacxkxjxhz3afz4165nv4siyn6sb5jws-kdenlive-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fa-14.12.3.tar.xz";
-      sha256 = "1imx7nmxx9p8xi290llyhh2hcaax6y458hlz8sid6kq0cl7y5w79";
-      name = "kde-l10n-fa-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kdenlive-15.04.0.tar.xz";
+      sha256 = "1ski64rqa1h1aqr16vwnvpqpww7vgfzbnlki3998k8gbc703q512";
+      name = "kdenlive-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lsw2ss8v9p5ryiszbfp46p1zqckqag5a-kde-l10n-pt-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "ktimer-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/nab346b2rb5dwkj4gdnjm2pyhnzf0i4h-ktimer-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt-14.12.3.tar.xz";
-      sha256 = "0wh5dgg53aic5n3h260f1908dfirp0k53hakn2kv53m3p572ck74";
-      name = "kde-l10n-pt-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktimer-15.04.0.tar.xz";
+      sha256 = "014jfyx4lizq2bh5yx73zarn9mzp4lkyaxvml0m8i53zdnacnqvr";
+      name = "ktimer-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ga5jirz4ggm0qacl4rzj4rlassiswls2-kde-l10n-ar-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "libkmahjongg-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/1rqzjg16kl3m8cc6pjf2cakhjx90kkhw-libkmahjongg-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ar-14.12.3.tar.xz";
-      sha256 = "1ybmp4id3y9xrxcx2grmv8w3412h1qmwzawrzixfiixazbg8jgfa";
-      name = "kde-l10n-ar-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/libkmahjongg-15.04.0.tar.xz";
+      sha256 = "1912k9h4j8rhly5x03anf4gzjs0aypbwh8ifvhn289gydccqfcyy";
+      name = "libkmahjongg-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rgsdz47748cn77nmnkysf1vhz5sgzwf5-kde-l10n-ca-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "ktp-approver-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/ijsjgpid0pnrq1d174gpbma6xfik9989-ktp-approver-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca-14.12.3.tar.xz";
-      sha256 = "14749nzfld9b97bk062d6pdpjdcfhga62n2yh1j1b0g5xqc1x0cp";
-      name = "kde-l10n-ca-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/ktp-approver-15.04.0.tar.xz";
+      sha256 = "0sfi4i071iini7bv9i7d4f952rnd5r89vqnhkqqrzbnmi9bh4rx4";
+      name = "ktp-approver-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nja0qv4yh272pjvwbbzk75zzdjn75dgk-kde-l10n-cs-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "cantor-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/7rf8al4ncyxkhzg899mssimw3lwf0qy8-cantor-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-cs-14.12.3.tar.xz";
-      sha256 = "1prhlp42vnpspj98kbdshv4liixhxak84xzr58mc8ij7whggi820";
-      name = "kde-l10n-cs-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/cantor-15.04.0.tar.xz";
+      sha256 = "0npl1p3gwflfl9rrvbi9ql28af6m1h2w46vkqh4ksp4d6jh9lx3p";
+      name = "cantor-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/avwqrqad41ryhdbx9dbr5m67nn6vqphw-kde-l10n-is-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kbounce-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/9b915jv5dcm7kinwvj9yrxs72vbsravw-kbounce-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-is-14.12.3.tar.xz";
-      sha256 = "17gw5isal9xk4iz5dr7qqvqx8j06nb2wzsxkkdxk5qgnqsxdn3d4";
-      name = "kde-l10n-is-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kbounce-15.04.0.tar.xz";
+      sha256 = "1jllvam65kjfanry4wl2yhhgi5hak0swiradyh15b73rb89w2lj2";
+      name = "kbounce-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cmp30mff1j0jq0srvvlhl28jr3jhdrwb-kde-l10n-ia-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kcolorchooser-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zhlxa8x34g7yz6wwqnhn062d4yxgl214-kcolorchooser-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ia-14.12.3.tar.xz";
-      sha256 = "0qgdy7b5gs04bszpp2byj9hx3mhy18y3l859si437i0jd3aa4b75";
-      name = "kde-l10n-ia-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kcolorchooser-15.04.0.tar.xz";
+      sha256 = "0g51v8641712fyycm3d6pkx8mlxkpp832l5i77f557lgi3dqfnh8";
+      name = "kcolorchooser-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4x1jjabkfwy5yk0ig70pn72awx9f1c7y-kde-l10n-wa-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "audiocd-kio-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/gcg36nagmfjc9w510pbihc44gz765nh6-audiocd-kio-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-wa-14.12.3.tar.xz";
-      sha256 = "0h23mnlhd53cpayhi3kpz7abj7786cf41n41m43b09ln3bw8d8i9";
-      name = "kde-l10n-wa-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/audiocd-kio-15.04.0.tar.xz";
+      sha256 = "05by4zrd3s2rkv915dq3ri6rhq39sl9wkw46diajkwzqdg6ajbiz";
+      name = "audiocd-kio-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z06s7w5m81vy7q7lm5vybpnlq75s69jz-kde-l10n-sv-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kgamma-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/zd7r3mali9j223lm28w0xx6fl4jkiyfd-kgamma-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sv-14.12.3.tar.xz";
-      sha256 = "14n0i4g484rxs2qx73jb0jh0a138anhj55x49inq7s0cigq2y1k4";
-      name = "kde-l10n-sv-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kgamma-15.04.0.tar.xz";
+      sha256 = "17xfiaz751q38q29s20k6fffshd3jndydnj54q4bd5l08fwmxmq6";
+      name = "kgamma-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y978vl8sv6l0ls2kh6hkcj77cnz3kcvh-kde-l10n-nn-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "knetwalk-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/65sm832j0rnm215vmd7gcrnnbj1gd2cj-knetwalk-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nn-14.12.3.tar.xz";
-      sha256 = "037z0c6zy5vbzbg0i1fnyi2b88by2r65a9vyihznr2k72yzgbl53";
-      name = "kde-l10n-nn-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/knetwalk-15.04.0.tar.xz";
+      sha256 = "0ljwgb5sb8x2g2qrvnl1lzmk34zcg6g1qfyp6p74h8lbhfk1vbgl";
+      name = "knetwalk-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/b15q4v2zmbc030xb1mdw746llfq2vq0y-kde-l10n-it-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "klettres-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/bnd0dnbv8ybywwzaskjlx2dvdw3l9afc-klettres-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-it-14.12.3.tar.xz";
-      sha256 = "0rmy7cnsbfgzmfhq3lvap7x0q1b97np2x1kz65qy1lkdwfvqlafg";
-      name = "kde-l10n-it-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/klettres-15.04.0.tar.xz";
+      sha256 = "1kzcqj1w5dcmc54v96q3s6v4fj86kgc9vdllg7l98bv9d2zcxpph";
+      name = "klettres-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/pzn66c19cgkxlwk4dc7p14pvsagh5bks-kde-l10n-pt_BR-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kapptemplate-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/qg0q54wpsmr1y9dfa72y24fjr1faqd8y-kapptemplate-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pt_BR-14.12.3.tar.xz";
-      sha256 = "0p2lfgf29432x7srx6piyi73gbqnwfcb6mrbgb5cbrlxmhazd0x1";
-      name = "kde-l10n-pt_BR-14.12.3.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kapptemplate-15.04.0.tar.xz";
+      sha256 = "01ldjxgsv422l9lay5yg5b9y0cbbwpfl8x41a1wvm9h2l4k0mn3r";
+      name = "kapptemplate-15.04.0.tar.xz";
     };
   }
   {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dykqy8mnwk56zyqscjsbc5l0v3caxcm9-kde-l10n-el-14.12.3.tar.xz";
+    name = stdenv.lib.nameFromURL "kjumpingcube-15.04.0.tar.xz" ".tar";
+    store = "/nix/store/g3mfvybxvh2rws76bdsvd7fcnkc3cjdh-kjumpingcube-15.04.0.tar.xz";
     src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-el-14.12.3.tar.xz";
-      sha256 = "1l9zjgq4mg1rsdk58csdm1bbvjfblh56isp275jm7fg05izc7idz";
-      name = "kde-l10n-el-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vfw1xmdblc7ryz4iyddkx04n6bpsmi1p-kde-l10n-ro-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ro-14.12.3.tar.xz";
-      sha256 = "1an38a8kq5b5xzjxflr4fpwq3ld6ryb36p2fv5ks3cgp14vs9bhc";
-      name = "kde-l10n-ro-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/i8h2ydglwf8j89g22ppja7waljid0an5-kde-l10n-fi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fi-14.12.3.tar.xz";
-      sha256 = "1v8kv7ack9l8w7pcy918vc5crhd43y35m1zkp87zdaqg9svsj893";
-      name = "kde-l10n-fi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/s3dxzagxplipcrfh3sz9vhxsbwlvd7v8-kde-l10n-sr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sr-14.12.3.tar.xz";
-      sha256 = "03ddq090ihma7y19l2ryjf69mbmqwigrxmhsyphkrpvkcch995vv";
-      name = "kde-l10n-sr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5r0zswdk5p3ais2gwwknzqh1y70v98rr-kde-l10n-da-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-da-14.12.3.tar.xz";
-      sha256 = "1nl2wvy1vg76rci4jkkgpp5ii49x6s348ps4mpj3ad46a1nxldfa";
-      name = "kde-l10n-da-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a9nqy8yh51xmprzq7g806hpp85djxci6-kde-l10n-es-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-es-14.12.3.tar.xz";
-      sha256 = "12bj9jp6l03skx8pn2b3hrbd598kg4zm4qj88nbf6l9mzjm2pjb0";
-      name = "kde-l10n-es-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zdrqq64485q0zz3m3mh11canxyn48i6x-kde-l10n-he-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-he-14.12.3.tar.xz";
-      sha256 = "0bsjnlnn703s5s3k8p68ic591zf2k6lcdizhm75dirrc2ydwld2p";
-      name = "kde-l10n-he-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nxiv4m0827jvvh9pl5adani2f83jd0pa-kde-l10n-ja-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ja-14.12.3.tar.xz";
-      sha256 = "05gl706zmw0jhw7ahdg61q0swy65459j6p6qzx4g6albrxqjr2ks";
-      name = "kde-l10n-ja-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y9sx89dk7qf8mdl18ga9s99kga8j50v1-kde-l10n-ug-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ug-14.12.3.tar.xz";
-      sha256 = "0pl9fs7gdsxafgiky7k2a6xz07xd02k3glpfd5wxa9ya6l0970nm";
-      name = "kde-l10n-ug-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3flzizssjcyxgsdp1diq0xw5is5xdxzr-kde-l10n-bs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bs-14.12.3.tar.xz";
-      sha256 = "19f6s5vylir9a695l0wx8fi63an2kgynmdpz3xadq197m1j8wd8d";
-      name = "kde-l10n-bs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/id2z95s1zn6v733fyh3wazrbfy40hyvx-kde-l10n-bg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-bg-14.12.3.tar.xz";
-      sha256 = "1hp1sa8cxsgifr7vaw7iqf8bydcnb7qnz9nnac0a7sx95ypvjmlg";
-      name = "kde-l10n-bg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d51bwij9xq5wh9scl66y66g5cwd27dai-kde-l10n-zh_CN-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-zh_CN-14.12.3.tar.xz";
-      sha256 = "1f5zqflfhw077zlhwdf3his89dq8g0c8blpd8rkh7sbbyqgxgcbx";
-      name = "kde-l10n-zh_CN-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wqrvb9c3daz3hc650q212j7j6aysxs52-kde-l10n-fr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-fr-14.12.3.tar.xz";
-      sha256 = "09jriffxnkmlcwmwplspy9znbz5fa8ad06pkapl35337cisyrdqh";
-      name = "kde-l10n-fr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/477qqq2pd57y9wb83kj2yhclvr8r6ixr-kde-l10n-de-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-de-14.12.3.tar.xz";
-      sha256 = "1y71jjigz5qg3cz16j1vrikddw94zzg00kc6ziw2dxk6sx8j7vxi";
-      name = "kde-l10n-de-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bpw0gllnd9asq0qkzksrvfni25ai7kaj-kde-l10n-kk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-kk-14.12.3.tar.xz";
-      sha256 = "117125baj789y88l533jpgfggz5g4i0j19qrqybqql2hys7vhvib";
-      name = "kde-l10n-kk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/37lal5izk34xpsw4ba5i3fh7klr8s3sm-kde-l10n-eu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-eu-14.12.3.tar.xz";
-      sha256 = "15albwrdigyk9fzgvqd23njxks0ri72j2n5isbh218gcpp3k6z3b";
-      name = "kde-l10n-eu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/isl6qfzmn18flary4fdcz4nnfh4v8wpx-kde-l10n-lt-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lt-14.12.3.tar.xz";
-      sha256 = "0z8qpy7r22rijhyfaidxvmafbbpha90imx0zk1cg8d96qn5iz1ri";
-      name = "kde-l10n-lt-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/34jssw40n5qml1s21bsdqw3an7g02g4w-kde-l10n-pa-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pa-14.12.3.tar.xz";
-      sha256 = "17ra2abhgbh1igd36rxkdx7n30qcmcbn85sy54zig8rdcznq4bjk";
-      name = "kde-l10n-pa-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bydiajxpa21jawxl5yd2fhdy4ha9ad43-kde-l10n-tr-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-tr-14.12.3.tar.xz";
-      sha256 = "1mwzryf00x2yaz6c4pm2459svs3hdjddms4xx3vv1r9aq7aavjqb";
-      name = "kde-l10n-tr-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3s8gz9b9mhymdiq262w8f1skyvz25c0x-kde-l10n-nl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nl-14.12.3.tar.xz";
-      sha256 = "0jm7z2m5ngb1z1nx2g1vwgkzj46yzm0a37br5jba9yka9dmr15mw";
-      name = "kde-l10n-nl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d3i513r1568j9pvqznjr94ygmpgb8zp8-kde-l10n-ca_valencia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ca@valencia-14.12.3.tar.xz";
-      sha256 = "1ybsw0r60gkxy3fshm2da5w4mlwfmanwjfwpjnwj40ydlgdi8by5";
-      name = "kde-l10n-ca_valencia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/90rfd4hdzch06plw672qfxzljqnk7x71-kde-l10n-id-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-id-14.12.3.tar.xz";
-      sha256 = "0kxss6f349mbhwafahwdv2zgfmsg5v9wp668q9xf0649d1h2w0ww";
-      name = "kde-l10n-id-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qb61jvp0gf8a76nkw1wqzq32mg2i926i-kde-l10n-lv-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-lv-14.12.3.tar.xz";
-      sha256 = "11x1csh4f4mmkbhdmk0dibqvl8cddr8y3m9jyrgs980k7kd9617f";
-      name = "kde-l10n-lv-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x9jkn1ngspshcja4z0h4zrlmrqbfc1a0-kde-l10n-pl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-pl-14.12.3.tar.xz";
-      sha256 = "17gbg4zb51alcp5g1bx6lbmbkzz0fzl8sbhswwc71yhkq4h9ifpc";
-      name = "kde-l10n-pl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zbrn541qzdcpsy20kf4mah7rqy64xwwv-kde-l10n-nds-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nds-14.12.3.tar.xz";
-      sha256 = "1mqhc2174g58180l13qygwifqxai78m7prvrd4nnmc22b86cb0i1";
-      name = "kde-l10n-nds-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7shjylawg8f357xm52zc2qxssqind29q-kde-l10n-km-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-km-14.12.3.tar.xz";
-      sha256 = "1244bjxs2kl7hmaj4v7bfw98vawcc5ipl73payn2ygxqiqmb2jgr";
-      name = "kde-l10n-km-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ab3swg0pgzwiihfn3vkqiw29gawrlfgf-kde-l10n-hu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hu-14.12.3.tar.xz";
-      sha256 = "1cjfy1wash2jvvr0l9s4am9s7ny1zvabbim536b6lmqhyk5bm452";
-      name = "kde-l10n-hu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/grsgaxij3fp3kqwlgfaqv0hzh0d6k3zf-kde-l10n-ko-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ko-14.12.3.tar.xz";
-      sha256 = "1chkk4zr7jqb0vbn3bhqpfvirpn5zqrih0124cyrfxmv4a19cz8v";
-      name = "kde-l10n-ko-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/27lgir5h7a95dgr1khc5gvk7rqmhvsnq-kde-l10n-hi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-hi-14.12.3.tar.xz";
-      sha256 = "16pmyi73yfr885xv31rfwq9ingm4cfd2p04wvrxs056yimip2hgz";
-      name = "kde-l10n-hi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d1ydfg70nkp219vhcc6pi62kxv275121-kde-l10n-ru-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-ru-14.12.3.tar.xz";
-      sha256 = "1x89kap46by47ra278r5inps9ab8mncfw76a2scpz7db9g0vfvf3";
-      name = "kde-l10n-ru-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xc5zsjaiyy9fzf8wdzz15g593xlkgzzb-kde-l10n-nb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-nb-14.12.3.tar.xz";
-      sha256 = "14fgxrld2q9y7w50kn9952115fviyqb66sxvi2501b6kf3xnrpp1";
-      name = "kde-l10n-nb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m11758s3nr89b0rzfw492ljzwkqkn30i-kde-l10n-en_GB-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-en_GB-14.12.3.tar.xz";
-      sha256 = "1fbn5rih063wgmnzzsdq5dzmw4vx4cf8jpqd0zjdp4jcja7a7z7h";
-      name = "kde-l10n-en_GB-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rg1m42j06j7sp2sm33107krg0b655hzg-kde-l10n-gl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-gl-14.12.3.tar.xz";
-      sha256 = "0gm2z3va0lxnk9k3mnw0crlaf946cd2v1nygzbmc74r986aiyrla";
-      name = "kde-l10n-gl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yidz4dma1zm6rx4axqpk37irpvmf96a8-kde-l10n-sl-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-l10n/kde-l10n-sl-14.12.3.tar.xz";
-      sha256 = "17vlwgsab5jq9r8vs5q7gwk77p9li8qk8d4997p75z9rmf95jx35";
-      name = "kde-l10n-sl-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1p0y7hq9pqw8qjy9a5nyrjlirxkxayrs-kate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kate-14.12.3.tar.xz";
-      sha256 = "0czcni5wfw56ar0r5p05j1wrmah98qv1wca95l5mya8fb17wcmnc";
-      name = "kate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ad9jhnfb216r0x6dicjx3px17mqnxhzr-kolourpaint-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kolourpaint-14.12.3.tar.xz";
-      sha256 = "1rcln9nqqzhzb0qlkdx81k0zspyyf266s3sa12npil2g9n1yh12h";
-      name = "kolourpaint-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9g2fg6167fghd9v5nz92sadiyyac6zmv-kruler-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kruler-14.12.3.tar.xz";
-      sha256 = "0px10ilji6blpfyp44f66m53y5dhcw9s2534pwhbx9xfkal1pprj";
-      name = "kruler-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/gg40xflg0y9c38rcg1q1m352zknrvmci-ktimer-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktimer-14.12.3.tar.xz";
-      sha256 = "198gx9j0x556m1vbwmyfgvayjpbws380pmrz4m58ylsvg5mcgwib";
-      name = "ktimer-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z6ql801ixafs2n59gb6fa8z2zr8wq79h-ksquares-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksquares-14.12.3.tar.xz";
-      sha256 = "0fyqs9b4bsgnaadcc0zhvsljmm83mc8brz1gsc7iz4pm3dnz74fr";
-      name = "ksquares-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q5rjxayccrra40ahwj8g8q3splvw10sn-ksystemlog-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksystemlog-14.12.3.tar.xz";
-      sha256 = "0a29n39jyrlgfijn99v48z3za4nnz6bambakyri8j9da1zzwn6hy";
-      name = "ksystemlog-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bfj7740qpfw5i6cjml9xf9648s9vj7wh-kshisen-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kshisen-14.12.3.tar.xz";
-      sha256 = "0h5l3m6xxq91v2fzc8p213iglvc78shqa3q0bfy3xbrnd3c8gkm2";
-      name = "kshisen-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/l294adqj7slk00ns53dr6p28jzbjz29b-ksudoku-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksudoku-14.12.3.tar.xz";
-      sha256 = "1scyqlfwxgkdwh93h80wzp7a55vvy0j0zxi9fl0ihsjsh20iv0bm";
-      name = "ksudoku-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h4x11ry35314s0max9aqh47k1pyfr22l-libkomparediff2-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkomparediff2-14.12.3.tar.xz";
-      sha256 = "1829sxn3y906hsfj6hqllx0hhwk2qngw9lvrgkcyqygb99ngg2bx";
-      name = "libkomparediff2-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/18ywxpzrac8brdqp56vm3jbly49dis8f-kamera-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kamera-14.12.3.tar.xz";
-      sha256 = "1hrvc6l4q69npxyafznhg5i8mybg1c7z4iwp98q5rzsdw5zppvs8";
-      name = "kamera-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/nkz7204dhnfjvjvqqp9id19l5xgzxzrx-kscd-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kscd-14.12.3.tar.xz";
-      sha256 = "1inl4sksyd27rp9g75h0900hs1hr6cb779zf92wsfflmk12gin7j";
-      name = "kscd-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dix33an8h17r8h03vnwml2fym44hrq5l-kdegraphics-mobipocket-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-mobipocket-14.12.3.tar.xz";
-      sha256 = "1ff6bbrhwa1jp3icz6mv9m9xl7f7b786yvg8dmc795wmm5hzr721";
-      name = "kdegraphics-mobipocket-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qnqwzdhg87x5dahx3avxcnys0j3k1qil-ksnapshot-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksnapshot-14.12.3.tar.xz";
-      sha256 = "13a5cri4dqn111p8q0idfgbahlx4ks2xjgvvgcwxd2srxifld825";
-      name = "ksnapshot-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/972ra01nd7jywn427qj5jz3gwibd2cyy-ksnakeduel-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksnakeduel-14.12.3.tar.xz";
-      sha256 = "0cjylhpsl33zgav8dyhrdl8qvi7yjafsf30drgjsc9jizhmn8hdz";
-      name = "ksnakeduel-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a3rr545r48ykp0rxfk2b643w683p0af0-filelight-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/filelight-14.12.3.tar.xz";
-      sha256 = "0am2qi6v2mr1rbl4jfjc4jaxg75511n2dvfr9zlsbhglfmzagmj8";
-      name = "filelight-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wfrkxk4f5hnvfwdraamqci3xap593sh5-step-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/step-14.12.3.tar.xz";
-      sha256 = "0pkj25jb7ydvghbx3187fjddsmck24k1kk4mms1hxp2i8xa11b1l";
-      name = "step-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/027r3fzd86qx6rfsc5lfas02cmn60283-kompare-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kompare-14.12.3.tar.xz";
-      sha256 = "1vjq7fdbdskhymwrl8i9945qbd0xaqgcrp95p8qpmafcc88nxvdl";
-      name = "kompare-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/kxpwjjlwa41agz76z15jbwb7b4s6x7ck-kblocks-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kblocks-14.12.3.tar.xz";
-      sha256 = "0y5f55z1i9fywfsspiyy467r2f11v7szwzhjrvacqf2g208mncwv";
-      name = "kblocks-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5j6v68g4gc7jvqrypk9s1m0grng8rpyn-knetwalk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/knetwalk-14.12.3.tar.xz";
-      sha256 = "1bakk8linrmgzn5zn79kj9bhfn43krpdahd989ba8ldfyz9d0hcc";
-      name = "knetwalk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/pgg1zvpidxgv1dacj7ncn62mizwjz0m9-killbots-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/killbots-14.12.3.tar.xz";
-      sha256 = "1b5chz21wxpmvi43iyr5gn2dh7azahamd8fwnjsdb49znyy5ab19";
-      name = "killbots-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m3sl4zcjky2smf0vky7lwvw8g79n2idw-kde-wallpapers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-wallpapers-14.12.3.tar.xz";
-      sha256 = "0cdaj33xim3rvq7ihwpv338g4s51xb36b6jszpfa9hnzxsxa146f";
-      name = "kde-wallpapers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/syx3k30s7j3s4v1hcb4azh176m4n7082-bomber-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/bomber-14.12.3.tar.xz";
-      sha256 = "0bhy5rjisq9f9ai36a0m9vhagdxj6jdyw0hlylpjl1ayy3qly1mc";
-      name = "bomber-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y1nrp3nf81v1v6khr86xdp9bjn7fnaya-kjumpingcube-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kjumpingcube-14.12.3.tar.xz";
-      sha256 = "16fgz0jicalls8c25p1hnd92rj3vwbbdli9wi1ljdv0f799h3z9w";
-      name = "kjumpingcube-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jahrwl1157161xh4dgjcnd0hnfq8x28c-kfourinline-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kfourinline-14.12.3.tar.xz";
-      sha256 = "026kvydxlrk7r91k9ffc27bsj0792shpziynh845ycbx9dy3nspk";
-      name = "kfourinline-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/l3zj17f3n998w3b3mf4v8jjib0a0p3yy-kwordquiz-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kwordquiz-14.12.3.tar.xz";
-      sha256 = "1r8ms2d59aa64wnmdv8psjn4bbypjzcpb982jpc6kfrwj391q2ig";
-      name = "kwordquiz-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y8lsccnmrc8r451j1b1igjxyrnvqpbys-palapeli-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/palapeli-14.12.3.tar.xz";
-      sha256 = "1wwnsvccshg2y55zcfpy2kvyplkjjbv96nacdfhln3yilbakwv1f";
-      name = "palapeli-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1nwhjxi7hmywfqiig8b60qaywwqircqh-libkdcraw-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdcraw-14.12.3.tar.xz";
-      sha256 = "0fw025nas8x70ji534j59d6vcsvqzr7yfcyls0yznlz5ppy4g9rz";
-      name = "libkdcraw-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9pj5rh11mpnr3grriz5x4c3ar5whn52g-sweeper-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/sweeper-14.12.3.tar.xz";
-      sha256 = "1y8yvjpd6v8s7xzgwkaa9sc4k715n53l01182j48lcyhfx6gbh98";
-      name = "sweeper-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cjd95qf5ppz9msqy2ggisilhhl4h0nvy-zeroconf-ioslave-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/zeroconf-ioslave-14.12.3.tar.xz";
-      sha256 = "0x858q6w1llcyy3933sqpdi53p8h2l1rbic1v1xyqbl4zdz9ixpp";
-      name = "zeroconf-ioslave-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/cbndc9qfgqbksmfq1q00lhw1a6qz52wk-kalgebra-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kalgebra-14.12.3.tar.xz";
-      sha256 = "0pm2dshg73yc4h16sjm37j1003zs6hrp92lkr1679541z02m2f2l";
-      name = "kalgebra-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bfpnby19d3qgqhkw3fb102v8j4qh9vi0-kaccessible-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kaccessible-14.12.3.tar.xz";
-      sha256 = "02h56bykzpkvk17snm88mb8cxsy2nmhjz1by18rg4cc2gf61qk74";
-      name = "kaccessible-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepim-runtime-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/91s8bj9j78cmwj5ijb8536ykmnh3k1fg-kdepim-runtime-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepim-runtime-4.14.6.tar.xz";
-      sha256 = "1jnwgfy7052fzlz3mic7cy5jp1v5j81f28h205x56h6p7nswk29a";
-      name = "kdepim-runtime-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bm5pazc7ch4k130xj2ikmdcz69490xl6-kmix-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmix-14.12.3.tar.xz";
-      sha256 = "132k71ymd2pbbsbcw91haaalxljxzyirfw33ppk5w9d9m46h7gk8";
-      name = "kmix-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yw3v6jwj76v2savll4mwsvy8bh9n3iv9-kbreakout-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbreakout-14.12.3.tar.xz";
-      sha256 = "1kzwdz0njqggy6h208lllswaqsrwr7hid4pi1f69hnh9c27a1vbl";
-      name = "kbreakout-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vv1vfxq2dd88qhz563dbzmd8gisrhdb9-libkmahjongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkmahjongg-14.12.3.tar.xz";
-      sha256 = "0kizdr1xn58wxblkkq5swy4vqap24cdcxl092aswvi7ql85zn2hy";
-      name = "libkmahjongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8m2kvp5j83yw25smfh55ka4x73bp3sli-kmahjongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmahjongg-14.12.3.tar.xz";
-      sha256 = "08y03hszmnmf7wawrznhqhak00gd5mcrbfndb538j44k5am60ddb";
-      name = "kmahjongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/smk5qi7815a13m4c6xb7vzz18vz5n6qf-libkdeedu-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdeedu-14.12.3.tar.xz";
-      sha256 = "0bja8qc2sbfq3ikhxk70fg72cj4hwbw4l7ag4zc9lq312jbzvkii";
-      name = "libkdeedu-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mi979pdj5cm4sz1qbbdvzr75731xjfbx-kstars-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kstars-14.12.3.tar.xz";
-      sha256 = "1gg96zny1vgsm1cyzxqlp617ly862r6ywv21vr99fismrasj919z";
-      name = "kstars-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0661bdzswm2n96vgix2vq8rp48jg2a1d-granatier-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/granatier-14.12.3.tar.xz";
-      sha256 = "182z9lnvrxhfp1jp4lb33ij07bvzvi79xi3ncicyb9p015s9mlsg";
-      name = "granatier-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/d6kz07a661dlyr950zmrirgsb52i8c5z-juk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/juk-14.12.3.tar.xz";
-      sha256 = "1zaw82px1qacfy612b9bxfgksyyvhlqrn0sv6p5dqzz01kg66xwy";
-      name = "juk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdepimlibs-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/24hs45qvjc6ixw77rjl226y0mldn14z0-kdepimlibs-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdepimlibs-4.14.6.tar.xz";
-      sha256 = "03fnxg2as2rri27ajkzm2wjma25pqd97h91bxka07b3fwcqimvbh";
-      name = "kdepimlibs-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2x4jzjdy5k10dcn15q3jfnlbbaihbp2q-libkdegames-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkdegames-14.12.3.tar.xz";
-      sha256 = "0dj39kzhix9h79mnw25535n0swpb04sdl1n4l9jnj306daf16g27";
-      name = "libkdegames-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/id1jxy17a8g7kwbhgk0h60f8rsvf1zz3-ktuberling-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktuberling-14.12.3.tar.xz";
-      sha256 = "0svfdfpvmwghv656rmip5y0c997pl6mlnq9ns88akqdjl45nywkm";
-      name = "ktuberling-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8myygl0hkb6l20xqj8wfynfx3zx45c9h-poxml-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/poxml-14.12.3.tar.xz";
-      sha256 = "1xw1dc9zc0wnn8h7dk115zapf8kgvm57nh2zrgmahy6ppza112bd";
-      name = "poxml-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/banw9x2cffxi8a0lal0x26v0c0vlypwi-kmag-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmag-14.12.3.tar.xz";
-      sha256 = "12aiyv848cdy0jkhbcj4ha3cg781ndjcffkl871ah7qy0sgcnkw9";
-      name = "kmag-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1361pwj0m3rxysay6njg9dz04in7k1sk-kde-runtime-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-runtime-14.12.3.tar.xz";
-      sha256 = "08ndk21mq547fw26gfa7vy88vxf78v8anbvjrym2k5f59fdx2aai";
-      name = "kde-runtime-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jns1ws94d4cklkzn7n9hk0a6zsbwyg6n-lokalize-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/lokalize-14.12.3.tar.xz";
-      sha256 = "0cy3zyzszbka19hy624rgxc07bh4hyfins4j2cwlivkszbssh8r2";
-      name = "lokalize-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y692wcc35c9dr5v9h1yjv33b0s87k3p3-kopete-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kopete-14.12.3.tar.xz";
-      sha256 = "1cdqcbafmmfq357n2kybzkfjwq926wb5lslpxbbpdnhiid23k8xp";
-      name = "kopete-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/31mxjkglzynxwi3h928n52mi6ldszww2-parley-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/parley-14.12.3.tar.xz";
-      sha256 = "0vzqsbr26l39akpch7f1xr1xwsdybszvd1f9rrdmy4rg9swc692v";
-      name = "parley-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w58yam9l13rjzh0cc4a16qkn9xzrl72m-svgpart-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/svgpart-14.12.3.tar.xz";
-      sha256 = "0jrhyb2ji2ii1pq7fmnyln12zhrqb9ahwpdq1x8ya56bws49qira";
-      name = "svgpart-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/i6l7hapmsfcga8b9agdi0ld2sss2maqy-kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-      sha256 = "1w8alhwkbffvwjfpja5pw881min6mv7vc1ag1qiblrzirsx4zhvh";
-      name = "kdenetwork-strigi-analyzers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m7vz5qmkwxbbs0f2251a0bbrl8g2jjw5-ffmpegthumbs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ffmpegthumbs-14.12.3.tar.xz";
-      sha256 = "1kni6fc1nb1n5zjqx736mlfcv08jp9nrchs7qkb2krzn4n5m0aji";
-      name = "ffmpegthumbs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5zhbmw2i3xb7axfyvq45qkp7dhf6xya0-kdesdk-kioslaves-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-kioslaves-14.12.3.tar.xz";
-      sha256 = "0w7ish8xpd7s26xmc9j9gxxy7b0lllv5px95g5dn4876qqcqpsks";
-      name = "kdesdk-kioslaves-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x2m1gbmqsq6zd48sbpmp2dz64d5m2nm5-kremotecontrol-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kremotecontrol-14.12.3.tar.xz";
-      sha256 = "0wy2jb9dx3bf8x22l0x7bqn8n45mn6jclnsb3saq7cns5905b68m";
-      name = "kremotecontrol-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7ckqs96cigik5syqj0ka0xk3m9ybphhx-kdenetwork-filesharing-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdenetwork-filesharing-14.12.3.tar.xz";
-      sha256 = "1icg45a2qsv1n19gsfg7w3wa2ysa4rkbx3w8maq8c7x673qs5kcp";
-      name = "kdenetwork-filesharing-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m2p9ipvfj9cdznrc736fjhbvyj3g3yz1-audiocd-kio-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/audiocd-kio-14.12.3.tar.xz";
-      sha256 = "1103f1ic5niy0zs4zvz841aaa6r4q0x0db4apnyvwbx51zi7qzsb";
-      name = "audiocd-kio-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4anl6k756x5n7j58rafxyx04sgxjlc20-konsole-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/konsole-14.12.3.tar.xz";
-      sha256 = "0apz7dn9lza69fgnylhy3md47palj3qzjhpihfr0qsgn6gzg6f7a";
-      name = "konsole-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rv12zii0hdwh4fb5mv08nf0qid79miy5-mplayerthumbs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/mplayerthumbs-14.12.3.tar.xz";
-      sha256 = "01hisifj8j88wz31q4dhj0qinzz0yw9fz0lm16qp3yxv7r7p82cr";
-      name = "mplayerthumbs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/6lgsi6phi4p3lyh7qvw3bqkixfad0fl8-kde-dev-utils-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-dev-utils-14.12.3.tar.xz";
-      sha256 = "0i6m5vs42c5mvznayh9rzjdp5rkcbl3aar909j3ir9kc3v3mi2ns";
-      name = "kde-dev-utils-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2ckqwp8l6cy1c35bvcbs4x26z1czsdc4-krdc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/krdc-14.12.3.tar.xz";
-      sha256 = "1q8s1wdmblfx8jj8acnkkyhx3rrn1ampskd9wx39jid8vznvkwpy";
-      name = "krdc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0hyjdsihgm0sn0gv2xsrijhqbgaqqn6z-klickety-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klickety-14.12.3.tar.xz";
-      sha256 = "1cz7aam2azgqilvz6jsbkfy3dpimh86f64vmkvlk3n42zkksp7hm";
-      name = "klickety-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sw2cca4mpa4y2dq1f0wjkqiqdxcjqkcn-kdiamond-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdiamond-14.12.3.tar.xz";
-      sha256 = "1cm793801nysqp90dcyvfvwxc9h212qrq3lhg7621h9fhq0946a5";
-      name = "kdiamond-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rb4li4dqgv2mw1w732pkhkxpvjxdb50g-ark-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ark-14.12.3.tar.xz";
-      sha256 = "0a6ggjg6x9kdlhm2n8l3dw4nn765lj78gn11yxgj37riq9yhg5xx";
-      name = "ark-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zpk335imsalsxqa7bfa6wcllxgcdipln-kfloppy-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kfloppy-14.12.3.tar.xz";
-      sha256 = "1b1zskwch7zz7iqfz3fa14q0bkrr2yjckr1h5fvn9k7q79x7xph6";
-      name = "kfloppy-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/c9z5wpwzpnvp5fiv5zbjg4fm8p8xrn7m-picmi-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/picmi-14.12.3.tar.xz";
-      sha256 = "0vlyn2f2j1p4734rcmqyjh03h4a2m79z9swfmlahh12gq5ka81im";
-      name = "picmi-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mfysg0babfpbzvpnh8b3a9kzk6n29ssh-konquest-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/konquest-14.12.3.tar.xz";
-      sha256 = "1il757w6xzvkaadangwfpkz14qx02wwdlflzffw9jis2lbz19qnh";
-      name = "konquest-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/dn3vmyqlm2qsi52bhfl1cyafza31b6y9-kalzium-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kalzium-14.12.3.tar.xz";
-      sha256 = "1mnkhp5wlc3rmxyw4lli5smb419vzkv52aqpwakyncrz7nxkyk24";
-      name = "kalzium-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fi9lq4lqwclvr627x32q8lr4cwcxbgng-kde-base-artwork-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-base-artwork-14.12.3.tar.xz";
-      sha256 = "06v3javkhkchpjc3sv7x5mk2jgb1366mi18dzwg63h2ca8740wn1";
-      name = "kde-base-artwork-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2fq724w1bqmiz9hqqmhds1f0zj18k8dz-blinken-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/blinken-14.12.3.tar.xz";
-      sha256 = "0k4a5r4rq5brh5xv2lm6ldwfv1qy5wiqnj0ycp55p974isbdgqsb";
-      name = "blinken-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vqyn4qdsgnai9a9w944g0jqpmvzqg5b9-kcharselect-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcharselect-14.12.3.tar.xz";
-      sha256 = "1ycx0y82f4ah5fg9ki62fwnnhyly1sqs52zs4519hnmyqn7h7q1v";
-      name = "kcharselect-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x66xrvdlnwcs8g6l3f4iz9fvxhw61v28-umbrello-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/umbrello-14.12.3.tar.xz";
-      sha256 = "0f5qn6h89hj4n25p2nkcgqb0xk4qvlwi115n5qlsmbc3icj2j7cy";
-      name = "umbrello-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ah3xdqjxw5h29qmjc4wdb1c5i9zdsl40-kget-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kget-14.12.3.tar.xz";
-      sha256 = "04wf6qncq1xdfrp9j5cnhdii9hj83wjkp5i168flzi292sqyw9ia";
-      name = "kget-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/68ps9qh0w9mq4qawdzzjyy1h1y33wfqs-kuser-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kuser-14.12.3.tar.xz";
-      sha256 = "1xgd3g2fdanl28sar3mgcsnld69nczcdanvaqslil4vc7d8r1xim";
-      name = "kuser-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/60ipws592hnlygalmkzgzmlwnhmkvjg4-kigo-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kigo-14.12.3.tar.xz";
-      sha256 = "093bm60yaj8v8g6n7x4ysjbxph6xgh9ylarhdxsrjpmq268wql31";
-      name = "kigo-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/zk9mrrc8vkzq41bx7sfyjc3lx73jzlqm-dolphin-plugins-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/dolphin-plugins-14.12.3.tar.xz";
-      sha256 = "16kxzpnfy8cxy8v1idwsisqq0p13n14zcid9a5n1sv02w91c02rj";
-      name = "dolphin-plugins-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/z8kgww8c0mqwx6cfsfqm8yd58k71xvrl-katomic-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/katomic-14.12.3.tar.xz";
-      sha256 = "0rbhf8j8if5r20l1cryl4irgd8p94ikbsz6456y7v8fzv5mf6kgn";
-      name = "katomic-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jqamjiig020rvvyqwjarbxqj29ix93yi-rocs-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/rocs-14.12.3.tar.xz";
-      sha256 = "14k5yx0vfpf0fllqi5f72vz2135qag6gb7hs7523jaavxkb23d1p";
-      name = "rocs-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9vhmysfqpabx7cwrqsmkpgh4hinjqh39-libkcddb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkcddb-14.12.3.tar.xz";
-      sha256 = "1i8n63jpckc3fa27rcqyrf10cz8zsyjyvrpa7fgmggsf91k1c144";
-      name = "libkcddb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bz14zb6rlkwgmj0l8q9nffar2443zcaq-kdewebdev-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdewebdev-14.12.3.tar.xz";
-      sha256 = "17qy41gww688klpv2cgnk1r3cnd9sq72bsga82d7dnk0v6dinlxz";
-      name = "kdewebdev-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/iq7fn9lp4fh2s74lrb2r4v39n66c8a7v-krfb-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/krfb-14.12.3.tar.xz";
-      sha256 = "0258ffj2wx25cycpw3cmvnw9ig874jpi6yw711w6d8nfy66ribpb";
-      name = "krfb-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/yv1ixn2gwc8vv32m3y5axy3dn1p3sbrv-kde-baseapps-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-baseapps-14.12.3.tar.xz";
-      sha256 = "1zcjbhnxzqxjn4xs6pwb8cvcnjypa4yh09jr4frd82nfhdsq7nyd";
-      name = "kde-baseapps-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7f8qlf08l8fwykz677xywlfdsf8j1pml-cantor-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/cantor-14.12.3.tar.xz";
-      sha256 = "106k9gp4r2241yh6np8mbq587chwkicxk7ssbpvvvg2m126idz9y";
-      name = "cantor-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs-4.14.6.tar.xz" ".tar";
-    store = "/nix/store/24zfmzbi9q832p6i91i71sms1vk3rfg2-kdelibs-4.14.6.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdelibs-4.14.6.tar.xz";
-      sha256 = "165xn2bv03j2g4j7m287add40kwhccvp2ci5hrar2xfd9sgl24xk";
-      name = "kdelibs-4.14.6.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xl12n09yvf5j7di78mrkxxhfnn6axijy-kubrick-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kubrick-14.12.3.tar.xz";
-      sha256 = "1g9ls282qy6s0xsaa50ck0gkiz980cx50zjjhq4yimlhp1gswmj0";
-      name = "kubrick-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hq79f56cq1gqw7nfxcfliqi4k8kjpkd5-kpat-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kpat-14.12.3.tar.xz";
-      sha256 = "1787qymlsxyi7dm2q8axpjl3n62qx9xv7diyg8627kkjm1a1xw9r";
-      name = "kpat-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/inai3p0228fmjcr8vkbnbhnvpznwvrgz-marble-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/marble-14.12.3.tar.xz";
-      sha256 = "1ylhc3278yqdcsli6yw7bnci6mdx01g0r97m78bs74l5biz4yql4";
-      name = "marble-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/szdzjvc2h3w5dpp154m0kqh5i0spk771-kcolorchooser-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcolorchooser-14.12.3.tar.xz";
-      sha256 = "1v8mgv5pjl3g6igxs92qd3zn8qr3qip046pb77856qhn3d9s4pqj";
-      name = "kcolorchooser-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rfk8bxw07690a9kncmcdmlqjx7qkrld2-libkface-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkface-14.12.3.tar.xz";
-      sha256 = "0zp48mlkqkjc6wk81kcf1q980196q0m153kzfjahi5w4vlslzgam";
-      name = "libkface-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/w2gc6778llzkl8qbzdl582ay45rwn6wn-kbounce-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kbounce-14.12.3.tar.xz";
-      sha256 = "1hn09ghhmj2dk47vnkqkvrm87n50m506mmzq058cccjlfdah5iin";
-      name = "kbounce-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jplhnd96n48zih1mbf6bx96xl5b35kdp-kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-      sha256 = "135dcs9ppa8lv5va8bqmccfxj0hf5f65qprx7l02k74xj4k70yki";
-      name = "kdegraphics-strigi-analyzer-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5aykxgy1by52pcfmv1z990kz6xpwjj18-kcalc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kcalc-14.12.3.tar.xz";
-      sha256 = "0w5pl11vw0d2g3pnxb3ffig209r0bjg135163crnic9akfbfa9s5";
-      name = "kcalc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/1lk25ql2cgisdm7yhjyn1ac416h8qdc0-lskat-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/lskat-14.12.3.tar.xz";
-      sha256 = "0k5wq5naj0ahmnwpvdrif2clzxjwr9jk6p40igakzanpp23i6p9k";
-      name = "lskat-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/vvbs6wghnrbrq9yd9v647l227bzsiyaa-amor-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/amor-14.12.3.tar.xz";
-      sha256 = "1y9cia887lqbcs6nr08mbrxr8shb895wvxf5jg8w6iic6pwy516c";
-      name = "amor-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/sxi3wlcwn3gbkmcama2vx4dg45xwm7sx-klines-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klines-14.12.3.tar.xz";
-      sha256 = "1xsrkbjdnw4icchbr5y7w64y6szfv8qdzndwd2bgrw0yvyjg5w7x";
-      name = "klines-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0al1vmsjw3a94arnw19k59gajw3kpxdd-kiriki-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kiriki-14.12.3.tar.xz";
-      sha256 = "11c76kq2pji07xfbyf2621h76sjx9pqdj3qqzydzbwdinxy0bgz0";
-      name = "kiriki-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4bw6lkbzy88kl09gk9sv494xw4a004a9-kgpg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgpg-14.12.3.tar.xz";
-      sha256 = "00qjgkgy1d8wygc298z3v7y37j47w16pjzp8ssnsdkmx88h1dp3i";
-      name = "kgpg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/97i8x4wydz1z4p2dfg2c04xvvblpdds0-kolf-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kolf-14.12.3.tar.xz";
-      sha256 = "12h4817ky9xwwrdqgba515dw87314ijci4lwqvcqmm7rq44qac8g";
-      name = "kolf-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/k35761pidfd258y0fjbcr1c22y5lwzhf-superkaramba-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/superkaramba-14.12.3.tar.xz";
-      sha256 = "1q6qpmwyics1mb44l55vy5wyjd0d5mbsm780kj4y9l6mp98b47c0";
-      name = "superkaramba-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h55lr5qacws82h167r142367mldrq50z-kapman-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kapman-14.12.3.tar.xz";
-      sha256 = "1i3ci8qpx8njr250pgkz7zlfihyi3k6vc2vnw7dcv09qfby466qb";
-      name = "kapman-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/y0xl8ckan6cwmz35mvzsjv35a55s45s9-khangman-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/khangman-14.12.3.tar.xz";
-      sha256 = "1y11jwsb1ba55hc2sx0adffvrck1mrn43wna16zkrh1sxk7fk8r5";
-      name = "khangman-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/rdh9ivzb5i8xilvp5v05k6szxv9nhv40-libksane-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libksane-14.12.3.tar.xz";
-      sha256 = "162bi5d6kbx7zlb4waha82ldg2j40rwcg1gikfahkjsprm6npmh3";
-      name = "libksane-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h4if4axrpc0sdn6xmazgn2d5xhkbpr0x-kgoldrunner-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgoldrunner-14.12.3.tar.xz";
-      sha256 = "1kg9mskg3aj0bp8h8y5bfkapmw4iys42aw3sa7f8zfkqp993zsw8";
-      name = "kgoldrunner-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/30xn0rg0g32p4d00i9z4xs95lp504six-bovo-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/bovo-14.12.3.tar.xz";
-      sha256 = "021pmar0g7s0p7qrzimp2x54idy9pdg22y8mgi26xrk9n7i5yybp";
-      name = "bovo-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3ajn3gyhisbdny0q3qskhn6r9wkw0aly-kgamma-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgamma-14.12.3.tar.xz";
-      sha256 = "1ywpkg7zbh9xy50a53dmlz1rsli5gdc52l50v14gm1sdjl2sfjpm";
-      name = "kgamma-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fhr2zhxsxlc5fl15l9fil414jaxw98hz-kajongg-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kajongg-14.12.3.tar.xz";
-      sha256 = "0fdvwv5jbmc42wzc2j5y4adjqqwzq6hvl8b7nzaknphvpk7257hj";
-      name = "kajongg-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/7q3rq4gjjkwxjlliqy76x14h45xxzhhf-kppp-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kppp-14.12.3.tar.xz";
-      sha256 = "00517rl2b5zaf42sziar2cj878dcii6jr1mx8jicq293f171krn7";
-      name = "kppp-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/jdxf1cy03k03r51kqa1klb3ib5jvd8jy-kmplot-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmplot-14.12.3.tar.xz";
-      sha256 = "1fq8m07pgmcfp1cr7q0y90ngaj282nz1pw5mqdfjh9syfradli0i";
-      name = "kmplot-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/wrk2mg2h2y34s0gysr095d713wim7brw-kdf-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdf-14.12.3.tar.xz";
-      sha256 = "1dd35frqxgqmhakc6f7xs6sck061271cnfym9bsd5q6fxv9s8vdp";
-      name = "kdf-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/8wa0nvqryc7gzxfk2sgbsavk1q6p3jpi-knavalbattle-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/knavalbattle-14.12.3.tar.xz";
-      sha256 = "1jl5f2ndgnffhmgpcc4in6rryshph3p12d1xa2ixw36xyr45hcki";
-      name = "knavalbattle-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/macznkbfj12i3nfcks2fr29fy24vlda7-ksirk-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksirk-14.12.3.tar.xz";
-      sha256 = "1h3dgp2j7lz13j16k1j5b7wyg0g4x08svw1v2pc15llakr39p88m";
-      name = "ksirk-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/ja14bgwgs1wp8831ipa39s9zhayjfqdl-print-manager-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/print-manager-14.12.3.tar.xz";
-      sha256 = "1n1m5w3p4r97y7jp76q35z8g39ipfaldkgbfbz47i89bc33zaxy5";
-      name = "print-manager-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/44frkjvk64qwj15g2pfh8a1ficag137d-artikulate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/artikulate-14.12.3.tar.xz";
-      sha256 = "1rv51nk2lqvxfgwsxyzq9cd1qq68nr6z7r5xis83smc4gnaczajh";
-      name = "artikulate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/9pd7p5vl53w6i6m324km5xkp6v967l53-kdeedu-data-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdeedu-data-14.12.3.tar.xz";
-      sha256 = "1q1vw5dprvqj7yyg9w39ndy8nvnnhkbladylv0kyh1491ba2a3kb";
-      name = "kdeedu-data-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/x30qa0vibvxxza1pqy9a4ddnj4w2xhcw-kturtle-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kturtle-14.12.3.tar.xz";
-      sha256 = "0hxnc8lfqrfs5njaym54kl4vf2q6jakgif90saxfm50irjbwlg34";
-      name = "kturtle-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/734ajz153q37a4pzyh464q9aip528d77-klettres-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/klettres-14.12.3.tar.xz";
-      sha256 = "01irm9pgh46rghbmmwwrdb85ys2gv23h46qaicv4zp73bl6mhn5c";
-      name = "klettres-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/bj1igafd6x86fay8syr6d573b05472mc-libkeduvocdocument-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkeduvocdocument-14.12.3.tar.xz";
-      sha256 = "060p8sh3rbbajykjw1z2ba3xnv1bq8ns86yfwx2lv2jyaqpkkgyk";
-      name = "libkeduvocdocument-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hbrdr0fizjfwyf4p317gwgii4ckxr9bx-libkcompactdisc-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/libkcompactdisc-14.12.3.tar.xz";
-      sha256 = "0957qd9zzbnksi1zxw1av4zxwzi48pq80jpk5h1id7cdhlfrsxz7";
-      name = "libkcompactdisc-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/m37c7klxvf2nz3byv04b763sls4j6h8r-kdesdk-strigi-analyzers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-strigi-analyzers-14.12.3.tar.xz";
-      sha256 = "13q7cy274ibsisvchfagb5mh4iq2wpm12zriwn625ciajy1zbq1r";
-      name = "kdesdk-strigi-analyzers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/5ibmcrrhacqq7qn5zfq7fp1y3qwj90jn-kiten-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kiten-14.12.3.tar.xz";
-      sha256 = "0iy508g6mp7gibzv3m59hjjcvl32h03pzfqj8k6pgq0jya0bqvvd";
-      name = "kiten-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/q2v3p0k65zzhmzphawir64a3x8k7qmbn-kwalletmanager-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kwalletmanager-14.12.3.tar.xz";
-      sha256 = "1sbbgvwh8d5pv4p5z89gk29lz2snp4glinpa3y2dg9s9chnn0qj4";
-      name = "kwalletmanager-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/hcpxv7a1j4r0pavak6zqps9kb4mlgj1a-kanagram-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kanagram-14.12.3.tar.xz";
-      sha256 = "0j8l5cx251wvb2s6xzdsx45cgwzpy8a97lbss8lhhfrqwqn62lh4";
-      name = "kanagram-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/v5rwasilq989vbmqqnj14cqq87gmvpsr-kspaceduel-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kspaceduel-14.12.3.tar.xz";
-      sha256 = "1z1p5wy39xkyplhdq8z3p61flnyzh03yhi28yc0f79iqx22psvjb";
-      name = "kspaceduel-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/amjyaqjvc88397nj2g54z6djs5rj5mgm-kig-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kig-14.12.3.tar.xz";
-      sha256 = "0vhamrasgazjn110ahh09a402vhsgqh8h5v1qqmvi49f6v44bxbb";
-      name = "kig-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/4fzqz8h97hnn7v0q2gadc1mp4xhssl3x-jovie-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/jovie-14.12.3.tar.xz";
-      sha256 = "12ky24hkpqm0bhi9x8fm6bf0nfqclpr5yv7n054995k3irygz9lz";
-      name = "jovie-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/81d3gi968mqnzps5v56lfi4dzkq7vfkw-cervisia-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/cervisia-14.12.3.tar.xz";
-      sha256 = "094x08jf21h5f0vjx28bqj207csh56rc293bs4sl8lg9d1h0gbax";
-      name = "cervisia-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/2wh0xa17ikpsbm0addwb502rvld07ici-dragon-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/dragon-14.12.3.tar.xz";
-      sha256 = "0fngv700yhlh0q73njwfl6szf9v57csyf0gpqf1hyl9wvv2mwswj";
-      name = "dragon-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/a3lgzwlizzj1yp4n1v0k80h45rzml2bz-kqtquickcharts-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kqtquickcharts-14.12.3.tar.xz";
-      sha256 = "01017d0mww3ai4i8ik29kfwkakyp92ngrjm6704015i0wili09i0";
-      name = "kqtquickcharts-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/r5721x8a5aasszaw7hnj91iy90sy0007-kblackbox-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kblackbox-14.12.3.tar.xz";
-      sha256 = "1kmdxiy30cm3jrgi6kdg15rrwyyxgnrb51w3bfcgaqr48kz73id6";
-      name = "kblackbox-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/xgnk2fv1a5q0xsy80xwn2p57vn10w3z7-kapptemplate-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kapptemplate-14.12.3.tar.xz";
-      sha256 = "0gwx51df5qms1vy1b6csbllcjy5xs55xmscz4i2n75ba7dsw9ivy";
-      name = "kapptemplate-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/409f1vaf4n42mhdyxmjw0vf670frpgwg-kgeography-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kgeography-14.12.3.tar.xz";
-      sha256 = "098j76mk1lc7wjvwybvyb04zaysmmn9zl9y35r4yhr11lv2v2idf";
-      name = "kgeography-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/h3c8xaj4wybcpndp90x5qfr9602l6cr2-ksaneplugin-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ksaneplugin-14.12.3.tar.xz";
-      sha256 = "143j3ck5cy4678fx9d0jv3y8zvbkvjxc8kyx3n8hmm4plin54lah";
-      name = "ksaneplugin-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/fsviwbz3j2lx8d9hnscq7i6ncm1svq2j-okular-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/okular-14.12.3.tar.xz";
-      sha256 = "07snh1z38s1ycwfsirkzh91dw13hkf0lq79das75qjjladv3v9d7";
-      name = "okular-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/062pw1fc4w3nsflchjnzr33agfr5zpaa-kdesdk-thumbnailers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdesdk-thumbnailers-14.12.3.tar.xz";
-      sha256 = "1vaw2p5y9q44yfcs34f501baga1rhswgawn2brglfada6y2b89jk";
-      name = "kdesdk-thumbnailers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-workspace-4.11.17.tar.xz" ".tar";
-    store = "/nix/store/hgca7dsswq9axlaalvs1ci8zh0sl8j4k-kde-workspace-4.11.17.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kde-workspace-4.11.17.tar.xz";
-      sha256 = "0pkn49wis90v8ky8hasa80x6ji59sswlb5ib3hzr67mk191vhlhx";
-      name = "kde-workspace-4.11.17.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/kap125hfflfrp7nb58b7vv3w2kp3r6wh-ktux-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktux-14.12.3.tar.xz";
-      sha256 = "0yg3a9wnn4rdbainypq8v6hw57flgsqsq8h8rzb6iy6hwnw8pc8p";
-      name = "ktux-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/li6azfrf8qsi5ai8vfrfq0md8cw581p7-kmousetool-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmousetool-14.12.3.tar.xz";
-      sha256 = "14n79dlfiyd3pz3gi6sg71nd2p5vp18sk99bh7qz1dyid27v6z08";
-      name = "kmousetool-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/mlpp2nwbyg3dscicj50795c4bxbmzcqq-oxygen-icons-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/oxygen-icons-14.12.3.tar.xz";
-      sha256 = "0apfpfrpxjrnxf6c4bxxfhys9k7wif74yx9bbysrrndw4bvv0nx6";
-      name = "oxygen-icons-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/3hpc3hmys0i16sh7aqmlw46flk6r110y-ktouch-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/ktouch-14.12.3.tar.xz";
-      sha256 = "1z084yi4s1i5nqir2izdaa5gca3216gqb00mr06044pc2h059j6h";
-      name = "ktouch-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lvsdhfw8c30z36yyjfcxprcw3ik3jb2s-kollision-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kollision-14.12.3.tar.xz";
-      sha256 = "1gfzya87q202az63dvrfpyf70khc27vh9nj5hriyql0kzyqy0xgf";
-      name = "kollision-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/0vnr7sljdzsxpkdyzz08yspr6kcbj0vn-kdegraphics-thumbnailers-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kdegraphics-thumbnailers-14.12.3.tar.xz";
-      sha256 = "023b1la31qc2b8rfmc3nxi29pd3jld6p2ivi1sdl1pybcillzpax";
-      name = "kdegraphics-thumbnailers-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/lrkq8yk3wr9gwivm2177vqv5y2sh7zcf-gwenview-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/gwenview-14.12.3.tar.xz";
-      sha256 = "14kwdayzffsc8nk20xl86gqspbvrwja9x8h2dc498cqag0l60hcw";
-      name = "gwenview-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-14.12.3.tar.xz" ".tar";
-    store = "/nix/store/qgxz0771xbp8zvqplrv3g8rc89025xqa-kmines-14.12.3.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/14.12.3/src/kmines-14.12.3.tar.xz";
-      sha256 = "1xbpdq8250srbg2c10iz44aa6i19srk4x0f0bcsjhc53r8680g0f";
-      name = "kmines-14.12.3.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-accounts-kcm-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/fzwlsgxvxd1xp98ba1ksfbwjn20da65v-ktp-accounts-kcm-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-accounts-kcm-15.03.97.tar.xz";
-      sha256 = "1m9z8h2dvbwj9rxqp5kj24ndqp070nhi2qk1k07qc7shcivmcpzb";
-      name = "ktp-accounts-kcm-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cervisia-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jszqrw79x8cxbpckhg73npzirli3axjq-cervisia-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/cervisia-15.03.97.tar.xz";
-      sha256 = "0aqfxbs1ssdpijvrw51qy131mns6br18mgv0nvys6l83ssanpn9v";
-      name = "cervisia-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmahjongg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ygn36njvhb5vcy560z70ppzv13ilbb99-kmahjongg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmahjongg-15.03.97.tar.xz";
-      sha256 = "0x5qm94a3q2r0kq0k6n8iylbzq9binbkwbb0gbcm9hnylyl4chki";
-      name = "kmahjongg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "killbots-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/38n1ajabh2s6sq3xlvxkv8r759fd8xwl-killbots-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/killbots-15.03.97.tar.xz";
-      sha256 = "0l0xjhc7vxmycn8j88h42lirl6rbn29x4rc670kcgm6ly8la5zki";
-      name = "killbots-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-common-internals-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9zzgdr465wngzkgjplykk9l8d5shcicx-ktp-common-internals-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-common-internals-15.03.97.tar.xz";
-      sha256 = "1b813w17k013gik8i2ji2bb0m6pa8mab4bcqwsx95mv72l25ld4i";
-      name = "ktp-common-internals-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmines-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/a07306c2bs073jkq27d8kcd97cyp153r-kmines-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmines-15.03.97.tar.xz";
-      sha256 = "089y8jzqcd1s0q0cfv9i7hcj18rj7vhmiw1rwr0pwfmnixjrn2hl";
-      name = "kmines-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kspaceduel-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6vq7sl95pb7bh7w2gk7z1sgsl6zinrsv-kspaceduel-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kspaceduel-15.03.97.tar.xz";
-      sha256 = "1jfszdx6lj57c74zmvrqgzxvzqfd6zkl7irf6b3dxjg3damsfsjz";
-      name = "kspaceduel-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkgeomap-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/3vpnb3007jxrmhr21k52nln8f73dn8lh-libkgeomap-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkgeomap-15.03.97.tar.xz";
-      sha256 = "04q45hfhck8v4hxyw7fszvz48gch4pz2aqql98ynhshx19aj4c0w";
-      name = "libkgeomap-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kruler-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vkrpkcplvfa7mrfdjv0is8w52fzlldiz-kruler-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kruler-15.03.97.tar.xz";
-      sha256 = "0f6z9ii72dkkx8jkmf18k2mlxnflpd2n5qb36s0rzndli7n71x9n";
-      name = "kruler-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksystemlog-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/v1qxds25w9yk7m0ym2xjgdhj5ag8g9zn-ksystemlog-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksystemlog-15.03.97.tar.xz";
-      sha256 = "1mvj308sf17ljs74y7xc1ynnqblvgjzblblfnihmg6wlbigri3sb";
-      name = "ksystemlog-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "analitza-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/4xmy1jf4ng641bshcgczy4vq1jlz4dc7-analitza-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/analitza-15.03.97.tar.xz";
-      sha256 = "0p98dcynn33yssc84j5aykhiiwdd5hgg7jdpvdzbwcqdnbnkwp11";
-      name = "analitza-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kompare-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/idhczh8j0f8h7ibbcprmrj8z45hmya0c-kompare-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kompare-15.03.97.tar.xz";
-      sha256 = "12whm20jxhcqcpx7br7m54dcbjl1z0ngjq42zn2ldp43lgd5hjpa";
-      name = "kompare-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcron-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1svwivcnq60pbnv11wwcq0vhlbyydcri-kcron-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcron-15.03.97.tar.xz";
-      sha256 = "18z3kn8ay69nk1anawm6k08xl4xng7rpzvqmxwiyp102bvbxv6xr";
-      name = "kcron-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kppp-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/n1ix532hcm0m1agsknsvxhmghir7zfr0-kppp-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kppp-15.03.97.tar.xz";
-      sha256 = "12jibm5xihq44kxgv7g1zfyhvp9nbv0dyxnb2gwarngqa0yv20sy";
-      name = "kppp-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ar-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dv34q5wny1n7xwz590xcn1j3k1k3s1lf-kde-l10n-ar-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ar-15.03.97.tar.xz";
-      sha256 = "1jzal66wlkdqd85dj4rp5akrrbd80iw72swdnav3zbwlmcs53val";
-      name = "kde-l10n-ar-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dhp5j6702hjdjyl0im5sq4pcsmyc4m6h-kde-l10n-sk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sk-15.03.97.tar.xz";
-      sha256 = "1sm9axz2mwgvw2gws2bmr2c2nj7fk1gnmry19432b7sf7khil9as";
-      name = "kde-l10n-sk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sl-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/q0ldpyshshs6grvdpm73d533dkdscizc-kde-l10n-sl-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sl-15.03.97.tar.xz";
-      sha256 = "1077lzin7ygjbcfb613c2lj83jiqxn85zchlcmxbkz2fmh3ycwy8";
-      name = "kde-l10n-sl-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lv-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/cbydlyizpj9nncj80a2my7anydmw11if-kde-l10n-lv-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-lv-15.03.97.tar.xz";
-      sha256 = "1x36i97a8hpkbqgxd6cfcqvyx3a1i7cl0s4bhz94kjvncmn5f55r";
-      name = "kde-l10n-lv-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-is-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lzzcc3d64wy83rci6pkdirbgbjpfvg1b-kde-l10n-is-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-is-15.03.97.tar.xz";
-      sha256 = "0rk8km86n1iv1id9whjz6rnpzi2ncpckws9kzzk2s9lfrf5sq0wv";
-      name = "kde-l10n-is-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-km-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hrhsn3g0rn9l7zn9664harxvd8yjcvhm-kde-l10n-km-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-km-15.03.97.tar.xz";
-      sha256 = "1kyklr6m42jc9k6py5d0f79vmc6gs0iajzsx71jpc98amqm40dvc";
-      name = "kde-l10n-km-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-uk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/3g2xlsklwbfzx2gzjxfg053gw0gssi5y-kde-l10n-uk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-uk-15.03.97.tar.xz";
-      sha256 = "0kfvdq6ggc52hd5d1y9xmrp985magfszs9bvvv9pi3j3aawp0nr3";
-      name = "kde-l10n-uk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ug-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/wyp8qzfx2p2nxacv85c4yg7f5bkzqs8v-kde-l10n-ug-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ug-15.03.97.tar.xz";
-      sha256 = "0ysy6548wdf6k44bylbk969cakla8zk6n2laaajxrb0ydqdy8ryf";
-      name = "kde-l10n-ug-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ro-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k2622ylc5rq0vzcaxs2qzxw19z1lf47m-kde-l10n-ro-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ro-15.03.97.tar.xz";
-      sha256 = "032rpjnh8b0idcvcnc5lc9kkgzvivk45sw4rg2b84rlwhnvs4yxq";
-      name = "kde-l10n-ro-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-el-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/q3ibkqyra322i3q042m1nwaaxjk7vy7x-kde-l10n-el-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-el-15.03.97.tar.xz";
-      sha256 = "0f6l2j743r98j6axn2f1rn76fibcjgy3n2lw15ahiik584gjmm3c";
-      name = "kde-l10n-el-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hsjrf139kiykjcg4x6h7j4z6m0fhh6yq-kde-l10n-fr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fr-15.03.97.tar.xz";
-      sha256 = "1mv781g64w8vw8fx2jiavh8kdb21p0jzc3cnxgwphpz2igphs2i5";
-      name = "kde-l10n-fr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-cs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dgkb5dgb9gdgy7q5bicn2lmdpd891hdr-kde-l10n-cs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-cs-15.03.97.tar.xz";
-      sha256 = "1xqj92xk69csifq0hzx367zwvck1d89izdrggcqqki5rblgywixs";
-      name = "kde-l10n-cs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pa-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hxdn5gs171wjz2grpbdh1x4405bj0m8h-kde-l10n-pa-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pa-15.03.97.tar.xz";
-      sha256 = "09sqxglpzkf4ai0kph4wybb2z7ccwkwgkz5n7k0iplv4c0calk4c";
-      name = "kde-l10n-pa-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-es-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/74s8g8x9znrx83ys4vqfmnf1fk0yw48v-kde-l10n-es-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-es-15.03.97.tar.xz";
-      sha256 = "0qqvqz7jcnzlw8l8wh4ngl54dnhj2hmdvha10yqh4jg93492161w";
-      name = "kde-l10n-es-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ia-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xalqsk1g1inbk6wxirfbnjymzmf7lidy-kde-l10n-ia-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ia-15.03.97.tar.xz";
-      sha256 = "0k5gc5hf5nf6yizqdwkdwrhkhcs6hkansilr3hkwxjyl4rgn3xgn";
-      name = "kde-l10n-ia-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-it-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/n2k0lbnmwvzd6g62wm1fr451kapmdd3p-kde-l10n-it-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-it-15.03.97.tar.xz";
-      sha256 = "1d23k78pw8z17m1bwy9hnjdrfh3xsndbizir65slg7nhz3yn7zvs";
-      name = "kde-l10n-it-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-he-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/kcyax5wp8kfc52h1zhwd9kn8ix57v0ky-kde-l10n-he-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-he-15.03.97.tar.xz";
-      sha256 = "0lwbpnn3cl5069c3cqnx8g3n5k7wh1i89nj3s2qqwch13c1ri4qh";
-      name = "kde-l10n-he-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nn-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/f36j585s3fcxi3ddbnbwjcxn6dpm8g8c-kde-l10n-nn-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nn-15.03.97.tar.xz";
-      sha256 = "1s319pjkd4xlk6qjvd0smzb462dxffbldj1ls8lbq3b66qj922nb";
-      name = "kde-l10n-nn-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/l532av8373imngcmnf1zl6mixl0wjpwz-kde-l10n-pt-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pt-15.03.97.tar.xz";
-      sha256 = "0cxcp0n6qqwvnyrv595mkfvvrp09n8d07rwk2fcfyzcbiir619ip";
-      name = "kde-l10n-pt-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fa-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k83ryjj4g5ksvwkx1ldhcp982srl4hrr-kde-l10n-fa-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fa-15.03.97.tar.xz";
-      sha256 = "07ckz57ihr90filnl37dvvnpi7snax9i21bnblmw3lckhdd9yaj0";
-      name = "kde-l10n-fa-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/00lm3069ynks9d5w2mm1nf5psya0xmc1-kde-l10n-hi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hi-15.03.97.tar.xz";
-      sha256 = "0cw2x3p6llys54zlv2a1v383vbmyfjff9bwffs0dcxnvwpk2xbw2";
-      name = "kde-l10n-hi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-da-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jhsjymvl9wqpxc0wjvn37h8px16v36bg-kde-l10n-da-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-da-15.03.97.tar.xz";
-      sha256 = "0yb780ciap47sa61pz66q3w4na7yqhvj1idb3vv28zh583yzhwjq";
-      name = "kde-l10n-da-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ko-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/drhl1i7qb41n9r5767adxx7jw21x5jxn-kde-l10n-ko-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ko-15.03.97.tar.xz";
-      sha256 = "19xwgs383kcypkz90q3d05szj8s8mw96xh0vy4v492hln6vrbw5w";
-      name = "kde-l10n-ko-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-eu-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/szl8g0yvc72cy83a2mzknkd0fpncyagh-kde-l10n-eu-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-eu-15.03.97.tar.xz";
-      sha256 = "07f987zsignkvgh63nn67qrspxs60nlyjgd0hjnnjagnvmm5n3nl";
-      name = "kde-l10n-eu-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/cd7lglrrq1a3d4paqlinxps93gvil3ai-kde-l10n-ca-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca-15.03.97.tar.xz";
-      sha256 = "0rdmmbj2rfjfbpdanfwrfx5mz8a1b7yibqanwsnfjmxg2x7g2amk";
-      name = "kde-l10n-ca-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sv-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jiw90iwzrbdldkj606x598fl7ymj30qi-kde-l10n-sv-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sv-15.03.97.tar.xz";
-      sha256 = "0v9q1hd14vx658swvirlrpzlsz56563nsfykwgpwpvp4nmsy4ryj";
-      name = "kde-l10n-sv-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hu-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/j7hl9spj7dg85hdylhzv7mfjj9fs35fb-kde-l10n-hu-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hu-15.03.97.tar.xz";
-      sha256 = "084wvhsig3vdza8ik6cr7sicdhyyr0i1rp5y90mpgk9w4cpc4hdb";
-      name = "kde-l10n-hu-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-sr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vyim28mkvi3i41ij6jv3j0ma53mczxx5-kde-l10n-sr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-sr-15.03.97.tar.xz";
-      sha256 = "0f76ynprvszvq1m2pycggfpng727dh3007hm9nfcdnic7riix7cs";
-      name = "kde-l10n-sr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nl-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/5zg8z85gx4xbg85bv60bzq5ggiwsp6sz-kde-l10n-nl-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nl-15.03.97.tar.xz";
-      sha256 = "1k7pb79r29fc4qdq9qsiv9ngycbl47nxnsy5hhig0mijnlyjafcg";
-      name = "kde-l10n-nl-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zgrr858247hggw2zapfqy7r6dnjk7jal-kde-l10n-bs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-bs-15.03.97.tar.xz";
-      sha256 = "0cpv16ss70pxlmmpk6gqf7ym7lgxyyc80np1c7rqh19wi4fyyhsw";
-      name = "kde-l10n-bs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-id-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/52y7ar13x8k9j6r6lam9lfl44ic3gnlp-kde-l10n-id-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-id-15.03.97.tar.xz";
-      sha256 = "135jh54f39c28k0x8s6r0m0zzmbxyxav9br0n963501w0xxajprq";
-      name = "kde-l10n-id-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ru-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xiqp0z906kdvbhwv5qvpzsz2b1x6035f-kde-l10n-ru-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ru-15.03.97.tar.xz";
-      sha256 = "1jh78m3hdzplwb9min9dxzp6f0qlksrlkv1maf6145g282xyx5z0";
-      name = "kde-l10n-ru-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-fi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ck99fha1k79n8w31mj86h7ars0aj48l7-kde-l10n-fi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-fi-15.03.97.tar.xz";
-      sha256 = "155ignyq0mmcvckam8dn6hg0hfj6gvcdcnvvp30wxg6v8grk85za";
-      name = "kde-l10n-fi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-kk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/w3d62n11mdpws1l6k33kwzssiwdj6jpm-kde-l10n-kk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-kk-15.03.97.tar.xz";
-      sha256 = "0hb9kbz1kxdhl853jkqmxpspbrzwhg2kgns197sm0vqlzz8arjqh";
-      name = "kde-l10n-kk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-wa-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/fybjx6l20cvkb8i1dnjbrvwai7dh84n5-kde-l10n-wa-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-wa-15.03.97.tar.xz";
-      sha256 = "0n4f7lllgjhii3jzw4jk969hrkhjx89j7s12f68jsxl7b74pwxni";
-      name = "kde-l10n-wa-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hzv99y7kv4cgf2l3yjr4kc16pr6b0fjr-kde-l10n-ca_valencia-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca_valencia-15.03.97.tar.xz";
-      sha256 = "0pxknkbj73a99q5ahpg2k1h2i0pdy53n4qsvc5v2k49ymb8av93l";
-      name = "kde-l10n-ca_valencia-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-bg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6smzivm13xpsxzprjhh9jqm5v4dmlvah-kde-l10n-bg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-bg-15.03.97.tar.xz";
-      sha256 = "0bw7bvjrn2j099nzg9yls89cf0i45hv17jnqdva75c3p4jll1jhb";
-      name = "kde-l10n-bg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ga-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zygnw1vxl5g44ckc4bvl0kqsaa2r1n1k-kde-l10n-ga-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ga-15.03.97.tar.xz";
-      sha256 = "14irxcprdg7zwca3d3653kpkp4xvi8h8gfi12gd4db3mr1pp680d";
-      name = "kde-l10n-ga-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nb-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9fqz3hl48r057jf602hypf75lm83fp6x-kde-l10n-nb-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nb-15.03.97.tar.xz";
-      sha256 = "0z6dfxyi5g223f7ljpdbn5zz3zfrh3s2zi7r7pi46bzx6xi4m596";
-      name = "kde-l10n-nb-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-mr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/b2p6jnj81j8my15ms8wcirjlpspaxngg-kde-l10n-mr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-mr-15.03.97.tar.xz";
-      sha256 = "1f89jw179s9wgrg05n6xzizdhkyxk8571rnmvczbzs11bdqkaa1y";
-      name = "kde-l10n-mr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-en_GB-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rg5h97vycf8sdp0jmrsvzr0mx1lnx3s1-kde-l10n-en_GB-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-en_GB-15.03.97.tar.xz";
-      sha256 = "0j30nphbqfq0r2m6vnv0xyybqqpnxx9py0vs76kdy6v0dwqbjk9j";
-      name = "kde-l10n-en_GB-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_TW-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jswff8i15pxlhj6m16hfscg7c9i77n0i-kde-l10n-zh_TW-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-zh_TW-15.03.97.tar.xz";
-      sha256 = "0ln5dam8mhbqsvdqk6h0r01f6yw7vrncb90d9ks5qr1q636w0c2s";
-      name = "kde-l10n-zh_TW-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-tr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6civ9la05x0bdxm8l0d6ipyqwx5bf0q6-kde-l10n-tr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-tr-15.03.97.tar.xz";
-      sha256 = "08msarjafiz3dnjw1a9x43ka780z3mpzxvil91gpbqkhypf00912";
-      name = "kde-l10n-tr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-et-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/fbyglhlbacqjg4wfm1hny326n678iimh-kde-l10n-et-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-et-15.03.97.tar.xz";
-      sha256 = "09vpyq8i1nghpd9v27bija5fdrb4ifi90dhm8xsk22py21p7spzv";
-      name = "kde-l10n-et-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-hr-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/8jn5vknwcwd2fwb2ndv7lgb96jibf26h-kde-l10n-hr-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-hr-15.03.97.tar.xz";
-      sha256 = "1lvglcqwplz5nq1444dyjbnfz1g2v843hkh4nicsx98dghgsy4yz";
-      name = "kde-l10n-hr-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pt_BR-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/c5w8fkhy6qjd6zvhfkzmpvn54lh1pc78-kde-l10n-pt_BR-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pt_BR-15.03.97.tar.xz";
-      sha256 = "0a95b9sdpwyzisb4whw9w08h1q2jdnz11lclj5zjwz1k6hwa7q2h";
-      name = "kde-l10n-pt_BR-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-pl-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ymrsrgbslqdf5q9r2yk6fshl37d6mz98-kde-l10n-pl-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-pl-15.03.97.tar.xz";
-      sha256 = "0gqicbckcxvpv5pcb73r91n294l6wya6xgqisybvms43afiqd1gh";
-      name = "kde-l10n-pl-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-gl-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vpgh062m2rfrdd9q4ix7dmkbdipwnapr-kde-l10n-gl-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-gl-15.03.97.tar.xz";
-      sha256 = "198sldry5k941z928vp9vqmfs7ar7n50nybl56xh5w6b4b3qvxf2";
-      name = "kde-l10n-gl-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ca_valencia-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hzv99y7kv4cgf2l3yjr4kc16pr6b0fjr-kde-l10n-ca_valencia-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ca@valencia-15.03.97.tar.xz";
-      sha256 = "0pxknkbj73a99q5ahpg2k1h2i0pdy53n4qsvc5v2k49ymb8av93l";
-      name = "kde-l10n-ca_valencia-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-ja-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gp0zgzv913f244aba7549b47mrpc1y74-kde-l10n-ja-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-ja-15.03.97.tar.xz";
-      sha256 = "1l87jq4hl07vwvq8fqh9i0prw9y66fr4k2sdfbwhylzr187bh92n";
-      name = "kde-l10n-ja-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-zh_CN-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/cj4ipjrmmrx45026mifhm1sirmp9xjah-kde-l10n-zh_CN-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-zh_CN-15.03.97.tar.xz";
-      sha256 = "12f7m016fmas5ljjfiw6ws6cjv1g21w3aq5n91f2mk5c6q8y7k54";
-      name = "kde-l10n-zh_CN-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-lt-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/325p1547avvvjq5ccfpdrwnqcvs01wi0-kde-l10n-lt-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-lt-15.03.97.tar.xz";
-      sha256 = "0xb33a27ajx4674vm3mavmgdd46mk23gcnj1y1zbb52nhkmn659p";
-      name = "kde-l10n-lt-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-nds-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dksx9raabi1kxan2ihy8iyzfixfymia2-kde-l10n-nds-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-nds-15.03.97.tar.xz";
-      sha256 = "1lv2mmyilpfrh3nszmzhc1cq10g088cgh34yy18wvr75zvjxy03s";
-      name = "kde-l10n-nds-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-l10n-de-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/sn20qqpfq5mhi9xzs12j91kbanp6lp07-kde-l10n-de-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-l10n/kde-l10n-de-15.03.97.tar.xz";
-      sha256 = "14w35wnh5j0x3wm69pys9ndjmfyf9066l6jc1ysas2hcqgn5mlzk";
-      name = "kde-l10n-de-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksirk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gi9avd4hsvl99xg9bwlaxagd2p4bmmaj-ksirk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksirk-15.03.97.tar.xz";
-      sha256 = "1ffg4l5gmk9p635xzk05vlhsmrksc1x0dlhwkniyndnn6bw9hxpw";
-      name = "ksirk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-strigi-analyzers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gy96gs8knilv4zncq9hwby6z6ipbjmj4-kdesdk-strigi-analyzers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-strigi-analyzers-15.03.97.tar.xz";
-      sha256 = "0zvcma4cwdq18sy0min65gp2b0my9dmwi09vfyrlkscr7v566vm2";
-      name = "kdesdk-strigi-analyzers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-providers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/5ximj5vm43gvzspn0gj85608k7ii53m1-kaccounts-providers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kaccounts-providers-15.03.97.tar.xz";
-      sha256 = "03xqddswyil1g66yrn8fndq1jsmmhas96ij9f8i5y4zp9w8gzbnc";
-      name = "kaccounts-providers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgeography-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ygckwgrmiwh09kf1g8dryljmbn8l8vp3-kgeography-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kgeography-15.03.97.tar.xz";
-      sha256 = "06hm0gbpdf72y1dvfahf0yykhvlwpkx5zmfjgj7m4hhs3fng1268";
-      name = "kgeography-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "amor-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jb27xg2g2fnm1ricqi9f5kj66pxdagql-amor-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/amor-15.03.97.tar.xz";
-      sha256 = "1786pl826145d92wsll2l4wkx72ki8463avknz2y61gdyrzs37ka";
-      name = "amor-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krfb-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lr5g99ymh78s05ivdp5dn4bsv5bhzpi8-krfb-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/krfb-15.03.97.tar.xz";
-      sha256 = "1dqzwmm64hbs8cbzy5mfm8kla0xsj9mia5ysl2nikpg32xw9wppg";
-      name = "krfb-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ark-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/n516a5jcj3dkqzm5p4bgz8igw78x29v3-ark-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ark-15.03.97.tar.xz";
-      sha256 = "0lrnbrw0gfmfqqybayqwbjy4vkdvlgflb7x8ssqv4jfxhwxbcq93";
-      name = "ark-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kteatime-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jj6cqd38jpyvnni1494z39zy9klpzlyh-kteatime-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kteatime-15.03.97.tar.xz";
-      sha256 = "0znna564iaw9f9z3jnsv5r0323gg460cpya5c2adpkgzb2h1q4rl";
-      name = "kteatime-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfloppy-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/8j8csh2z1s6k602y9dq446d5w4dk9mkn-kfloppy-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kfloppy-15.03.97.tar.xz";
-      sha256 = "0dpwdgzwdxi4591qp90zgxrh91pv259q0rz8ni695vb2zmjmad9q";
-      name = "kfloppy-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krdc-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/r2b93kzslw0h8ha58xxz01hyv4jnyvrg-krdc-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/krdc-15.03.97.tar.xz";
-      sha256 = "1bk410qp0rkpksywlmgl57kn1jral1g07bdqk6iy1bfsi8qrxz0i";
-      name = "krdc-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "print-manager-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0a5g4rrhzsl42imcy2ajg2rffwh2cc83-print-manager-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/print-manager-15.03.97.tar.xz";
-      sha256 = "01xhvdm2nx2jmf0czi1jhdg6dlwhxga3562rbvsw3s2viwppy86r";
-      name = "print-manager-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccounts-integration-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/svp29501l2ihyb3zrdhfcxdzsz6kcad5-kaccounts-integration-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kaccounts-integration-15.03.97.tar.xz";
-      sha256 = "04f326jwppgcyhslrd1w3rlahg3cjm5jb7xnbv8r987yk6avr1wi";
-      name = "kaccounts-integration-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "granatier-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qfsrsrz4nr018bs1gsflj1aps92g616j-granatier-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/granatier-15.03.97.tar.xz";
-      sha256 = "01fp13cgblm3rvpxl3ivvh07ip8hg7qw8iqcsnndg9xwcl2anj0f";
-      name = "granatier-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-approver-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/im6h9m6jfpz2c5p9b0ihz26347f7lj3j-ktp-approver-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-approver-15.03.97.tar.xz";
-      sha256 = "0rz6nzv4fxh80x5rrjygmy22wsrpfdnz12z9in0ssdni679gbpwm";
-      name = "ktp-approver-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolourpaint-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/bgy5rbcwi14p955dskr5yrd5kd4ywz57-kolourpaint-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kolourpaint-15.03.97.tar.xz";
-      sha256 = "0r9fwrkg2bcp6rww76iicc9nk1c99pi78y23r5ixhrgpggqhd9qn";
-      name = "kolourpaint-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscd-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/072vh5hkamljgjns6ayadkrj3d19ascd-kscd-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kscd-15.03.97.tar.xz";
-      sha256 = "1pp40y8bbixl0cyjahdb47057djff54bqad2y0zi62y0zwrdirsk";
-      name = "kscd-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdeedu-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/alp170k1qvl2azvm87anll8hblfi5d9w-libkdeedu-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkdeedu-15.03.97.tar.xz";
-      sha256 = "0ss0csdrnyjd1nb71hn9xwbfgh0hihpqa3hbylv7hwdr7zs9kk8g";
-      name = "libkdeedu-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kajongg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/z93xrrq1jbxmw9a16wy3mvr03rnjv1ws-kajongg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kajongg-15.03.97.tar.xz";
-      sha256 = "16m6mgzzhd4vjnznppqaiz9wly5x7l730j60k7vgrhy5fv8x2n0i";
-      name = "kajongg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-kioslaves-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/maldvj3ir6n7rldvds9qi8pv8i4xxbv3-kdesdk-kioslaves-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-kioslaves-15.03.97.tar.xz";
-      sha256 = "0zk81h6w1ypvmzg7jkmmyy80drdbqldxqadzyvj9spi4s5ix2izk";
-      name = "kdesdk-kioslaves-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-strigi-analyzer-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ymx5ccf6rj3vrxrd7m4ilip3q6n1fw45-kdegraphics-strigi-analyzer-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-strigi-analyzer-15.03.97.tar.xz";
-      sha256 = "1jl5kljqrp3jifca58kf0a79j5rdvmm49skzwggxjkdiig52hfi6";
-      name = "kdegraphics-strigi-analyzer-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konquest-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/j4fv1r2bq7rpbay99612d54q9acyrpay-konquest-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/konquest-15.03.97.tar.xz";
-      sha256 = "024as4191idnnqp98nbbzwlfpdh09fk0hkqcjc8bx3f6k1ijgm68";
-      name = "konquest-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kig-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/17kzr6sx4qj2j6v98km0dyds6vakp4yn-kig-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kig-15.03.97.tar.xz";
-      sha256 = "0gzrdla005flqgz8lgdskh5p4gczm7682mx2csqji74pmam4cz8k";
-      name = "kig-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kamera-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/na94hwvpdpssdfk0pgyy2b48k4xslnwl-kamera-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kamera-15.03.97.tar.xz";
-      sha256 = "0bd5dj81c75yl5d23nlih5hwjj0w3rd7r48iyrbc6f6jf5n2wbxq";
-      name = "kamera-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "palapeli-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/s60dj8yc70gk2iaybn9g6gb8qh3fis5i-palapeli-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/palapeli-15.03.97.tar.xz";
-      sha256 = "0wk5rwhijkg13hqyjj9nxd3yfqpq3czrsqsvd7qam5wndz9qvcln";
-      name = "palapeli-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbruch-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0sfm45adnxqzqj1y39yvhvraaw1ym14n-kbruch-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kbruch-15.03.97.tar.xz";
-      sha256 = "1ph2wvc236gnvc1m66dsamfplxy013q3l5yhyn32q7zdnsf70c8x";
-      name = "kbruch-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lokalize-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/26fkssl1j9hxcf4a1sz7bna65w0h4qnx-lokalize-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/lokalize-15.03.97.tar.xz";
-      sha256 = "1d2i96laj0lykxgxyrpgsa4847jxm5sr8r3fx902fzww1jrnym78";
-      name = "lokalize-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kget-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lxx2qmp8i27f5w7ywg5zxzwir4vvnvw3-kget-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kget-15.03.97.tar.xz";
-      sha256 = "0d815w9lxq352h13kgglacf2j9vq6f097ds25f892hhxbndrp8nk";
-      name = "kget-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwalletmanager-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/y9lvm079ijqwxb8ccjkyfn3w72vkb3ql-kwalletmanager-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kwalletmanager-15.03.97.tar.xz";
-      sha256 = "17f792q6n7n9wmkbjl0dlc7h30gnxgwli5b25zfgxja8zg0jpj22";
-      name = "kwalletmanager-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kolf-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/63qjz32hnqjbrffrwmqf1yff5ypndqka-kolf-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kolf-15.03.97.tar.xz";
-      sha256 = "0p8c2bl4qpghfgkbl6iqjr5b38ndf6afjciaivi14mximbyzbh0r";
-      name = "kolf-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktimer-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/7m91r3kgb0wig6sfwd3bbgs0jg6g605y-ktimer-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktimer-15.03.97.tar.xz";
-      sha256 = "185d6rx5pamkiw66k67fmq2bzi2a47784l9hr21dj303vw8i47wm";
-      name = "ktimer-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kigo-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/fvyllq15h7lrwnsq783pk544x80mnyy2-kigo-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kigo-15.03.97.tar.xz";
-      sha256 = "0dz1zy4l2dkbnv57yhcy3m85d8smb66jj1l0gxyk7az72v84gkai";
-      name = "kigo-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcddb-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/2yqqhcg2rwrjdzmqrsyws0r98w5lzfll-libkcddb-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkcddb-15.03.97.tar.xz";
-      sha256 = "1mq8gjdyswdxgsa8h9kiq86qr79wm2c4xbd39x42k574ld3a9hb1";
-      name = "libkcddb-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapman-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/bsw2jxhivvp72fxjsbbr7vh05dbwnq4n-kapman-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kapman-15.03.97.tar.xz";
-      sha256 = "18lvjb4kw4jghxnqd70qnwm6nizmhpyqb196mjdgca1b4yccxagz";
-      name = "kapman-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-mobipocket-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6s4rvbx5kmrcrp87dxlq89yqphc3s0i2-kdegraphics-mobipocket-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-mobipocket-15.03.97.tar.xz";
-      sha256 = "0rrir6ljzapfx13mag1xg7953r1lkbm8ghi9vh317qb1qcc3r6gn";
-      name = "kdegraphics-mobipocket-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kuser-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qnqf58icdkspgy9lrnb5sgxhvd4cgi5i-kuser-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kuser-15.03.97.tar.xz";
-      sha256 = "1d6gcxpjxwkcywfw0kshc5h9f9hwc3wj5mr2i08qa8jwc9r2givg";
-      name = "kuser-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdiamond-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/a2l33j3d8az9pyzxwj91jsi8fxdxca7q-kdiamond-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdiamond-15.03.97.tar.xz";
-      sha256 = "0hfp2qfrkwm9ikk9vixdcfam61zgkhzaf38vqcb4bgshikvr1p21";
-      name = "kdiamond-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "mplayerthumbs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qmk99gqqfi65mw645d42g50dhc5x04bj-mplayerthumbs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/mplayerthumbs-15.03.97.tar.xz";
-      sha256 = "1i621i1blh6xsvxk5xqgzgad1w8wld2qdlv4ywh5ab1glhzkm85i";
-      name = "mplayerthumbs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-baseapps-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k38m1i2v10lg56hz55v5nsq0xr782kq7-kde-baseapps-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-baseapps-15.03.97.tar.xz";
-      sha256 = "0bd3axrxnr7ydhl06skvb1v0254gx0nws7lcl3p41ymd3flkygbc";
-      name = "kde-baseapps-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-filetransfer-handler-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/4ayjbvs3jq9fdkfxp93bgx8fj3amkzip-ktp-filetransfer-handler-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-filetransfer-handler-15.03.97.tar.xz";
-      sha256 = "0dw696s1sp8g5n8j54zg743kf3l6iaanqw7q6yawvawx6h7pq8hz";
-      name = "ktp-filetransfer-handler-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktux-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9gvqvglrrdlqs66w7bqbbhk23hyb7q9m-ktux-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktux-15.03.97.tar.xz";
-      sha256 = "1qydzqsr3xaxdgp6fck9qfzn5sn7k7gqs9pnj0j79kxsj5kqmxby";
-      name = "ktux-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-utils-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/45rkyfima16qf8m5i33pgjhhm899f3kq-kde-dev-utils-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-dev-utils-15.03.97.tar.xz";
-      sha256 = "19ks03y8n8ld5d0pwsgcs8znlpsvczdgf07lg286rv4qd337bn9d";
-      name = "kde-dev-utils-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "pairs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k5v5aqiw9irbz8vn2shsfyy12fziz80r-pairs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/pairs-15.03.97.tar.xz";
-      sha256 = "07ayicd59jk0fz0jzigdnx0xsqaml9wc85k2xwl7171ly19gmdl8";
-      name = "pairs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dolphin-plugins-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0zxs3hp9y23566xjspk0k9h74bygxam9-dolphin-plugins-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/dolphin-plugins-15.03.97.tar.xz";
-      sha256 = "01zkpkn741pnmnamf42p0i43j4z2mv8x9xclsbxq4x56jdclpi1b";
-      name = "dolphin-plugins-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kstars-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/plq1hcmz2yv44sqxlfnrg2rfny0cn13n-kstars-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kstars-15.03.97.tar.xz";
-      sha256 = "14r7d5cwx52lbh2dp4rqvvq53g93zjp11kh8jknibfh3rx2j1g3g";
-      name = "kstars-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khangman-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qw1fzl3g5ax1xbhs02ys9axnpi6ycwqx-khangman-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/khangman-15.03.97.tar.xz";
-      sha256 = "1kryg8c9vj5z1jcjgmj5x7s2jxhlb6jrdvyb5jpmsc00kkbiq55f";
-      name = "khangman-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "superkaramba-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9rgk4ahf3vp7g56vhwkf0h20llzi0q5i-superkaramba-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/superkaramba-15.03.97.tar.xz";
-      sha256 = "13cqka2l6lnlk3z6650rdw36pfislsnm8j82qakm2w88x0czmygb";
-      name = "superkaramba-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiten-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/f3b6vzsaqpxs76g2qr748m1lbkp5w2x7-kiten-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kiten-15.03.97.tar.xz";
-      sha256 = "10vjhhivy06nrd3iqcqny2misg878q6i6ikig2a0spsjqxsykivf";
-      name = "kiten-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sweeper-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/2g0zw9y5fq2wkfdbws58hbbz824ck59l-sweeper-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/sweeper-15.03.97.tar.xz";
-      sha256 = "0p4hmjz36znr2w3a9b01mx9pygwbnsbmybc0lr6w1hjk66006slj";
-      name = "sweeper-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "konsole-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/y3405ndszj3rwsll7n265wwk7b4zs2wr-konsole-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/konsole-15.03.97.tar.xz";
-      sha256 = "0gjv58sz55jybcq15pl1nnd3y9xw41rmw9ql7h155rxyyr1sicfg";
-      name = "konsole-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcachegrind-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/kw8g49szvz2q8sr2rw8gkgk3njjr2hai-kcachegrind-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcachegrind-15.03.97.tar.xz";
-      sha256 = "09lqqwknzgwnx3wy2kbdh1ci971vpjq5zpnyhlfrq7ngb471469y";
-      name = "kcachegrind-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "katomic-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1d2pfw38a4pbvw12a0py52c31a07mf6y-katomic-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/katomic-15.03.97.tar.xz";
-      sha256 = "04qcarmkzm914rwfwc2jpgp3p5kdv158k066kpmhfg83sbd5nicy";
-      name = "katomic-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalgebra-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hq5ln85966sl8azjlmqk3r42niy2w7hz-kalgebra-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kalgebra-15.03.97.tar.xz";
-      sha256 = "0sd1fl57xli8gwn8g1byshyc74mbqp949h5jq0r1pwcvvcxn4zih";
-      name = "kalgebra-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knavalbattle-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/kjrn2cxkzkhnc5fdsvhbailmn1amag6a-knavalbattle-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/knavalbattle-15.03.97.tar.xz";
-      sha256 = "0p6h0c2msg930yvx6fy0xa5is9y8dhrzahiir6rk5mp3i4iiczsw";
-      name = "knavalbattle-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmag-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dxzhs1qgzsyjs1ryrajdyynszh2vc829-kmag-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmag-15.03.97.tar.xz";
-      sha256 = "0a5ibbzxj6dxxnafmgs5rfxmg80hg7kviqadkam7argv2kqqqyf7";
-      name = "kmag-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-list-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/hip8z67xgz9c6il2km70jjyj1ffybzdb-ktp-contact-list-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-contact-list-15.03.97.tar.xz";
-      sha256 = "1q9m91a5caxill86pzx05wkqb57vgxpcgvjjwfdk80xy1jfjl0mj";
-      name = "ktp-contact-list-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kollision-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/yhh09c7kvvsbla8ml2s1x0vxmshqkqv5-kollision-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kollision-15.03.97.tar.xz";
-      sha256 = "1pck211yp3z93ypmi6iglvbjjm76hd8c5862zh32z04wf9flj67c";
-      name = "kollision-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "svgpart-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zxw8q532b6iakic511m1p4rqxlwszmcy-svgpart-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/svgpart-15.03.97.tar.xz";
-      sha256 = "1vs5pnnwjawvyw44mh0bhjb1nf432jfv2a5d8q8yfh17dw7yc4n4";
-      name = "svgpart-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdf-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/z45gsfngyzihcfsr1fxv72l0pclxj4wv-kdf-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdf-15.03.97.tar.xz";
-      sha256 = "15kjbgl1ddwpmcrmc1gv1zd2kvywicy866ib1ab413w90h8ch6pc";
-      name = "kdf-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "signon-kwallet-extension-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/f6gzb36gsgkpwfyz9vf125fc80hsd8h7-signon-kwallet-extension-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/signon-kwallet-extension-15.03.97.tar.xz";
-      sha256 = "1jn7bn3asd3z6zdw9f8kmw5qrd6qc3xkb9hwzfdiyzvnx4mkphkl";
-      name = "signon-kwallet-extension-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "gwenview-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k4kw8xlacdm3cszh21a8kcznj5qw0szx-gwenview-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/gwenview-15.03.97.tar.xz";
-      sha256 = "1qznk4aw8bp0d5hqqmrwfgjdmlwzp71dckik0xw5kcl19y2yb50j";
-      name = "gwenview-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "dragon-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/5m5q8y2xyvcl81k1rsqivv4w1hki8rp8-dragon-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/dragon-15.03.97.tar.xz";
-      sha256 = "1vv7k807kpfyfkj2hckdx9i83br1w87q0c280q79c0867kqz93ly";
-      name = "dragon-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnakeduel-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/2q9z23rlgzgliqdd9ay7213diwpwp4n2-ksnakeduel-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksnakeduel-15.03.97.tar.xz";
-      sha256 = "0pfadpsg35dwy5gxb0w8f2kwam1hsr1hxhnk59rck42a00vgm9a5";
-      name = "ksnakeduel-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiriki-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/p4ya7jqqlhdhvw889qfy31x03akxpsh1-kiriki-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kiriki-15.03.97.tar.xz";
-      sha256 = "1a589bnqfl678mpah6lxm6cif3gn1drsb9d9mfq8azsxa9385hm0";
-      name = "kiriki-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkomparediff2-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0a3yw0r25hp00j0k9y2qafysiwss7382-libkomparediff2-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkomparediff2-15.03.97.tar.xz";
-      sha256 = "0g2ivgpxmjfk5grqiw4y5j9k6bzrkyyrghq2kf8s6598k78cr6r0";
-      name = "libkomparediff2-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdegraphics-thumbnailers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/b8fy5jqvnrnqga38g2srsd3yh8hm1m0v-kdegraphics-thumbnailers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdegraphics-thumbnailers-15.03.97.tar.xz";
-      sha256 = "00knd3apdy6x3p2sp8qqlhamk8p1wgzikximx4qqfnkpjxh13bhp";
-      name = "kdegraphics-thumbnailers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-base-artwork-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/nrfkmwagh0q5p3f5qjr3yyzzwjisqnyb-kde-base-artwork-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-base-artwork-15.03.97.tar.xz";
-      sha256 = "0zqs8bmnl8lzw9a9830bgxpx9jf03wp2c21f5jd8d1fg1pps0z0i";
-      name = "kde-base-artwork-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "poxml-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rqwxd5519acl8q2672iq88vs2zqsrkl8-poxml-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/poxml-15.03.97.tar.xz";
-      sha256 = "1lsyld927xcqi875r8q7gvcy0jx1zbizwnfiwax5hjmk8qcv92h9";
-      name = "poxml-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-kded-module-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/j80ahh8qk9yyp3aim9ng7hddw2rk9bin-ktp-kded-module-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-kded-module-15.03.97.tar.xz";
-      sha256 = "1gxk9i4yf8x4kivkji0850i64vqqir1rpmv7mi31ka0lxrnh9426";
-      name = "ktp-kded-module-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-auth-handler-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/z9kvvyqq45jyj4waqw62nwsqglh179bn-ktp-auth-handler-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-auth-handler-15.03.97.tar.xz";
-      sha256 = "1pgh1700iq0l9ayn09vfwbqcaz430r1p452fhsawa9cqhh5fb7y0";
-      name = "ktp-auth-handler-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblocks-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/pviq202zvlr66w44nryi7sy8n2345rn9-kblocks-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kblocks-15.03.97.tar.xz";
-      sha256 = "0ix8fxrkppp5vx0gp8pmcx9cckbnp3v06mwq98ca3pfdm63g6ld3";
-      name = "kblocks-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesdk-thumbnailers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rc1kfmfq3y62m7sxirpnds1afwhg5618-kdesdk-thumbnailers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdesdk-thumbnailers-15.03.97.tar.xz";
-      sha256 = "0dw2g7rxb02sky91k86bk59ihwzzadbm89gj6kizzibj31dfgza7";
-      name = "kdesdk-thumbnailers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksane-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/76wzxhdcg2wpl5fbm2d8vphnv5wm592m-libksane-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libksane-15.03.97.tar.xz";
-      sha256 = "0p7mpk2sfiq85v6f7cr1wffrgnpw33dy8x3g8vv8xbh0bry0f6vj";
-      name = "libksane-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "zeroconf-ioslave-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6bc8lg99jgzzix5py3kmzn5s23nzb543-zeroconf-ioslave-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/zeroconf-ioslave-15.03.97.tar.xz";
-      sha256 = "11m3212np5i0mifzxcw8g21mbighf4512whwaipizrr5pkmiqaq0";
-      name = "zeroconf-ioslave-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kreversi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/bn905pbkkw9pfk1zi4ibgvgbvqmmg3bh-kreversi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kreversi-15.03.97.tar.xz";
-      sha256 = "060l13gvg40sb35ysf3s3b6rf9dcqxbg7lxq1mrkq9b41gnnwffs";
-      name = "kreversi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapptemplate-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/4mszqip3y5nxh2sdicrljgkahzd4g76p-kapptemplate-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kapptemplate-15.03.97.tar.xz";
-      sha256 = "0ydp2dllzcm1clxlmlbz7das9kgxlgy10qazs9bqmciydz3s67qf";
-      name = "kapptemplate-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "picmi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dazflxly4rz3bcg7np3nkzkm1rv835kn-picmi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/picmi-15.03.97.tar.xz";
-      sha256 = "0wrk1clrg7k3fb48bx11kbp3a71riw9ghjvmjwsvliv5iry6lijf";
-      name = "picmi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebdev-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gs44r2c2nxj0dy367xjyqx5k7x952wb9-kdewebdev-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdewebdev-15.03.97.tar.xz";
-      sha256 = "1g15jvpismsya39j27ikwhm7gy36kshxfdzfg6s53vgfh7kxba3s";
-      name = "kdewebdev-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "cantor-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/m2qzkyb1yry7a9qia5vys08smymzh1fx-cantor-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/cantor-15.03.97.tar.xz";
-      sha256 = "0zy8pc55j63y4m7zkg700rr1561gvq5iq5g729csaaj5rxrs0qma";
-      name = "cantor-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-text-ui-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/5fdsd7z8lwn3i9iq17zcvjxqglw7d2m5-ktp-text-ui-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-text-ui-15.03.97.tar.xz";
-      sha256 = "0crv5y7c01v5s5y9mfbaz862kiyabii6ys1mv7zd1y9j1jlncmbc";
-      name = "ktp-text-ui-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbreakout-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/h6p7mjbmvzilnh64sgssy5ibk59niqck-kbreakout-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kbreakout-15.03.97.tar.xz";
-      sha256 = "1a226j933pb338i61zhfbj4qbfim47ac660g35ka49r9pd2r97h7";
-      name = "kbreakout-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "marble-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0gjp7ilj861p1gcyabcd593ai1fsb5cm-marble-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/marble-15.03.97.tar.xz";
-      sha256 = "1saifm5y1ldyrbmqqbl42cyybxh830rs6v33pxx9ra29ynir3pnh";
-      name = "marble-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-filesharing-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ycrpyyiz3x1x9m4fkvryqad2bhgwzlr1-kdenetwork-filesharing-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdenetwork-filesharing-15.03.97.tar.xz";
-      sha256 = "0wcg17p1wqqrxqmhqa216aps78r9w061s0a62243k1avfag4mn5d";
-      name = "kdenetwork-filesharing-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-dev-scripts-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/m4d76q6jhxiy16nchx1bxfwavr3947q6-kde-dev-scripts-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-dev-scripts-15.03.97.tar.xz";
-      sha256 = "1nfanhgv8kzzak76brg71vwdbdz8nbhc457a5a21x3qa6q8y9cfv";
-      name = "kde-dev-scripts-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-contact-runner-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/nb1h1vyf5yic9dbf02lz8x6j54x9qjcl-ktp-contact-runner-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-contact-runner-15.03.97.tar.xz";
-      sha256 = "1pddmcmmlpan5ahykisfbijg5lkl1bffcc60xxlcanxb5s6f2f7i";
-      name = "ktp-contact-runner-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenetwork-strigi-analyzers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/spp4d4shq598fzvlz27gcvzkj1wd5nk8-kdenetwork-strigi-analyzers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdenetwork-strigi-analyzers-15.03.97.tar.xz";
-      sha256 = "1a084dxal4l2h92mnzi6brwj5fy0393jwk53ph6lh4nc7902jsjn";
-      name = "kdenetwork-strigi-analyzers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdegames-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/him1cfdfb128nr9l2aa4qj8bzrh3vmp6-libkdegames-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkdegames-15.03.97.tar.xz";
-      sha256 = "05s0yab89mw6997akr12jlx0zfx4365g5y96929np0qrc1vmysv3";
-      name = "libkdegames-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkipi-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rnyfpdin4s3a0gksi82h8gyq7fkx750f-libkipi-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkipi-15.03.97.tar.xz";
-      sha256 = "1ckvjc528p2899sszw0z7z9cn6ayimcq2d7grp7bnlkrri1dwgm4";
-      name = "libkipi-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "juk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6hvijhzrxkky1nxw88zmc5gaw16k26b9-juk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/juk-15.03.97.tar.xz";
-      sha256 = "1749dn860vzzxbix3rnwlmg8gsa8fgjzy3dry6zv2hrwzvdd0x2c";
-      name = "juk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "audiocd-kio-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1qkh8akfvjmllbzz06jszpq6yqp4504q-audiocd-kio-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/audiocd-kio-15.03.97.tar.xz";
-      sha256 = "12djfs6dnvqjpmjjp32rls76l2fh43snd7d351qcyvylg1xzszzk";
-      name = "audiocd-kio-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeedu-data-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ykqy9kcqmsiqnm3f4i3dd4yn6a4ckac4-kdeedu-data-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdeedu-data-15.03.97.tar.xz";
-      sha256 = "0a31pwim66i5581kxqa9zp96n7ynbm9q133mmp6mznrkh719wmmq";
-      name = "kdeedu-data-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-icons-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/l5m57r1rs0dnd44snj35idjrxclz3c30-oxygen-icons-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/oxygen-icons-15.03.97.tar.xz";
-      sha256 = "0b3m1wsv21pfsls7xgrbdydskspy4sfyd36hisd3yq2m4l2rzhla";
-      name = "oxygen-icons-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfourinline-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gi0k7kp0aw1f8bp5jyqg9zhzzcgd53ch-kfourinline-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kfourinline-15.03.97.tar.xz";
-      sha256 = "0bzp31i2lk14p17rzmdgia3wb1sl52a16rkigf7bixsxh0kpmjp8";
-      name = "kfourinline-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkdcraw-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/s9vvyqnqqyqxw5xf3hmhrkv2ql6h1xl0-libkdcraw-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkdcraw-15.03.97.tar.xz";
-      sha256 = "1v0klb3p8g05r4g0nmnw606cjr5pcm79wbf2sxcx3a62h8hfd1ab";
-      name = "libkdcraw-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdenlive-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6h09z9zvai18h5i6mcd1h1qixjn7rv7z-kdenlive-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdenlive-15.03.97.tar.xz";
-      sha256 = "078jwsi6zgxz8g9wzgsx58px019y62vwizx1f4mdb1l59zz4qs66";
-      name = "kdenlive-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "artikulate-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6ll6l4smmasjf6v6ilcyqfiqcyfv9lqc-artikulate-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/artikulate-15.03.97.tar.xz";
-      sha256 = "08zlxxjq2axfv7q6hvm90yppc19rslic43lwj7v3rlbpzafg6bfw";
-      name = "artikulate-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktouch-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/57fg1nxpfmx0g2v7z99gz88h9krgzx6v-ktouch-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktouch-15.03.97.tar.xz";
-      sha256 = "0kvd8lps9mwrj829jyjnm30nvv45k7v9bdrfjbign9qzncchfyzn";
-      name = "ktouch-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kopete-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xsak17jj48is7x0cn7qc2ivlfldvssbh-kopete-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kopete-15.03.97.tar.xz";
-      sha256 = "0cqi4r6ks8320cl2ndjmlhvbbz0g5xjkrn8h5vhvhcx6hzllqfjz";
-      name = "kopete-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klines-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ga4495j41nv294455zi3kjyd8f81klim-klines-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/klines-15.03.97.tar.xz";
-      sha256 = "0pchlv45y3bga30fka4sa81hp6wpb9n4bsjcfisivwcq9l1x2xx3";
-      name = "klines-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmix-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/ln69lwqgwrlj6lvgz7rndxi5f979blph-kmix-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmix-15.03.97.tar.xz";
-      sha256 = "043gc9dnc6lrpgnqqkqzc2ybp5wj9xkpwb53r7bzvr02aivci85i";
-      name = "kmix-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcolorchooser-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lz6spcw13ab1ac21hc3bkg1v7rgkjzh9-kcolorchooser-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcolorchooser-15.03.97.tar.xz";
-      sha256 = "0d2y21frbmq9ga4aqhr0x1bkjdx10564f8xadaymh6q8wvygizmy";
-      name = "kcolorchooser-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksaneplugin-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/r4cdj27zvlsi1w0989l97v8h02j66aif-ksaneplugin-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksaneplugin-15.03.97.tar.xz";
-      sha256 = "0zng7rxy5qf3lrds90a652s1qjd8rrzc2b895i08kf85p4mqi5k2";
-      name = "ksaneplugin-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksudoku-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/iv657wf7d2jzdcyagpih9i1zjak1x4q1-ksudoku-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksudoku-15.03.97.tar.xz";
-      sha256 = "09z4jk68cakp68rnz0q1xwfyxa1ykphyl639nmqzm2djfs98kph9";
-      name = "ksudoku-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kubrick-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/f310bqpghnfsszcmz1mijr768pb75cwn-kubrick-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kubrick-15.03.97.tar.xz";
-      sha256 = "12q81gggxfd7s2pwziw3z9p18kd4lapplc6cvg6wycf62gv7zxj0";
-      name = "kubrick-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okteta-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/i0xk4a4bsg33lz0hi2ppbjmkv135kayr-okteta-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/okteta-15.03.97.tar.xz";
-      sha256 = "14pd1zag13qqd5nq25shq46hrgh7m45ch06w5hb5cqg3zc6zv5lm";
-      name = "okteta-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgamma-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zq9mxrmdsrdnwi3wzx53xnz67907wpa3-kgamma-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kgamma-15.03.97.tar.xz";
-      sha256 = "18h006i0fm997i9k1r4il5pj217klhd8xgan0jpx56kbvh0csd19";
-      name = "kgamma-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpat-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/nx9ifsjl88y9r84zki7hm7d0ss7fmxyz-kpat-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kpat-15.03.97.tar.xz";
-      sha256 = "1yz5sv3j2fjw89qdrm96xqr04fxrnpnsa1y6i5y5381hcd9r9j6m";
-      name = "kpat-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkeduvocdocument-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/j3y9bi6k3ljsbgd1wclylq6scqq12xn4-libkeduvocdocument-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkeduvocdocument-15.03.97.tar.xz";
-      sha256 = "1sayd4pipx2hgafxw03pjigjmqk5vkz2cbc3wjvwzsaanphg5sr1";
-      name = "libkeduvocdocument-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgoldrunner-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/syj9kp9rm42nnl9zr90y3fdkjmmmx3gr-kgoldrunner-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kgoldrunner-15.03.97.tar.xz";
-      sha256 = "1rcvd6dmdnwr44w8aq4bg9z88byz398dqq5ljjnb7g205khwkq70";
-      name = "kgoldrunner-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmouth-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xj18z9g22xdwj527i6jmimh5f48966zc-kmouth-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmouth-15.03.97.tar.xz";
-      sha256 = "0m8fl816g49ffg65rff1ml15hp4zdgny3j2s4wwyr7csnh1cyx9s";
-      name = "kmouth-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkcompactdisc-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vgnd6d8h7ljsyw1c3d3amfndy648mhhh-libkcompactdisc-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkcompactdisc-15.03.97.tar.xz";
-      sha256 = "0by16b1c99xnf4cif909yxgfbd4kwxp2x0wbgsrvmhrrll18ahrx";
-      name = "libkcompactdisc-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klettres-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/qh7laq9bq945p4nwkgl9cczfa67c3k8d-klettres-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/klettres-15.03.97.tar.xz";
-      sha256 = "0rc3sgnzv4lvkbp3bf1lgqzffvpnv88c21m95y1anl357yfqhpll";
-      name = "klettres-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "lskat-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/kznx0jnx85vmkkhag5nzdylghaham14l-lskat-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/lskat-15.03.97.tar.xz";
-      sha256 = "0ml5r1p8x6sgxjk3fkqsvyrwaqnyyjxjy4jrsxq29z5bcsxwkdwl";
-      name = "lskat-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-runtime-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/y1l5d03ds6c9mi1hq0k85aslncls27zx-kde-runtime-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-runtime-15.03.97.tar.xz";
-      sha256 = "1f008crhnx58h28hn3mjm8ggqwwix42jg3vbch3zg6qf3y5g8pbl";
-      name = "kde-runtime-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ffmpegthumbs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/licjww29xgrhn22ic9s5zcm6321d8jdl-ffmpegthumbs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ffmpegthumbs-15.03.97.tar.xz";
-      sha256 = "0116dd6lijy943hq854x0ksywqxpswvn1sijmd32bii65i4w4jkf";
-      name = "ffmpegthumbs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjumpingcube-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/84bklrq71nsbw458czr4s9i0s612j3b1-kjumpingcube-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kjumpingcube-15.03.97.tar.xz";
-      sha256 = "1gdfgi3sqx2ix91qc1xbb2njsc92qqs70qg1y1i58hxd6y9zcba4";
-      name = "kjumpingcube-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kqtquickcharts-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xk3c4d55xm6b67n5gxip9b14cinlyhzi-kqtquickcharts-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kqtquickcharts-15.03.97.tar.xz";
-      sha256 = "19q714d93il100qrdyq368jdr9cdrspm597rnw70wns0yh4yxla6";
-      name = "kqtquickcharts-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "okular-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rxdcw4768763s3665d971315dp0h6khy-okular-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/okular-15.03.97.tar.xz";
-      sha256 = "1jvppqlq94n81shh41dx1q53d321fiy5wg6gai96klyk5apnavr7";
-      name = "okular-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeartwork-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/3s350sis8fvm65dza217jj8ahmawwjs9-kdeartwork-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kdeartwork-15.03.97.tar.xz";
-      sha256 = "0fg261vrygxr97rn4yy8n8150icvnj8alkvva5s1hff46z1pjpn2";
-      name = "kdeartwork-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knetwalk-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/dzp0xprdjz6fvxp0pd2msxdi296yxnxy-knetwalk-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/knetwalk-15.03.97.tar.xz";
-      sha256 = "0pf658hdzzm5ax9753iyhxdq54y2rkwb22i31iqrq01m56mlqflk";
-      name = "knetwalk-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmousetool-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/s7zbpyk892flqfyr7b8h9qxg97wdsmbj-kmousetool-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmousetool-15.03.97.tar.xz";
-      sha256 = "0slvrl6wn5c213wfpjpdcbq89rml2afcvfhrq7vw4kxc6xv57811";
-      name = "kmousetool-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktuberling-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/gssrywn435h5z1xk2lplll0gvkxlihd2-ktuberling-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktuberling-15.03.97.tar.xz";
-      sha256 = "1i6k3kpsn58bjj6187q0lay29xyknfn9k69qr4i8ry81j73qbm77";
-      name = "ktuberling-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kalzium-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1wb93a12gm4ygqfdhwn83s1z5ma2y69n-kalzium-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kalzium-15.03.97.tar.xz";
-      sha256 = "1wz9mksqk3d8n0pgj1sxfrdxgann8d6v4dj2vfl6l600ip0mzycw";
-      name = "kalzium-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "filelight-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/c135ykjfry7k6fk5khr1sicwkckvp52a-filelight-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/filelight-15.03.97.tar.xz";
-      sha256 = "0c30n68mbrp2cnqwbrh2r15vm4nppcrfxizsqc4gnfhrl1p3yyiz";
-      name = "filelight-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kate-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9c2rnwlc8j3k0yjbi83j7p44c3kgpfz1-kate-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kate-15.03.97.tar.xz";
-      sha256 = "0ccfrp346yb677fyjlqs3s30400z461cj841pmvi94cjnqlydvkb";
-      name = "kate-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkface-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jbdz7p1hl659yyrziql6aqynh8353p9a-libkface-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkface-15.03.97.tar.xz";
-      sha256 = "1gd719gxcrg88hnbdd01zflkphlrkfk3vl29w566vfg9wgdh93fj";
-      name = "libkface-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksquares-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/8gjxjvxh20x22wcwxpli2zkj9bjcwbn6-ksquares-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksquares-15.03.97.tar.xz";
-      sha256 = "0ylpnhcccfxbkkjhzs907saq9rmqkin41ynzn1pik6y4g8asgjgf";
-      name = "ksquares-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bomber-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/2yg9z2ayyi77z7czj2phpbjdbdx2mdmv-bomber-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/bomber-15.03.97.tar.xz";
-      sha256 = "08hgj0gpkqj644nl9c9jcrqkzrz9dhh91rkvzkn0c9080s21xqhn";
-      name = "bomber-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kaccessible-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/y7ga3ldhk55z9r2iji8vr1xwypl5w5sd-kaccessible-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kaccessible-15.03.97.tar.xz";
-      sha256 = "0gm4nyx8w2dz6631mryqkznqnaag8fslr1x703nd9bvx6nbaf973";
-      name = "kaccessible-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-send-file-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/mirisvq9ddryfyqiixr90pqqcbwfmssw-ktp-send-file-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-send-file-15.03.97.tar.xz";
-      sha256 = "0sbq0xsw0g0vh268021csf22igyqhziy4j0imqziza3p708h1hx9";
-      name = "ktp-send-file-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kanagram-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1c46ll16k2didp2gqw8931l4975h4a0k-kanagram-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kanagram-15.03.97.tar.xz";
-      sha256 = "1798s8hb4ikzy1bczylywjcglwc8wqwakn5chaqaiyazl4m40gdx";
-      name = "kanagram-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmplot-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/zigxsksdg9sy843b5grwa6rw7v6dzgpl-kmplot-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kmplot-15.03.97.tar.xz";
-      sha256 = "1irra5rncpsvhiapxs38340bxzn1z86fgj3jqypv1b95imgd1j4l";
-      name = "kmplot-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktp-desktop-applets-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/sgq7pvdskhmwjrrdy4szvn0am8mm8p85-ktp-desktop-applets-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ktp-desktop-applets-15.03.97.tar.xz";
-      sha256 = "0yprnnjjjx60zi9g1wf0ngwrqsnzdbvgqlnpy53ypmsmk44mmpvq";
-      name = "ktp-desktop-applets-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kshisen-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rgr55x43xyzsxl142xzp5qdxal628k5i-kshisen-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kshisen-15.03.97.tar.xz";
-      sha256 = "0v9nh6bl22khc79fxlq2ywa9f50hb261m0fa1xinddq2p1vkgh1a";
-      name = "kshisen-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwordquiz-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/sry2sq14f7xaa4923mq3hhhsn9asxvb1-kwordquiz-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kwordquiz-15.03.97.tar.xz";
-      sha256 = "0l5vibrp632r47vycxzz2sprgz9z8gvrwgw8wa1j6rj77n5df0ji";
-      name = "kwordquiz-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksnapshot-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/9fbhvnrkqdyp67cq4djszrwi1ap1alqr-ksnapshot-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/ksnapshot-15.03.97.tar.xz";
-      sha256 = "0ps703b3xrkm9rk07kn3bf7df17wpy9syr4vqz8clvqkkvpminjk";
-      name = "ksnapshot-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kturtle-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xwy4rkjppksz5yjj5d4i6gf0rm588rhg-kturtle-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kturtle-15.03.97.tar.xz";
-      sha256 = "02rrs9b4ynbch14r3yknnf31mgksv9wi61yj7zb1a3n0lysv6rzx";
-      name = "kturtle-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcalc-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/6n5aqymfc5ry8vpzgqg8pdf9g98093jl-kcalc-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcalc-15.03.97.tar.xz";
-      sha256 = "04xbym3jqcqyly2pv5m3v4z9x8r3bg66x0z862pj8y8i1n79lwgd";
-      name = "kcalc-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bovo-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/np48z8sc9sb5szhbxxgxh0s9pczvk6jy-bovo-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/bovo-15.03.97.tar.xz";
-      sha256 = "1n2wqp6zgg46kmr5lc605371vm8dbida922jfjjfn0g32b66g4zp";
-      name = "bovo-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kremotecontrol-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/mb6b6aj1zdx2l6q1g0cyvjb20q5znrlp-kremotecontrol-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kremotecontrol-15.03.97.tar.xz";
-      sha256 = "0rckl38br7paj0bwhc86j2hq3xl48xh9539byxqsr66p2d6rkf81";
-      name = "kremotecontrol-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcharselect-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/pd4lin2281pz6hbm7hb3nfxaqn201w7r-kcharselect-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kcharselect-15.03.97.tar.xz";
-      sha256 = "1wybg9qfk59425sfj5rkrb1hn3kkgfrv2nxln8yf4215zwasivvd";
-      name = "kcharselect-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kgpg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/43pag9nl9m1ij7q3nl4plahd0ivpjkx7-kgpg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kgpg-15.03.97.tar.xz";
-      sha256 = "0y9jg4p1x2vq9mfxlh2g64bxlrkm6s9qzb2mrzm3b660plhq8ain";
-      name = "kgpg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "parley-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/q9vp14gqi2sa052n2300z4zx6g7ia1gy-parley-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/parley-15.03.97.tar.xz";
-      sha256 = "0vayhq39afw25g1pns79f5jczr29z4kyzi7as6lhggpp0fx5gzrh";
-      name = "parley-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "klickety-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/rk00agcks0cwszrrd4dhv4pwnbngyp9n-klickety-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/klickety-15.03.97.tar.xz";
-      sha256 = "0n8bfdzmmzdb8ywfpjy4rqyj0lyw00lz16dyqhg65b501g4xfx1n";
-      name = "klickety-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "jovie-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/xzfgswd8bwwpbbv2dkxkjhahxa0wxkcz-jovie-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/jovie-15.03.97.tar.xz";
-      sha256 = "053lhawgljh99fn3s48grl1ybqpa3pbmmw1ay22yprm0m0k3hbdm";
-      name = "jovie-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbounce-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/0jnr85v0cwj0si80dybb147w5pgwc2av-kbounce-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kbounce-15.03.97.tar.xz";
-      sha256 = "1n9n1ijai7prgihncz6817fccaxbawdkncn7cwbm79cdr291g5vs";
-      name = "kbounce-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "step-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/24sryfai0wy46fvp5xalsf4xaczicnih-step-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/step-15.03.97.tar.xz";
-      sha256 = "1m5lxgf3f6m9j257dg0dgvxx5xj5hfdsb16qqhqvyyvka125k9j3";
-      name = "step-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "umbrello-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/k97rbdbywsq7ddax8shrqghvzwl7la0w-umbrello-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/umbrello-15.03.97.tar.xz";
-      sha256 = "0i3iiy2krd50iib20api9sdm6pbw8ixczr31l2xhsa7508wvdfjg";
-      name = "umbrello-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kblackbox-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/45b72yj5m5cn88z4wm2b9w3wd21pyib1-kblackbox-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kblackbox-15.03.97.tar.xz";
-      sha256 = "0vp49qgw7m1ikb1s1vq359lxc9bzwip68j2qix16c9w89mgzcwas";
-      name = "kblackbox-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkexiv2-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/vp3v5dp9930az3jm9gzrk4kl9km1him0-libkexiv2-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkexiv2-15.03.97.tar.xz";
-      sha256 = "1k7lxr3sdx8qnpr8hwvykdp589677c59qahsr3xg72658jiliyzz";
-      name = "libkexiv2-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "rocs-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/1srxr5sy3apaa33n603mshps9rz0r3k4-rocs-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/rocs-15.03.97.tar.xz";
-      sha256 = "0ynaqahwr0j06hfjzsya1z9zcdp4m3bg62bc55k54iygydhkwf8n";
-      name = "rocs-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkmahjongg-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/jqap4lnyi6dij0lm11xvfcydchz25gg2-libkmahjongg-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/libkmahjongg-15.03.97.tar.xz";
-      sha256 = "0lcykfziqaw3k84as85pgar2a5jvy67qd4v0w7riyyp5ndnqdfb6";
-      name = "libkmahjongg-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-wallpapers-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/lw3288r7mjnn6yc16gjr79mvpfamj5dp-kde-wallpapers-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/kde-wallpapers-15.03.97.tar.xz";
-      sha256 = "11qb8rli0jazxfjwv2k2n5ya39n1spgdj525fnpc2gzxyp3pwdg2";
-      name = "kde-wallpapers-15.03.97.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "blinken-15.03.97.tar.xz" ".tar";
-    store = "/nix/store/n1n0by4sqvsvvm2nq6k3d7m5cvya76h9-blinken-15.03.97.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/unstable/applications/15.03.97/src/blinken-15.03.97.tar.xz";
-      sha256 = "1nbcl5fjpw8w2hyiwx4qksf1x1w3nij9rssvjiccn6clz006jcrs";
-      name = "blinken-15.03.97.tar.xz";
+      url = "${mirror}/stable/applications/15.04.0/src/kjumpingcube-15.04.0.tar.xz";
+      sha256 = "0mj33yz2565px6ljlw6k0pgd2ljq9gsjx4x9jzq6wbcjg6vbiyah";
+      name = "kjumpingcube-15.04.0.tar.xz";
     };
   }
 ]
diff --git a/pkgs/applications/kde-apps-15.04/manifest.sh b/pkgs/applications/kde-apps-15.04/manifest.sh
index a8e3591c202..3ef8c11c3a1 100755
--- a/pkgs/applications/kde-apps-15.04/manifest.sh
+++ b/pkgs/applications/kde-apps-15.04/manifest.sh
@@ -1,17 +1,15 @@
 #!/bin/sh
 
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
 if [ $# -eq 0 ]; then
 
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../.. -A autonix.manifest) \
-      # We need 14.12 for some packages in LTS that are not released in beta.
-      # Remove 14.12 when 15.04 is out of beta.
-      http://download.kde.org/stable/applications/14.12.1/ \
-      http://download.kde.org/stable/applications/14.12.2/ \
-      http://download.kde.org/stable/applications/14.12.3/ \
-      http://download.kde.org/unstable/applications/15.03.97/ \
-      -A '*.tar.xz'
+      "${KDE_MIRROR}/stable/applications/15.04.0/" \
+      $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
 
 else
 
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index d5a231ac7bd..991cc65c94d 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.23.0";
+  name = "calibre-2.26.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "0n99la1pacrw4ahb3wk0p68120p7j7v76mvpaf4qnkxy1vfdif7d";
+    sha256 = "0340cdxbdwvckmz3zygwx1wbn62wxap0545nsimpfq4ln7dcxrfw";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index bdc13f554b4..455d33860fb 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       eye-candy, customizable, and reasonably lightweight.
     '';
     homepage = "https://github.com/Swordifish90/cool-retro-term";
-    licenses = with stdenv.lib.licenses; [ gpl2 gpl3 ];
+    license = with stdenv.lib.licenses; [ gpl2 gpl3 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index 3978a369d06..7301ea704e8 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://ctodo.apakoh.dk/";
-    description = "A simple ncurses-based task list manager.";
+    description = "A simple ncurses-based task list manager";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix
new file mode 100644
index 00000000000..fd6ed0866cb
--- /dev/null
+++ b/pkgs/applications/misc/dbvisualizer/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, jre, coreutils, makeWrapper }:
+
+stdenv.mkDerivation {
+  name = "dbvisualizer-9.2.5";
+
+  src = fetchurl {
+    url = https://www.dbvis.com/product_download/dbvis-9.2.5/media/dbvis_unix_9_2_5.tar.gz;
+    sha256 = "e9d3374e96cf63903ebd9dae498c6b69403813eb8723187ed70f285dd7119327";
+  };
+
+  buildInputs = [ makeWrapper ];
+  
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a . $out
+    ln -sf $out/dbvis $out/bin    
+    wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${jre}
+  '';
+  
+  meta = {
+    description = "The universal database tool";
+    homepage = https://www.dbvis.com/;
+    license = stdenv.lib.licenses.unfree;
+  };
+}
diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
new file mode 100644
index 00000000000..ffde422c18b
--- /dev/null
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -0,0 +1,75 @@
+{ stdenv, requireFile, unzip, rlwrap, bash }:
+
+assert (stdenv.system == "i686-linux");
+
+let
+  libPath = stdenv.lib.makeLibraryPath
+    [ stdenv.cc.libc stdenv.cc.cc ];
+in
+stdenv.mkDerivation rec {
+  name    = "kdbplus-${version}";
+  version = "3.2";
+
+  src = requireFile {
+    message = ''
+      Nix can't download kdb+ for you automatically. Go to
+      http://kx.com and download the free, 32-bit version for
+      Linux. Then run "nix-prefetch-url file:///linux.zip" in the
+      directory where you saved it. Note you need version 3.2.
+    '';
+    name   = "linux.zip";
+    sha256 = "0ah1kfvxnrck1kg8j7rpzgj6amji62zbm4ya6q55l54gm3qq6q0r";
+  };
+
+  dontStrip = true;
+  buildInputs = [ unzip ];
+
+  phases = "unpackPhase installPhase";
+  unpackPhase = "mkdir ${name} && cd ${name} && unzip -qq ${src}";
+  installPhase = ''
+    mkdir -p $out/bin $out/libexec
+
+    patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath ${libPath} \
+      ./q/l32/q
+    mv ./q/l32/q $out/libexec/q
+
+    # Shell script wrappers to make things more convenient...
+
+    cat > $out/bin/q-install <<- EOF
+    #!${bash}/bin/bash
+    if [ -f \$HOME/q/q.k ]; then
+      echo "kdb has already been unpacked in \$HOME. Skipping..."
+      exit 0
+    fi
+    echo -n "Unzipping ${src} into \$HOME... "
+    cd \$HOME && ${unzip}/bin/unzip -qq ${src}
+    echo "Done"
+    EOF
+
+    cat > $out/bin/q <<- EOF
+    #!${bash}/bin/bash
+    if [ ! -f \$HOME/q/q.k ]; then
+      echo "ERROR: You need to unzip the Q sources into \$HOME before running q."
+      echo
+      echo "Try:"
+      echo "  cd \$HOME && unzip ${src}"
+      echo "(or run q-install)"
+      exit 1
+    fi
+
+    exec ${rlwrap}/bin/rlwrap $out/libexec/q \$@
+    EOF
+
+    chmod +x $out/bin/q $out/bin/q-install
+  '';
+
+  meta = {
+    description = "Analytics and time-series database";
+    homepage    = "http://www.kx.com/";
+    license     = stdenv.lib.licenses.unfree;
+    platforms   = [ "i686-linux" ];
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index e47e87d6338..d46efc4e5e8 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "keepass-${version}";
-  version = "2.28";
+  version = "2.29";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}.zip";
-    sha256 = "0rlll6qriflaibqpw9qqfgqqr7cvhl404c3ph6n2i22j7xn5mizh";
+    sha256 = "16x7m899akpi036c0wlr41w7fz9q0b69yac9q97rqkixb03l4g9d";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/applications/misc/keybase-node-client/default.nix b/pkgs/applications/misc/keybase/default.nix
index 048b42159b8..fb1c492b48e 100644
--- a/pkgs/applications/misc/keybase-node-client/default.nix
+++ b/pkgs/applications/misc/keybase/default.nix
@@ -3,19 +3,19 @@
 with stdenv.lib;
 
 let 
-  nodePackages = callPackage (import <nixpkgs/pkgs/top-level/node-packages.nix>) {
+  nodePackages = callPackage (import ../../../top-level/node-packages.nix) {
     neededNatives = [] ++ optional (stdenv.isLinux) utillinux;
     self = nodePackages;
     generated = ./package.nix;
   };
 
 in nodePackages.buildNodePackage rec {
-  name = "keybase-node-client-${version}";
-  version = "0.7.7";
+  name = "keybase-${version}";
+  version = "0.7.8";
 
   src = [(fetchurl {
     url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz";
-    sha256 = "1p2plxz4lf5pbrvl5sql00lk459lnxcz7cxc4cdhfzc6h4ql425f";
+    sha256 = "1ak27bd7jwyss85i7plnfr5al33ykfifqknncyx1ir2r2ldagzc7";
   })];
 
   deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
diff --git a/pkgs/applications/misc/keybase-node-client/package.nix b/pkgs/applications/misc/keybase/package.nix
index 2835fe81b98..ee004a0ac67 100644
--- a/pkgs/applications/misc/keybase-node-client/package.nix
+++ b/pkgs/applications/misc/keybase/package.nix
@@ -5,6 +5,7 @@
     self.by-version."CSSselect"."0.4.1";
   by-version."CSSselect"."0.4.1" = self.buildNodePackage {
     name = "CSSselect-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
@@ -15,12 +16,17 @@
       "CSSwhat-0.4.7" = self.by-version."CSSwhat"."0.4.7";
       "domutils-1.4.3" = self.by-version."domutils"."1.4.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."CSSwhat"."0.4" =
     self.by-version."CSSwhat"."0.4.7";
   by-version."CSSwhat"."0.4.7" = self.buildNodePackage {
     name = "CSSwhat-0.4.7";
+    version = "0.4.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
@@ -29,12 +35,57 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^1.0.0" =
+    self.by-version."ansi-regex"."1.1.1";
+  by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
+    name = "ansi-regex-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
+      name = "ansi-regex-1.1.1.tgz";
+      sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansi-regex"."^1.1.0" =
+    self.by-version."ansi-regex"."1.1.1";
+  by-spec."ansi-styles"."^2.0.1" =
+    self.by-version."ansi-styles"."2.0.1";
+  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
+    name = "ansi-styles-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
+      name = "ansi-styles-2.0.1.tgz";
+      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."argparse"."0.1.15" =
     self.by-version."argparse"."0.1.15";
   by-version."argparse"."0.1.15" = self.buildNodePackage {
     name = "argparse-0.1.15";
+    version = "0.1.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
@@ -45,13 +96,18 @@
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
       "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "argparse" = self.by-version."argparse"."0.1.15";
   by-spec."asn1"."0.1.11" =
     self.by-version."asn1"."0.1.11";
   by-version."asn1"."0.1.11" = self.buildNodePackage {
     name = "asn1-0.1.11";
+    version = "0.1.11";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
@@ -60,12 +116,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."assert-plus"."^0.1.5" =
     self.by-version."assert-plus"."0.1.5";
   by-version."assert-plus"."0.1.5" = self.buildNodePackage {
     name = "assert-plus-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
@@ -74,12 +135,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."async"."0.2.x" =
     self.by-version."async"."0.2.10";
   by-version."async"."0.2.10" = self.buildNodePackage {
     name = "async-0.2.10";
+    version = "0.2.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
@@ -88,12 +154,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."async"."~0.9.0" =
     self.by-version."async"."0.9.0";
   by-version."async"."0.9.0" = self.buildNodePackage {
     name = "async-0.9.0";
+    version = "0.9.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
@@ -102,12 +173,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."aws-sign2"."~0.5.0" =
     self.by-version."aws-sign2"."0.5.0";
   by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
     name = "aws-sign2-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
@@ -116,12 +192,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."badnode"."^1.0.1" =
     self.by-version."badnode"."1.0.1";
   by-version."badnode"."1.0.1" = self.buildNodePackage {
     name = "badnode-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/badnode/-/badnode-1.0.1.tgz";
@@ -129,15 +210,20 @@
       sha1 = "3f14123363badf4bed1acc8ed839ee99b27ad7e0";
     };
     deps = {
-      "semver-4.3.1" = self.by-version."semver"."4.3.1";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "badnode" = self.by-version."badnode"."1.0.1";
   by-spec."balanced-match"."^0.2.0" =
     self.by-version."balanced-match"."0.2.0";
   by-version."balanced-match"."0.2.0" = self.buildNodePackage {
     name = "balanced-match-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
@@ -146,12 +232,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bitcoyne".">=0.0.6" =
     self.by-version."bitcoyne"."1.0.1";
   by-version."bitcoyne"."1.0.1" = self.buildNodePackage {
     name = "bitcoyne-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bitcoyne/-/bitcoyne-1.0.1.tgz";
@@ -161,16 +252,60 @@
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "kbpgp-2.0.8" = self.by-version."kbpgp"."2.0.8";
+      "kbpgp-2.0.9" = self.by-version."kbpgp"."2.0.9";
       "pgp-utils-0.0.27" = self.by-version."pgp-utils"."0.0.27";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bitcoyne" = self.by-version."bitcoyne"."1.0.1";
+  by-spec."bl"."~0.9.0" =
+    self.by-version."bl"."0.9.4";
+  by-version."bl"."0.9.4" = self.buildNodePackage {
+    name = "bl-0.9.4";
+    version = "0.9.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
+      name = "bl-0.9.4.tgz";
+      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
+    };
+    deps = {
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."^2.9.21" =
+    self.by-version."bluebird"."2.9.24";
+  by-version."bluebird"."2.9.24" = self.buildNodePackage {
+    name = "bluebird-2.9.24";
+    version = "2.9.24";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.24.tgz";
+      name = "bluebird-2.9.24.tgz";
+      sha1 = "14a2e75f0548323dc35aa440d92007ca154e967c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."bn"."^1.0.0" =
     self.by-version."bn"."1.0.1";
   by-version."bn"."1.0.1" = self.buildNodePackage {
     name = "bn-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/bn/-/bn-1.0.1.tgz";
@@ -179,30 +314,40 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."bn"."^1.0.1" =
     self.by-version."bn"."1.0.1";
   "bn" = self.by-version."bn"."1.0.1";
-  by-spec."boom"."0.4.x" =
-    self.by-version."boom"."0.4.2";
-  by-version."boom"."0.4.2" = self.buildNodePackage {
-    name = "boom-0.4.2";
+  by-spec."boom"."2.x.x" =
+    self.by-version."boom"."2.7.1";
+  by-version."boom"."2.7.1" = self.buildNodePackage {
+    name = "boom-2.7.1";
+    version = "2.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
-      name = "boom-0.4.2.tgz";
-      sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
+      url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz";
+      name = "boom-2.7.1.tgz";
+      sha1 = "fb165c348d337977c61d4363c21e9e1abf526705";
     };
     deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."brace-expansion"."^1.0.0" =
     self.by-version."brace-expansion"."1.1.0";
   by-version."brace-expansion"."1.1.0" = self.buildNodePackage {
     name = "brace-expansion-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
@@ -213,12 +358,60 @@
       "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
       "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caseless"."~0.9.0" =
+    self.by-version."caseless"."0.9.0";
+  by-version."caseless"."0.9.0" = self.buildNodePackage {
+    name = "caseless-0.9.0";
+    version = "0.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
+      name = "caseless-0.9.0.tgz";
+      sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^1.0.0" =
+    self.by-version."chalk"."1.0.0";
+  by-version."chalk"."1.0.0" = self.buildNodePackage {
+    name = "chalk-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
+      name = "chalk-1.0.0.tgz";
+      sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
+    };
+    deps = {
+      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
+      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cheerio"."0.13.0" =
     self.by-version."cheerio"."0.13.0";
   by-version."cheerio"."0.13.0" = self.buildNodePackage {
     name = "cheerio-0.13.0";
+    version = "0.13.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cheerio/-/cheerio-0.13.0.tgz";
@@ -231,13 +424,18 @@
       "entities-0.5.0" = self.by-version."entities"."0.5.0";
       "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "cheerio" = self.by-version."cheerio"."0.13.0";
   by-spec."cli"."0.4.x" =
     self.by-version."cli"."0.4.5";
   by-version."cli"."0.4.5" = self.buildNodePackage {
     name = "cli-0.4.5";
+    version = "0.4.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cli/-/cli-0.4.5.tgz";
@@ -245,14 +443,19 @@
       sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
     };
     deps = {
-      "glob-5.0.0" = self.by-version."glob"."5.0.0";
+      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cliff"."0.1.x" =
     self.by-version."cliff"."0.1.10";
   by-version."cliff"."0.1.10" = self.buildNodePackage {
     name = "cliff-0.1.10";
+    version = "0.1.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz";
@@ -264,12 +467,17 @@
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."codesign"."0.0.9" =
     self.by-version."codesign"."0.0.9";
   by-version."codesign"."0.0.9" = self.buildNodePackage {
     name = "codesign-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/codesign/-/codesign-0.0.9.tgz";
@@ -283,13 +491,18 @@
       "glob-to-regexp-0.0.2" = self.by-version."glob-to-regexp"."0.0.2";
       "tablify-0.1.5" = self.by-version."tablify"."0.1.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "codesign" = self.by-version."codesign"."0.0.9";
   by-spec."colors"."0.6.2" =
     self.by-version."colors"."0.6.2";
   by-version."colors"."0.6.2" = self.buildNodePackage {
     name = "colors-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
@@ -298,7 +511,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "colors" = self.by-version."colors"."0.6.2";
   by-spec."colors"."0.6.x" =
@@ -307,6 +524,7 @@
     self.by-version."colors"."1.0.3";
   by-version."colors"."1.0.3" = self.buildNodePackage {
     name = "colors-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
@@ -315,7 +533,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."colors"."~0.6.2" =
     self.by-version."colors"."0.6.2";
@@ -325,6 +547,7 @@
     self.by-version."combined-stream"."0.0.7";
   by-version."combined-stream"."0.0.7" = self.buildNodePackage {
     name = "combined-stream-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
@@ -334,26 +557,41 @@
     deps = {
       "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."combined-stream"."~0.0.5" =
+    self.by-version."combined-stream"."0.0.7";
   by-spec."commander".">= 0.5.2" =
-    self.by-version."commander"."2.6.0";
-  by-version."commander"."2.6.0" = self.buildNodePackage {
-    name = "commander-2.6.0";
+    self.by-version."commander"."2.8.1";
+  by-version."commander"."2.8.1" = self.buildNodePackage {
+    name = "commander-2.8.1";
+    version = "2.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
-      name = "commander-2.6.0.tgz";
-      sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
+      url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+      name = "commander-2.8.1.tgz";
+      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
     };
     deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."commander"."^2.7.1" =
+    self.by-version."commander"."2.8.1";
   by-spec."commander"."~2.1.0" =
     self.by-version."commander"."2.1.0";
   by-version."commander"."2.1.0" = self.buildNodePackage {
     name = "commander-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
@@ -362,12 +600,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."concat-map"."0.0.1" =
     self.by-version."concat-map"."0.0.1";
   by-version."concat-map"."0.0.1" = self.buildNodePackage {
     name = "concat-map-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
@@ -376,12 +619,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."core-util-is"."~1.0.0" =
     self.by-version."core-util-is"."1.0.1";
   by-version."core-util-is"."1.0.1" = self.buildNodePackage {
     name = "core-util-is-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
@@ -390,27 +638,37 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."cryptiles"."0.2.x" =
-    self.by-version."cryptiles"."0.2.2";
-  by-version."cryptiles"."0.2.2" = self.buildNodePackage {
-    name = "cryptiles-0.2.2";
+  by-spec."cryptiles"."2.x.x" =
+    self.by-version."cryptiles"."2.0.4";
+  by-version."cryptiles"."2.0.4" = self.buildNodePackage {
+    name = "cryptiles-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
-      name = "cryptiles-0.2.2.tgz";
-      sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
+      name = "cryptiles-2.0.4.tgz";
+      sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
     };
     deps = {
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+      "boom-2.7.1" = self.by-version."boom"."2.7.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."ctype"."0.5.3" =
     self.by-version."ctype"."0.5.3";
   by-version."ctype"."0.5.3" = self.buildNodePackage {
     name = "ctype-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
@@ -419,12 +677,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."cycle"."1.0.x" =
     self.by-version."cycle"."1.0.3";
   by-version."cycle"."1.0.3" = self.buildNodePackage {
     name = "cycle-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
@@ -433,12 +696,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-equal"."0.2.1" =
     self.by-version."deep-equal"."0.2.1";
   by-version."deep-equal"."0.2.1" = self.buildNodePackage {
     name = "deep-equal-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.1.tgz";
@@ -447,13 +715,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "deep-equal" = self.by-version."deep-equal"."0.2.1";
   by-spec."deep-equal".">=0.2.1" =
     self.by-version."deep-equal"."1.0.0";
   by-version."deep-equal"."1.0.0" = self.buildNodePackage {
     name = "deep-equal-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz";
@@ -462,12 +735,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."deep-equal"."~0.2.1" =
     self.by-version."deep-equal"."0.2.2";
   by-version."deep-equal"."0.2.2" = self.buildNodePackage {
     name = "deep-equal-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz";
@@ -476,12 +754,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
     name = "delayed-stream-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
@@ -490,12 +773,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."docco"."~0.6.2" =
     self.by-version."docco"."0.6.3";
   by-version."docco"."0.6.3" = self.buildNodePackage {
     name = "docco-0.6.3";
+    version = "0.6.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/docco/-/docco-0.6.3.tgz";
@@ -503,18 +791,23 @@
       sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee";
     };
     deps = {
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
       "marked-0.3.3" = self.by-version."marked"."0.3.3";
-      "fs-extra-0.16.4" = self.by-version."fs-extra"."0.16.4";
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
-      "highlight.js-8.4.0" = self.by-version."highlight.js"."8.4.0";
+      "fs-extra-0.18.2" = self.by-version."fs-extra"."0.18.2";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "highlight.js-8.5.0" = self.by-version."highlight.js"."8.5.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domelementtype"."1" =
     self.by-version."domelementtype"."1.3.0";
   by-version."domelementtype"."1.3.0" = self.buildNodePackage {
     name = "domelementtype-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
@@ -523,12 +816,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domhandler"."2.2" =
     self.by-version."domhandler"."2.2.1";
   by-version."domhandler"."2.2.1" = self.buildNodePackage {
     name = "domhandler-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz";
@@ -538,12 +836,17 @@
     deps = {
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domutils"."1.3" =
     self.by-version."domutils"."1.3.0";
   by-version."domutils"."1.3.0" = self.buildNodePackage {
     name = "domutils-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domutils/-/domutils-1.3.0.tgz";
@@ -553,12 +856,17 @@
     deps = {
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."domutils"."1.4" =
     self.by-version."domutils"."1.4.3";
   by-version."domutils"."1.4.3" = self.buildNodePackage {
     name = "domutils-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
@@ -568,12 +876,17 @@
     deps = {
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."entities"."0.x" =
     self.by-version."entities"."0.5.0";
   by-version."entities"."0.5.0" = self.buildNodePackage {
     name = "entities-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/entities/-/entities-0.5.0.tgz";
@@ -582,12 +895,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."escape-string-regexp"."^1.0.2" =
+    self.by-version."escape-string-regexp"."1.0.3";
+  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
+      name = "escape-string-regexp-1.0.3.tgz";
+      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."eyes"."0.1.x" =
     self.by-version."eyes"."0.1.8";
   by-version."eyes"."0.1.8" = self.buildNodePackage {
     name = "eyes-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
@@ -596,45 +933,60 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."eyes"."~0.1.8" =
     self.by-version."eyes"."0.1.8";
-  by-spec."forever-agent"."~0.5.0" =
-    self.by-version."forever-agent"."0.5.2";
-  by-version."forever-agent"."0.5.2" = self.buildNodePackage {
-    name = "forever-agent-0.5.2";
+  by-spec."forever-agent"."~0.6.0" =
+    self.by-version."forever-agent"."0.6.1";
+  by-version."forever-agent"."0.6.1" = self.buildNodePackage {
+    name = "forever-agent-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
-      name = "forever-agent-0.5.2.tgz";
-      sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+      name = "forever-agent-0.6.1.tgz";
+      sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."form-data"."~0.1.0" =
-    self.by-version."form-data"."0.1.4";
-  by-version."form-data"."0.1.4" = self.buildNodePackage {
-    name = "form-data-0.1.4";
+  by-spec."form-data"."~0.2.0" =
+    self.by-version."form-data"."0.2.0";
+  by-version."form-data"."0.2.0" = self.buildNodePackage {
+    name = "form-data-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
-      name = "form-data-0.1.4.tgz";
-      sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
+      name = "form-data-0.2.0.tgz";
+      sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
     };
     deps = {
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "async-0.9.0" = self.by-version."async"."0.9.0";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."framed-msgpack-rpc"."1.1.4" =
     self.by-version."framed-msgpack-rpc"."1.1.4";
   by-version."framed-msgpack-rpc"."1.1.4" = self.buildNodePackage {
     name = "framed-msgpack-rpc-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/framed-msgpack-rpc/-/framed-msgpack-rpc-1.1.4.tgz";
@@ -645,66 +997,145 @@
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
       "purepack-1.0.1" = self.by-version."purepack"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "framed-msgpack-rpc" = self.by-version."framed-msgpack-rpc"."1.1.4";
   by-spec."fs-extra".">= 0.6.0" =
-    self.by-version."fs-extra"."0.16.4";
-  by-version."fs-extra"."0.16.4" = self.buildNodePackage {
-    name = "fs-extra-0.16.4";
+    self.by-version."fs-extra"."0.18.2";
+  by-version."fs-extra"."0.18.2" = self.buildNodePackage {
+    name = "fs-extra-0.18.2";
+    version = "0.18.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.4.tgz";
-      name = "fs-extra-0.16.4.tgz";
-      sha1 = "3e3d3cd6f388e2acbc0fc2e0202f0533ec0507b1";
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.18.2.tgz";
+      name = "fs-extra-0.18.2.tgz";
+      sha1 = "af05ca702b0b6dfa7de803a1f7ab479ec5c21525";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
-      "rimraf-2.3.1" = self.by-version."rimraf"."2.3.1";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-function"."^2.0.0" =
+    self.by-version."generate-function"."2.0.0";
+  by-version."generate-function"."2.0.0" = self.buildNodePackage {
+    name = "generate-function-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+      name = "generate-function-2.0.0.tgz";
+      sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-object-property"."^1.1.0" =
+    self.by-version."generate-object-property"."1.1.1";
+  by-version."generate-object-property"."1.1.1" = self.buildNodePackage {
+    name = "generate-object-property-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz";
+      name = "generate-object-property-1.1.1.tgz";
+      sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93";
+    };
+    deps = {
+      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."get-stdin"."^4.0.1" =
+    self.by-version."get-stdin"."4.0.1";
+  by-version."get-stdin"."4.0.1" = self.buildNodePackage {
+    name = "get-stdin-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+      name = "get-stdin-4.0.1.tgz";
+      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob".">= 3.1.4" =
-    self.by-version."glob"."5.0.0";
-  by-version."glob"."5.0.0" = self.buildNodePackage {
-    name = "glob-5.0.0";
+    self.by-version."glob"."5.0.5";
+  by-version."glob"."5.0.5" = self.buildNodePackage {
+    name = "glob-5.0.5";
+    version = "5.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-5.0.0.tgz";
-      name = "glob-5.0.0.tgz";
-      sha1 = "bb00d4e340932eb101dc2a30e4127ddd51ed15ed";
+      url = "http://registry.npmjs.org/glob/-/glob-5.0.5.tgz";
+      name = "glob-5.0.5.tgz";
+      sha1 = "784431e4e29a900ae0d47fba6aa1c7f16a8e7df7";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "once-1.3.1" = self.by-version."once"."1.3.1";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob"."^4.4.2" =
-    self.by-version."glob"."4.5.0";
-  by-version."glob"."4.5.0" = self.buildNodePackage {
-    name = "glob-4.5.0";
+    self.by-version."glob"."4.5.3";
+  by-version."glob"."4.5.3" = self.buildNodePackage {
+    name = "glob-4.5.3";
+    version = "4.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.5.0.tgz";
-      name = "glob-4.5.0.tgz";
-      sha1 = "d6511322e9d5c9bc689f20eb7348f00489723882";
+      url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
+      name = "glob-4.5.3.tgz";
+      sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."glob-to-regexp".">=0.0.1" =
     self.by-version."glob-to-regexp"."0.0.2";
   by-version."glob-to-regexp"."0.0.2" = self.buildNodePackage {
     name = "glob-to-regexp-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.2.tgz";
@@ -713,17 +1144,22 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."gpg-wrapper".">=1.0.3" =
-    self.by-version."gpg-wrapper"."1.0.3";
-  by-version."gpg-wrapper"."1.0.3" = self.buildNodePackage {
-    name = "gpg-wrapper-1.0.3";
+  by-spec."gpg-wrapper".">=1.0.0" =
+    self.by-version."gpg-wrapper"."1.0.4";
+  by-version."gpg-wrapper"."1.0.4" = self.buildNodePackage {
+    name = "gpg-wrapper-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.3.tgz";
-      name = "gpg-wrapper-1.0.3.tgz";
-      sha1 = "826260e7ae53932f80574e04240bbb8999227cd1";
+      url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.4.tgz";
+      name = "gpg-wrapper-1.0.4.tgz";
+      sha1 = "0f26586bb9408e5c47201a45661bac1093e0d0ff";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
@@ -733,73 +1169,163 @@
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
       "spotty-1.0.0" = self.by-version."spotty"."1.0.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.3";
+  by-spec."gpg-wrapper".">=1.0.4" =
+    self.by-version."gpg-wrapper"."1.0.4";
+  "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.4";
   by-spec."graceful-fs"."^3.0.5" =
-    self.by-version."graceful-fs"."3.0.5";
-  by-version."graceful-fs"."3.0.5" = self.buildNodePackage {
-    name = "graceful-fs-3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
+  by-version."graceful-fs"."3.0.6" = self.buildNodePackage {
+    name = "graceful-fs-3.0.6";
+    version = "3.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz";
+      name = "graceful-fs-3.0.6.tgz";
+      sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."graceful-readlink".">= 1.0.0" =
+    self.by-version."graceful-readlink"."1.0.1";
+  by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
+    name = "graceful-readlink-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz";
-      name = "graceful-fs-3.0.5.tgz";
-      sha1 = "4a880474bdeb716fe3278cf29792dec38dfac418";
+      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+      name = "graceful-readlink-1.0.1.tgz";
+      sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."^1.4.0" =
+    self.by-version."har-validator"."1.6.1";
+  by-version."har-validator"."1.6.1" = self.buildNodePackage {
+    name = "har-validator-1.6.1";
+    version = "1.6.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.6.1.tgz";
+      name = "har-validator-1.6.1.tgz";
+      sha1 = "baef452cde645eff7d26562e8e749d7fd000b7fd";
     };
     deps = {
+      "bluebird-2.9.24" = self.by-version."bluebird"."2.9.24";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "is-my-json-valid-2.10.1" = self.by-version."is-my-json-valid"."2.10.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."hawk"."~1.0.0" =
-    self.by-version."hawk"."1.0.0";
-  by-version."hawk"."1.0.0" = self.buildNodePackage {
-    name = "hawk-1.0.0";
+  by-spec."has-ansi"."^1.0.3" =
+    self.by-version."has-ansi"."1.0.3";
+  by-version."has-ansi"."1.0.3" = self.buildNodePackage {
+    name = "has-ansi-1.0.3";
+    version = "1.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
+      name = "has-ansi-1.0.3.tgz";
+      sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."~2.3.0" =
+    self.by-version."hawk"."2.3.1";
+  by-version."hawk"."2.3.1" = self.buildNodePackage {
+    name = "hawk-2.3.1";
+    version = "2.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
-      name = "hawk-1.0.0.tgz";
-      sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
+      url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
+      name = "hawk-2.3.1.tgz";
+      sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
     };
     deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
-      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
-      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+      "boom-2.7.1" = self.by-version."boom"."2.7.1";
+      "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
+      "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."highlight.js".">= 8.0.x" =
-    self.by-version."highlight.js"."8.4.0";
-  by-version."highlight.js"."8.4.0" = self.buildNodePackage {
-    name = "highlight.js-8.4.0";
+    self.by-version."highlight.js"."8.5.0";
+  by-version."highlight.js"."8.5.0" = self.buildNodePackage {
+    name = "highlight.js-8.5.0";
+    version = "8.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.4.0.tgz";
-      name = "highlight.js-8.4.0.tgz";
-      sha1 = "dc0d05b8dc9b110f13bce52cb96fd1e0c6bc791c";
+      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.5.0.tgz";
+      name = "highlight.js-8.5.0.tgz";
+      sha1 = "6473d5099edb9f82fa50286b9178c8583ad7d652";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."hoek"."0.9.x" =
-    self.by-version."hoek"."0.9.1";
-  by-version."hoek"."0.9.1" = self.buildNodePackage {
-    name = "hoek-0.9.1";
+  by-spec."hoek"."2.x.x" =
+    self.by-version."hoek"."2.12.0";
+  by-version."hoek"."2.12.0" = self.buildNodePackage {
+    name = "hoek-2.12.0";
+    version = "2.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
-      name = "hoek-0.9.1.tgz";
-      sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.12.0.tgz";
+      name = "hoek-2.12.0.tgz";
+      sha1 = "5d1196e0bf20c5cec957e8927101164effdaf1c9";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."htmlparser2"."~3.4.0" =
     self.by-version."htmlparser2"."3.4.0";
   by-version."htmlparser2"."3.4.0" = self.buildNodePackage {
     name = "htmlparser2-3.4.0";
+    version = "3.4.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.4.0.tgz";
@@ -812,12 +1338,17 @@
       "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."http-signature"."~0.10.0" =
     self.by-version."http-signature"."0.10.1";
   by-version."http-signature"."0.10.1" = self.buildNodePackage {
     name = "http-signature-0.10.1";
+    version = "0.10.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
@@ -829,12 +1360,17 @@
       "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
       "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."iced-coffee-script"."~1.7.1-c" =
     self.by-version."iced-coffee-script"."1.7.1-g";
   by-version."iced-coffee-script"."1.7.1-g" = self.buildNodePackage {
     name = "iced-coffee-script-1.7.1-g";
+    version = "1.7.1-g";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-coffee-script/-/iced-coffee-script-1.7.1-g.tgz";
@@ -846,13 +1382,18 @@
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-coffee-script" = self.by-version."iced-coffee-script"."1.7.1-g";
   by-spec."iced-data-structures"."0.0.5" =
     self.by-version."iced-data-structures"."0.0.5";
   by-version."iced-data-structures"."0.0.5" = self.buildNodePackage {
     name = "iced-data-structures-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-data-structures/-/iced-data-structures-0.0.5.tgz";
@@ -861,13 +1402,20 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-data-structures" = self.by-version."iced-data-structures"."0.0.5";
+  by-spec."iced-data-structures"."~0.0.5" =
+    self.by-version."iced-data-structures"."0.0.5";
   by-spec."iced-db"."0.0.4" =
     self.by-version."iced-db"."0.0.4";
   by-version."iced-db"."0.0.4" = self.buildNodePackage {
     name = "iced-db-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-db/-/iced-db-0.0.4.tgz";
@@ -879,13 +1427,18 @@
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
       "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-db" = self.by-version."iced-db"."0.0.4";
   by-spec."iced-error"."0.0.9" =
     self.by-version."iced-error"."0.0.9";
   by-version."iced-error"."0.0.9" = self.buildNodePackage {
     name = "iced-error-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-error/-/iced-error-0.0.9.tgz";
@@ -894,7 +1447,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-error" = self.by-version."iced-error"."0.0.9";
   by-spec."iced-error".">=0.0.8" =
@@ -907,6 +1464,7 @@
     self.by-version."iced-expect"."0.0.3";
   by-version."iced-expect"."0.0.3" = self.buildNodePackage {
     name = "iced-expect-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-expect/-/iced-expect-0.0.3.tgz";
@@ -915,13 +1473,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-expect" = self.by-version."iced-expect"."0.0.3";
   by-spec."iced-lock"."^1.0.1" =
     self.by-version."iced-lock"."1.0.1";
   by-version."iced-lock"."1.0.1" = self.buildNodePackage {
     name = "iced-lock-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-lock/-/iced-lock-1.0.1.tgz";
@@ -931,13 +1494,18 @@
     deps = {
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-lock" = self.by-version."iced-lock"."1.0.1";
   by-spec."iced-logger"."0.0.5" =
     self.by-version."iced-logger"."0.0.5";
   by-version."iced-logger"."0.0.5" = self.buildNodePackage {
     name = "iced-logger-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.5.tgz";
@@ -947,13 +1515,18 @@
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-logger" = self.by-version."iced-logger"."0.0.5";
   by-spec."iced-logger".">=0.0.3" =
     self.by-version."iced-logger"."0.0.6";
   by-version."iced-logger"."0.0.6" = self.buildNodePackage {
     name = "iced-logger-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-logger/-/iced-logger-0.0.6.tgz";
@@ -963,12 +1536,19 @@
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."iced-logger"."~0.0.1" =
+    self.by-version."iced-logger"."0.0.6";
   by-spec."iced-runtime".">=0.0.1" =
     self.by-version."iced-runtime"."1.0.2";
   by-version."iced-runtime"."1.0.2" = self.buildNodePackage {
     name = "iced-runtime-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.2.tgz";
@@ -977,7 +1557,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-runtime" = self.by-version."iced-runtime"."1.0.2";
   by-spec."iced-runtime".">=0.0.1 <2.0.0-0" =
@@ -988,10 +1572,11 @@
     self.by-version."iced-runtime"."1.0.2";
   by-spec."iced-runtime"."^1.0.2" =
     self.by-version."iced-runtime"."1.0.2";
-  by-spec."iced-spawn".">=0.0.8" =
+  by-spec."iced-spawn".">=0.0.3" =
     self.by-version."iced-spawn"."1.0.0";
   by-version."iced-spawn"."1.0.0" = self.buildNodePackage {
     name = "iced-spawn-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-spawn/-/iced-spawn-1.0.0.tgz";
@@ -1000,10 +1585,16 @@
     };
     deps = {
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "semver-4.3.1" = self.by-version."semver"."4.3.1";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."iced-spawn".">=0.0.8" =
+    self.by-version."iced-spawn"."1.0.0";
   by-spec."iced-spawn".">=1.0.0" =
     self.by-version."iced-spawn"."1.0.0";
   "iced-spawn" = self.by-version."iced-spawn"."1.0.0";
@@ -1011,6 +1602,7 @@
     self.by-version."iced-test"."0.0.21";
   by-version."iced-test"."0.0.21" = self.buildNodePackage {
     name = "iced-test-0.0.21";
+    version = "0.0.21";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.21.tgz";
@@ -1021,15 +1613,20 @@
       "colors-1.0.3" = self.by-version."colors"."1.0.3";
       "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-test" = self.by-version."iced-test"."0.0.21";
   by-spec."iced-utils"."0.1.20" =
     self.by-version."iced-utils"."0.1.20";
   by-version."iced-utils"."0.1.20" = self.buildNodePackage {
     name = "iced-utils-0.1.20";
+    version = "0.1.20";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz";
@@ -1040,13 +1637,18 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "iced-utils" = self.by-version."iced-utils"."0.1.20";
   by-spec."iced-utils".">=0.1.11" =
     self.by-version."iced-utils"."0.1.22";
   by-version."iced-utils"."0.1.22" = self.buildNodePackage {
     name = "iced-utils-0.1.22";
+    version = "0.1.22";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.22.tgz";
@@ -1057,16 +1659,23 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."iced-utils".">=0.1.16" =
     self.by-version."iced-utils"."0.1.22";
   by-spec."iced-utils".">=0.1.18" =
     self.by-version."iced-utils"."0.1.22";
+  by-spec."iced-utils".">=0.1.22" =
+    self.by-version."iced-utils"."0.1.22";
   by-spec."inflight"."^1.0.4" =
     self.by-version."inflight"."1.0.4";
   by-version."inflight"."1.0.4" = self.buildNodePackage {
     name = "inflight-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
@@ -1077,12 +1686,17 @@
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inherits"."2" =
     self.by-version."inherits"."2.0.1";
   by-version."inherits"."2.0.1" = self.buildNodePackage {
     name = "inherits-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
@@ -1091,7 +1705,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
@@ -1099,6 +1717,7 @@
     self.by-version."ipv6"."3.1.1";
   by-version."ipv6"."3.1.1" = self.buildNodePackage {
     name = "ipv6-3.1.1";
+    version = "3.1.1";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz";
@@ -1110,12 +1729,59 @@
       "cli-0.4.5" = self.by-version."cli"."0.4.5";
       "cliff-0.1.10" = self.by-version."cliff"."0.1.10";
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-my-json-valid"."^2.10.0" =
+    self.by-version."is-my-json-valid"."2.10.1";
+  by-version."is-my-json-valid"."2.10.1" = self.buildNodePackage {
+    name = "is-my-json-valid-2.10.1";
+    version = "2.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz";
+      name = "is-my-json-valid-2.10.1.tgz";
+      sha1 = "bf20ca7e71116302f8660ac812659f71e22ea2d0";
+    };
+    deps = {
+      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
+      "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1";
+      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-property"."^1.0.0" =
+    self.by-version."is-property"."1.0.2";
+  by-version."is-property"."1.0.2" = self.buildNodePackage {
+    name = "is-property-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+      name = "is-property-1.0.2.tgz";
+      sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-version."isarray"."0.0.1" = self.buildNodePackage {
     name = "isarray-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
@@ -1124,26 +1790,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."isstream"."0.1.x" =
-    self.by-version."isstream"."0.1.1";
-  by-version."isstream"."0.1.1" = self.buildNodePackage {
-    name = "isstream-0.1.1";
+    self.by-version."isstream"."0.1.2";
+  by-version."isstream"."0.1.2" = self.buildNodePackage {
+    name = "isstream-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz";
-      name = "isstream-0.1.1.tgz";
-      sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f";
+      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+      name = "isstream-0.1.2.tgz";
+      sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."isstream"."~0.1.1" =
+    self.by-version."isstream"."0.1.2";
   by-spec."json-stringify-safe"."~5.0.0" =
     self.by-version."json-stringify-safe"."5.0.0";
   by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage {
     name = "json-stringify-safe-5.0.0";
+    version = "5.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
@@ -1152,12 +1830,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."jsonfile"."^2.0.0" =
     self.by-version."jsonfile"."2.0.0";
   by-version."jsonfile"."2.0.0" = self.buildNodePackage {
     name = "jsonfile-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz";
@@ -1166,42 +1849,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."kbpgp".">=1.0.2" =
-    self.by-version."kbpgp"."2.0.8";
-  by-version."kbpgp"."2.0.8" = self.buildNodePackage {
-    name = "kbpgp-2.0.8";
+  by-spec."jsonpointer"."^1.1.0" =
+    self.by-version."jsonpointer"."1.1.0";
+  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
+    name = "jsonpointer-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.8.tgz";
-      name = "kbpgp-2.0.8.tgz";
-      sha1 = "5ede9539bce3564a53f8be72a75c7619414b6e08";
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
+      name = "jsonpointer-1.1.0.tgz";
+      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
     };
     deps = {
-      "bn-1.0.1" = self.by-version."bn"."1.0.1";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "keybase-compressjs-1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c";
-      "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0";
-      "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
-      "purepack-1.0.1" = self.by-version."purepack"."1.0.1";
-      "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
-      "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "kbpgp" = self.by-version."kbpgp"."2.0.8";
-  by-spec."kbpgp"."^1.0.2" =
-    self.by-version."kbpgp"."1.2.0";
-  by-version."kbpgp"."1.2.0" = self.buildNodePackage {
-    name = "kbpgp-1.2.0";
+  by-spec."kbpgp".">=2.0.9" =
+    self.by-version."kbpgp"."2.0.9";
+  by-version."kbpgp"."2.0.9" = self.buildNodePackage {
+    name = "kbpgp-2.0.9";
+    version = "2.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-1.2.0.tgz";
-      name = "kbpgp-1.2.0.tgz";
-      sha1 = "4305a67a740fb31843b4313b60a6137f2b93ddba";
+      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.9.tgz";
+      name = "kbpgp-2.0.9.tgz";
+      sha1 = "b4f8686abde8689a1d4abb36e070af78632ceb59";
     };
     deps = {
       "bn-1.0.1" = self.by-version."bn"."1.0.1";
@@ -1215,14 +1897,20 @@
       "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
       "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  "kbpgp" = self.by-version."kbpgp"."2.0.9";
   by-spec."kbpgp"."^2.0.0" =
-    self.by-version."kbpgp"."2.0.8";
+    self.by-version."kbpgp"."2.0.9";
   by-spec."keybase-compressjs"."^1.0.1-c" =
     self.by-version."keybase-compressjs"."1.0.1-c";
   by-version."keybase-compressjs"."1.0.1-c" = self.buildNodePackage {
     name = "keybase-compressjs-1.0.1-c";
+    version = "1.0.1-c";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz";
@@ -1232,12 +1920,17 @@
     deps = {
       "commander-2.1.0" = self.by-version."commander"."2.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."keybase-ecurve"."^1.0.0" =
     self.by-version."keybase-ecurve"."1.0.0";
   by-version."keybase-ecurve"."1.0.0" = self.buildNodePackage {
     name = "keybase-ecurve-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keybase-ecurve/-/keybase-ecurve-1.0.0.tgz";
@@ -1247,12 +1940,72 @@
     deps = {
       "bn-1.0.1" = self.by-version."bn"."1.0.1";
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."keybase-installer"."1.0.1" =
+    self.by-version."keybase-installer"."1.0.1";
+  by-version."keybase-installer"."1.0.1" = self.buildNodePackage {
+    name = "keybase-installer-1.0.1";
+    version = "1.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keybase-installer/-/keybase-installer-1.0.1.tgz";
+      name = "keybase-installer-1.0.1.tgz";
+      sha1 = "31ca46388833665225e8113bdd79ded9b04e0862";
+    };
+    deps = {
+      "badnode-1.0.1" = self.by-version."badnode"."1.0.1";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "gpg-wrapper-1.0.4" = self.by-version."gpg-wrapper"."1.0.4";
+      "iced-data-structures-0.0.5" = self.by-version."iced-data-structures"."0.0.5";
+      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
+      "iced-logger-0.0.6" = self.by-version."iced-logger"."0.0.6";
+      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-spawn-1.0.0" = self.by-version."iced-spawn"."1.0.0";
+      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "keybase-path-0.0.15" = self.by-version."keybase-path"."0.0.15";
+      "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
+      "progress-1.1.3" = self.by-version."progress"."1.1.3";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."keybase-path"."0.0.15" =
+  "keybase-installer" = self.by-version."keybase-installer"."1.0.1";
+  by-spec."keybase-path"."0.0.16" =
+    self.by-version."keybase-path"."0.0.16";
+  by-version."keybase-path"."0.0.16" = self.buildNodePackage {
+    name = "keybase-path-0.0.16";
+    version = "0.0.16";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.16.tgz";
+      name = "keybase-path-0.0.16.tgz";
+      sha1 = "3d60804aa48274b628d802a212f5e0dfcc13acaa";
+    };
+    deps = {
+      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "keybase-path" = self.by-version."keybase-path"."0.0.16";
+  by-spec."keybase-path"."^0.0.15" =
     self.by-version."keybase-path"."0.0.15";
   by-version."keybase-path"."0.0.15" = self.buildNodePackage {
     name = "keybase-path-0.0.15";
+    version = "0.0.15";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/keybase-path/-/keybase-path-0.0.15.tgz";
@@ -1262,18 +2015,22 @@
     deps = {
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "keybase-path" = self.by-version."keybase-path"."0.0.15";
   by-spec."keybase-proofs"."^2.0.13" =
-    self.by-version."keybase-proofs"."2.0.15";
-  by-version."keybase-proofs"."2.0.15" = self.buildNodePackage {
-    name = "keybase-proofs-2.0.15";
+    self.by-version."keybase-proofs"."2.0.20";
+  by-version."keybase-proofs"."2.0.20" = self.buildNodePackage {
+    name = "keybase-proofs-2.0.20";
+    version = "2.0.20";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.15.tgz";
-      name = "keybase-proofs-2.0.15.tgz";
-      sha1 = "d9e0c265e005095f749058825a7f0db3ab5bcedc";
+      url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.20.tgz";
+      name = "keybase-proofs-2.0.20.tgz";
+      sha1 = "bb8f76f51cd04ee3a2de8b7e786c717e718ec2c7";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
@@ -1282,33 +2039,44 @@
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
       "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "keybase-proofs" = self.by-version."keybase-proofs"."2.0.15";
-  by-spec."libkeybase"."^0.0.6" =
-    self.by-version."libkeybase"."0.0.6";
-  by-version."libkeybase"."0.0.6" = self.buildNodePackage {
-    name = "libkeybase-0.0.6";
+  "keybase-proofs" = self.by-version."keybase-proofs"."2.0.20";
+  by-spec."libkeybase"."^1.0.2" =
+    self.by-version."libkeybase"."1.0.2";
+  by-version."libkeybase"."1.0.2" = self.buildNodePackage {
+    name = "libkeybase-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libkeybase/-/libkeybase-0.0.6.tgz";
-      name = "libkeybase-0.0.6.tgz";
-      sha1 = "03d19afe7ca48ca041d962f0885d373faca2e90e";
+      url = "http://registry.npmjs.org/libkeybase/-/libkeybase-1.0.2.tgz";
+      name = "libkeybase-1.0.2.tgz";
+      sha1 = "742e4f5138faa8f912a70e126f0eda414bf8fc51";
     };
     deps = {
+      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1";
       "iced-logger-0.0.5" = self.by-version."iced-logger"."0.0.5";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "kbpgp-1.2.0" = self.by-version."kbpgp"."1.2.0";
+      "kbpgp-2.0.9" = self.by-version."kbpgp"."2.0.9";
       "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "libkeybase" = self.by-version."libkeybase"."0.0.6";
+  "libkeybase" = self.by-version."libkeybase"."1.0.2";
   by-spec."marked".">= 0.2.7" =
     self.by-version."marked"."0.3.3";
   by-version."marked"."0.3.3" = self.buildNodePackage {
     name = "marked-0.3.3";
+    version = "0.3.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz";
@@ -1317,12 +2085,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."merkle-tree"."0.0.12" =
     self.by-version."merkle-tree"."0.0.12";
   by-version."merkle-tree"."0.0.12" = self.buildNodePackage {
     name = "merkle-tree-0.0.12";
+    version = "0.0.12";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz";
@@ -1335,58 +2108,98 @@
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
       "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "merkle-tree" = self.by-version."merkle-tree"."0.0.12";
-  by-spec."mime"."~1.2.11" =
-    self.by-version."mime"."1.2.11";
-  by-version."mime"."1.2.11" = self.buildNodePackage {
-    name = "mime-1.2.11";
+  by-spec."mime-db"."~1.8.0" =
+    self.by-version."mime-db"."1.8.0";
+  by-version."mime-db"."1.8.0" = self.buildNodePackage {
+    name = "mime-db-1.8.0";
+    version = "1.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
-      name = "mime-1.2.11.tgz";
-      sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz";
+      name = "mime-db-1.8.0.tgz";
+      sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."mime"."~1.2.9" =
-    self.by-version."mime"."1.2.11";
+  by-spec."mime-types"."~2.0.1" =
+    self.by-version."mime-types"."2.0.10";
+  by-version."mime-types"."2.0.10" = self.buildNodePackage {
+    name = "mime-types-2.0.10";
+    version = "2.0.10";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz";
+      name = "mime-types-2.0.10.tgz";
+      sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d";
+    };
+    deps = {
+      "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.3" =
+    self.by-version."mime-types"."2.0.10";
   by-spec."minimatch"."^2.0.1" =
-    self.by-version."minimatch"."2.0.1";
-  by-version."minimatch"."2.0.1" = self.buildNodePackage {
-    name = "minimatch-2.0.1";
+    self.by-version."minimatch"."2.0.4";
+  by-version."minimatch"."2.0.4" = self.buildNodePackage {
+    name = "minimatch-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz";
-      name = "minimatch-2.0.1.tgz";
-      sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37";
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz";
+      name = "minimatch-2.0.4.tgz";
+      sha1 = "83bea115803e7a097a78022427287edb762fafed";
     };
     deps = {
       "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimist".">=0.0.8" =
-    self.by-version."minimist"."1.1.0";
-  by-version."minimist"."1.1.0" = self.buildNodePackage {
-    name = "minimist-1.1.0";
+    self.by-version."minimist"."1.1.1";
+  by-version."minimist"."1.1.1" = self.buildNodePackage {
+    name = "minimist-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz";
-      name = "minimist-1.1.0.tgz";
-      sha1 = "cdf225e8898f840a258ded44fc91776770afdc93";
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
+      name = "minimist-1.1.1.tgz";
+      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."minimist"."~0.0.1" =
     self.by-version."minimist"."0.0.10";
   by-version."minimist"."0.0.10" = self.buildNodePackage {
     name = "minimist-0.0.10";
+    version = "0.0.10";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
@@ -1395,12 +2208,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mkdirp"."0.3.5" =
     self.by-version."mkdirp"."0.3.5";
   by-version."mkdirp"."0.3.5" = self.buildNodePackage {
     name = "mkdirp-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
@@ -1409,7 +2227,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "mkdirp" = self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.5" =
@@ -1418,6 +2240,7 @@
     self.by-version."more-entropy"."0.0.7";
   by-version."more-entropy"."0.0.7" = self.buildNodePackage {
     name = "more-entropy-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/more-entropy/-/more-entropy-0.0.7.tgz";
@@ -1427,12 +2250,17 @@
     deps = {
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."mute-stream"."~0.0.4" =
     self.by-version."mute-stream"."0.0.4";
   by-version."mute-stream"."0.0.4" = self.buildNodePackage {
     name = "mute-stream-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
@@ -1441,12 +2269,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."network-byte-order"."~0.2.0" =
     self.by-version."network-byte-order"."0.2.0";
   by-version."network-byte-order"."0.2.0" = self.buildNodePackage {
     name = "network-byte-order-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/network-byte-order/-/network-byte-order-0.2.0.tgz";
@@ -1455,12 +2288,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."node-uuid"."~1.4.0" =
     self.by-version."node-uuid"."1.4.3";
   by-version."node-uuid"."1.4.3" = self.buildNodePackage {
     name = "node-uuid-1.4.3";
+    version = "1.4.3";
     bin = true;
     src = fetchurl {
       url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
@@ -1469,26 +2307,36 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."oauth-sign"."~0.3.0" =
-    self.by-version."oauth-sign"."0.3.0";
-  by-version."oauth-sign"."0.3.0" = self.buildNodePackage {
-    name = "oauth-sign-0.3.0";
+  by-spec."oauth-sign"."~0.6.0" =
+    self.by-version."oauth-sign"."0.6.0";
+  by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
+    name = "oauth-sign-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
-      name = "oauth-sign-0.3.0.tgz";
-      sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
+      name = "oauth-sign-0.6.0.tgz";
+      sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."once"."^1.3.0" =
     self.by-version."once"."1.3.1";
   by-version."once"."1.3.1" = self.buildNodePackage {
     name = "once-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz";
@@ -1498,12 +2346,17 @@
     deps = {
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."optimist"."0.6.1" =
     self.by-version."optimist"."0.6.1";
   by-version."optimist"."0.6.1" = self.buildNodePackage {
     name = "optimist-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
@@ -1514,13 +2367,37 @@
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "optimist" = self.by-version."optimist"."0.6.1";
+  by-spec."path-is-absolute"."^1.0.0" =
+    self.by-version."path-is-absolute"."1.0.0";
+  by-version."path-is-absolute"."1.0.0" = self.buildNodePackage {
+    name = "path-is-absolute-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
+      name = "path-is-absolute-1.0.0.tgz";
+      sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pgp-utils"."0.0.27" =
     self.by-version."pgp-utils"."0.0.27";
   by-version."pgp-utils"."0.0.27" = self.buildNodePackage {
     name = "pgp-utils-0.0.27";
+    version = "0.0.27";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.27.tgz";
@@ -1531,12 +2408,17 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pgp-utils".">=0.0.21" =
     self.by-version."pgp-utils"."0.0.28";
   by-version."pgp-utils"."0.0.28" = self.buildNodePackage {
     name = "pgp-utils-0.0.28";
+    version = "0.0.28";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pgp-utils/-/pgp-utils-0.0.28.tgz";
@@ -1547,19 +2429,24 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."pgp-utils".">=0.0.22" =
     self.by-version."pgp-utils"."0.0.28";
-  "pgp-utils" = self.by-version."pgp-utils"."0.0.28";
-  by-spec."pgp-utils".">=0.0.25" =
-    self.by-version."pgp-utils"."0.0.28";
   by-spec."pgp-utils".">=0.0.28" =
     self.by-version."pgp-utils"."0.0.28";
+  "pgp-utils" = self.by-version."pgp-utils"."0.0.28";
+  by-spec."pgp-utils".">=0.0.8" =
+    self.by-version."pgp-utils"."0.0.28";
   by-spec."pkginfo"."0.3.x" =
     self.by-version."pkginfo"."0.3.0";
   by-version."pkginfo"."0.3.0" = self.buildNodePackage {
     name = "pkginfo-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
@@ -1568,12 +2455,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."progress"."1.1.3" =
     self.by-version."progress"."1.1.3";
   by-version."progress"."1.1.3" = self.buildNodePackage {
     name = "progress-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/progress/-/progress-1.1.3.tgz";
@@ -1582,13 +2474,18 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "progress" = self.by-version."progress"."1.1.3";
   by-spec."progress"."~1.1.2" =
     self.by-version."progress"."1.1.8";
   by-version."progress"."1.1.8" = self.buildNodePackage {
     name = "progress-1.1.8";
+    version = "1.1.8";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
@@ -1597,12 +2494,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."punycode".">=0.2.0" =
     self.by-version."punycode"."1.3.2";
   by-version."punycode"."1.3.2" = self.buildNodePackage {
     name = "punycode-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
@@ -1611,12 +2513,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."purepack"."1.0.1" =
     self.by-version."purepack"."1.0.1";
   by-version."purepack"."1.0.1" = self.buildNodePackage {
     name = "purepack-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/purepack/-/purepack-1.0.1.tgz";
@@ -1625,31 +2532,41 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "purepack" = self.by-version."purepack"."1.0.1";
   by-spec."purepack".">=1" =
     self.by-version."purepack"."1.0.1";
   by-spec."purepack".">=1.0.1" =
     self.by-version."purepack"."1.0.1";
-  by-spec."qs"."~0.6.0" =
-    self.by-version."qs"."0.6.6";
-  by-version."qs"."0.6.6" = self.buildNodePackage {
-    name = "qs-0.6.6";
+  by-spec."qs"."~2.4.0" =
+    self.by-version."qs"."2.4.1";
+  by-version."qs"."2.4.1" = self.buildNodePackage {
+    name = "qs-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
-      name = "qs-0.6.6.tgz";
-      sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
+      url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz";
+      name = "qs-2.4.1.tgz";
+      sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."read"."keybase/read" =
     self.by-version."read"."1.0.5";
   by-version."read"."1.0.5" = self.buildNodePackage {
     name = "read-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchgit {
       url = "git://github.com/keybase/read";
@@ -1659,13 +2576,18 @@
     deps = {
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "read" = self.by-version."read"."1.0.5";
   by-spec."readable-stream"."1.1" =
     self.by-version."readable-stream"."1.1.13";
   by-version."readable-stream"."1.1.13" = self.buildNodePackage {
     name = "readable-stream-1.1.13";
+    version = "1.1.13";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
@@ -1678,86 +2600,144 @@
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."request"."2.30.0" =
-    self.by-version."request"."2.30.0";
-  by-version."request"."2.30.0" = self.buildNodePackage {
-    name = "request-2.30.0";
+  by-spec."readable-stream"."~1.0.26" =
+    self.by-version."readable-stream"."1.0.33";
+  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
+    name = "readable-stream-1.0.33";
+    version = "1.0.33";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz";
-      name = "request-2.30.0.tgz";
-      sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861";
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
+      name = "readable-stream-1.0.33.tgz";
+      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
     };
     deps = {
-      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."^2.34.0" =
+    self.by-version."request"."2.55.0";
+  by-version."request"."2.55.0" = self.buildNodePackage {
+    name = "request-2.55.0";
+    version = "2.55.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz";
+      name = "request-2.55.0.tgz";
+      sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
       "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15";
-      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
+      "qs-2.4.1" = self.by-version."qs"."2.4.1";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tough-cookie-0.13.0" = self.by-version."tough-cookie"."0.13.0";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
-      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
+      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
+      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.6.1" = self.by-version."har-validator"."1.6.1";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  "request" = self.by-version."request"."2.30.0";
+  by-spec."request"."^2.55.0" =
+    self.by-version."request"."2.55.0";
+  "request" = self.by-version."request"."2.55.0";
   by-spec."rimraf"."^2.2.8" =
-    self.by-version."rimraf"."2.3.1";
-  by-version."rimraf"."2.3.1" = self.buildNodePackage {
-    name = "rimraf-2.3.1";
+    self.by-version."rimraf"."2.3.2";
+  by-version."rimraf"."2.3.2" = self.buildNodePackage {
+    name = "rimraf-2.3.2";
+    version = "2.3.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.1.tgz";
-      name = "rimraf-2.3.1.tgz";
-      sha1 = "f83df78c168d5daf9f021e8e092e7a165898ee75";
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz";
+      name = "rimraf-2.3.2.tgz";
+      sha1 = "7304bd9275c401b89103b106b3531c1ef0c02fe9";
     };
     deps = {
-      "glob-4.5.0" = self.by-version."glob"."4.5.0";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
-  by-spec."semver".">=2.2.1" =
-    self.by-version."semver"."4.3.1";
-  by-version."semver"."4.3.1" = self.buildNodePackage {
-    name = "semver-4.3.1";
+  by-spec."semver".">=1" =
+    self.by-version."semver"."4.3.3";
+  by-version."semver"."4.3.3" = self.buildNodePackage {
+    name = "semver-4.3.3";
+    version = "4.3.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.3.1.tgz";
-      name = "semver-4.3.1.tgz";
-      sha1 = "beb0129575b95f76110b29af08d370fd9eeb34bf";
+      url = "http://registry.npmjs.org/semver/-/semver-4.3.3.tgz";
+      name = "semver-4.3.3.tgz";
+      sha1 = "15466b61220bc371cd8f0e666a9f785329ea8228";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
+  by-spec."semver".">=2.2.1" =
+    self.by-version."semver"."4.3.3";
   by-spec."semver"."^4.0.0" =
-    self.by-version."semver"."4.3.1";
-  "semver" = self.by-version."semver"."4.3.1";
-  by-spec."sntp"."0.2.x" =
-    self.by-version."sntp"."0.2.4";
-  by-version."sntp"."0.2.4" = self.buildNodePackage {
-    name = "sntp-0.2.4";
+    self.by-version."semver"."4.3.3";
+  "semver" = self.by-version."semver"."4.3.3";
+  by-spec."sntp"."1.x.x" =
+    self.by-version."sntp"."1.0.9";
+  by-version."sntp"."1.0.9" = self.buildNodePackage {
+    name = "sntp-1.0.9";
+    version = "1.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
-      name = "sntp-0.2.4.tgz";
-      sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
+      url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+      name = "sntp-1.0.9.tgz";
+      sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
     };
     deps = {
-      "hoek-0.9.1" = self.by-version."hoek"."0.9.1";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socks5-client"."0.x" =
     self.by-version."socks5-client"."0.3.6";
   by-version."socks5-client"."0.3.6" = self.buildNodePackage {
     name = "socks5-client-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socks5-client/-/socks5-client-0.3.6.tgz";
@@ -1768,7 +2748,11 @@
       "ipv6-3.1.1" = self.by-version."ipv6"."3.1.1";
       "network-byte-order-0.2.0" = self.by-version."network-byte-order"."0.2.0";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."socks5-client"."^0.3.6" =
     self.by-version."socks5-client"."0.3.6";
@@ -1779,6 +2763,7 @@
     self.by-version."socks5-http-client"."0.1.6";
   by-version."socks5-http-client"."0.1.6" = self.buildNodePackage {
     name = "socks5-http-client-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socks5-http-client/-/socks5-http-client-0.1.6.tgz";
@@ -1788,13 +2773,18 @@
     deps = {
       "socks5-client-0.3.6" = self.by-version."socks5-client"."0.3.6";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "socks5-http-client" = self.by-version."socks5-http-client"."0.1.6";
   by-spec."socks5-https-client"."^0.2.2" =
     self.by-version."socks5-https-client"."0.2.2";
   by-version."socks5-https-client"."0.2.2" = self.buildNodePackage {
     name = "socks5-https-client-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/socks5-https-client/-/socks5-https-client-0.2.2.tgz";
@@ -1805,13 +2795,18 @@
       "socks5-client-0.3.6" = self.by-version."socks5-client"."0.3.6";
       "starttls-0.2.1" = self.by-version."starttls"."0.2.1";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "socks5-https-client" = self.by-version."socks5-https-client"."0.2.2";
   by-spec."spotty"."^1.0.0" =
     self.by-version."spotty"."1.0.0";
   by-version."spotty"."1.0.0" = self.buildNodePackage {
     name = "spotty-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/spotty/-/spotty-1.0.0.tgz";
@@ -1822,13 +2817,18 @@
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "spotty" = self.by-version."spotty"."1.0.0";
   by-spec."sprintf"."0.1.x" =
     self.by-version."sprintf"."0.1.5";
   by-version."sprintf"."0.1.5" = self.buildNodePackage {
     name = "sprintf-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
@@ -1837,12 +2837,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."stack-trace"."0.0.x" =
     self.by-version."stack-trace"."0.0.9";
   by-version."stack-trace"."0.0.9" = self.buildNodePackage {
     name = "stack-trace-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
@@ -1851,12 +2856,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."starttls"."0.x" =
     self.by-version."starttls"."0.2.1";
   by-version."starttls"."0.2.1" = self.buildNodePackage {
     name = "starttls-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz";
@@ -1865,12 +2875,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."string_decoder"."~0.10.x" =
     self.by-version."string_decoder"."0.10.31";
   by-version."string_decoder"."0.10.31" = self.buildNodePackage {
     name = "string_decoder-0.10.31";
+    version = "0.10.31";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
@@ -1879,12 +2894,75 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."stringstream"."~0.0.4" =
+    self.by-version."stringstream"."0.0.4";
+  by-version."stringstream"."0.0.4" = self.buildNodePackage {
+    name = "stringstream-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
+      name = "stringstream-0.0.4.tgz";
+      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-ansi"."^2.0.1" =
+    self.by-version."strip-ansi"."2.0.1";
+  by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
+    name = "strip-ansi-2.0.1";
+    version = "2.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
+      name = "strip-ansi-2.0.1.tgz";
+      sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."supports-color"."^1.3.0" =
+    self.by-version."supports-color"."1.3.1";
+  by-version."supports-color"."1.3.1" = self.buildNodePackage {
+    name = "supports-color-1.3.1";
+    version = "1.3.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
+      name = "supports-color-1.3.1.tgz";
+      sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tablify"."0.1.5" =
     self.by-version."tablify"."0.1.5";
   by-version."tablify"."0.1.5" = self.buildNodePackage {
     name = "tablify-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tablify/-/tablify-0.1.5.tgz";
@@ -1893,7 +2971,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "tablify" = self.by-version."tablify"."0.1.5";
   by-spec."tablify".">=0.1.5" =
@@ -1902,6 +2984,7 @@
     self.by-version."timeago"."0.1.0";
   by-version."timeago"."0.1.0" = self.buildNodePackage {
     name = "timeago-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/timeago/-/timeago-0.1.0.tgz";
@@ -1910,28 +2993,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "timeago" = self.by-version."timeago"."0.1.0";
-  by-spec."tough-cookie"."~0.9.15" =
-    self.by-version."tough-cookie"."0.9.15";
-  by-version."tough-cookie"."0.9.15" = self.buildNodePackage {
-    name = "tough-cookie-0.9.15";
+  by-spec."tough-cookie".">=0.12.0" =
+    self.by-version."tough-cookie"."0.13.0";
+  by-version."tough-cookie"."0.13.0" = self.buildNodePackage {
+    name = "tough-cookie-0.13.0";
+    version = "0.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz";
-      name = "tough-cookie-0.9.15.tgz";
-      sha1 = "75617ac347e3659052b0350131885829677399f6";
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.13.0.tgz";
+      name = "tough-cookie-0.13.0.tgz";
+      sha1 = "34531cfefeba2dc050fb8e9a3310f876cdcc24f4";
     };
     deps = {
       "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."triplesec".">=3.0.16" =
     self.by-version."triplesec"."3.0.19";
   by-version."triplesec"."3.0.19" = self.buildNodePackage {
     name = "triplesec-3.0.19";
+    version = "3.0.19";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz";
@@ -1945,29 +3038,39 @@
       "more-entropy-0.0.7" = self.by-version."more-entropy"."0.0.7";
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "triplesec" = self.by-version."triplesec"."3.0.19";
   by-spec."triplesec".">=3.0.19" =
     self.by-version."triplesec"."3.0.19";
-  by-spec."tunnel-agent"."~0.3.0" =
-    self.by-version."tunnel-agent"."0.3.0";
-  by-version."tunnel-agent"."0.3.0" = self.buildNodePackage {
-    name = "tunnel-agent-0.3.0";
+  by-spec."tunnel-agent"."~0.4.0" =
+    self.by-version."tunnel-agent"."0.4.0";
+  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
+    name = "tunnel-agent-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
-      name = "tunnel-agent-0.3.0.tgz";
-      sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+      name = "tunnel-agent-0.4.0.tgz";
+      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tweetnacl"."^0.12.0" =
     self.by-version."tweetnacl"."0.12.2";
   by-version."tweetnacl"."0.12.2" = self.buildNodePackage {
     name = "tweetnacl-0.12.2";
+    version = "0.12.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz";
@@ -1976,28 +3079,38 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."tweetnacl"."^0.12.2" =
     self.by-version."tweetnacl"."0.12.2";
   by-spec."underscore".">= 1.0.0" =
-    self.by-version."underscore"."1.8.2";
-  by-version."underscore"."1.8.2" = self.buildNodePackage {
-    name = "underscore-1.8.2";
+    self.by-version."underscore"."1.8.3";
+  by-version."underscore"."1.8.3" = self.buildNodePackage {
+    name = "underscore-1.8.3";
+    version = "1.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz";
-      name = "underscore-1.8.2.tgz";
-      sha1 = "64df2eb590899de950782f3735190ba42ebf311d";
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+      name = "underscore-1.8.3.tgz";
+      sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."~1.4" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = self.buildNodePackage {
     name = "underscore-1.4.4";
+    version = "1.4.4";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
@@ -2006,7 +3119,11 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."underscore"."~1.4.3" =
     self.by-version."underscore"."1.4.4";
@@ -2014,6 +3131,7 @@
     self.by-version."underscore.string"."2.3.3";
   by-version."underscore.string"."2.3.3" = self.buildNodePackage {
     name = "underscore.string-2.3.3";
+    version = "2.3.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
@@ -2022,12 +3140,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."winston"."0.8.x" =
     self.by-version."winston"."0.8.3";
   by-version."winston"."0.8.3" = self.buildNodePackage {
     name = "winston-0.8.3";
+    version = "0.8.3";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
@@ -2039,16 +3162,21 @@
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "isstream-0.1.1" = self.by-version."isstream"."0.1.1";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."wordwrap"."~0.0.2" =
     self.by-version."wordwrap"."0.0.2";
   by-version."wordwrap"."0.0.2" = self.buildNodePackage {
     name = "wordwrap-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
@@ -2057,12 +3185,17 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   by-spec."wrappy"."1" =
     self.by-version."wrappy"."1.0.1";
   by-version."wrappy"."1.0.1" = self.buildNodePackage {
     name = "wrappy-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
       url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
@@ -2071,6 +3204,29 @@
     };
     deps = {
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xtend"."^4.0.0" =
+    self.by-version."xtend"."4.0.0";
+  by-version."xtend"."4.0.0" = self.buildNodePackage {
+    name = "xtend-4.0.0";
+    version = "4.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
+      name = "xtend-4.0.0.tgz";
+      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
 }
diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix
index 6cc775b72d3..b8419d32fed 100644
--- a/pkgs/applications/misc/librecad/2.0.nix
+++ b/pkgs/applications/misc/librecad/2.0.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
 
 stdenv.mkDerivation {
-  name = "librecad-2.0.2";
+  name = "librecad-2.0.7";
 
   src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.2;
-    name = "librecad-2.0.2.tar.gz";
-    sha256 = "0a5rs1h4n74d4bnrj91ij6y6wzc8d6nbrg9lfwjx8icjjl6hqikm";
+    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.7;
+    name = "librecad-2.0.7.tar.gz";
+    sha256 = "0r6d7fk9jl8368rbxzk9rwv0mciw28hlv77z29jf36amc42n6z4d";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index a1ed7b252a2..ac128b2460e 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.72";
+  version = "0.7.73";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
-    sha256 = "04sqm2cziqvnghbla89f83vy46bmsfcvlq7f4m4kfcs24bjzfwr1";
+    sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index de83cf22e04..ce2875656b6 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.72";
+  version = "0.7.73";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2";
-    sha256 = "04sqm2cziqvnghbla89f83vy46bmsfcvlq7f4m4kfcs24bjzfwr1";
+    sha256 = "14mbiy1xhj4nlp7hnfqvi518xn1f718b2vbl8xkjqr2sqjdf5jm7";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 416913b7a55..9b39f1c3c38 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -1,12 +1,13 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, zlib, freetype, libjpeg, jbig2dec, openjpeg
 , libX11, libXext }:
+
 stdenv.mkDerivation rec {
-  version = "1.6";
+  version = "1.7";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "http://mupdf.com/download/archive/${name}-source.tar.gz";
-    sha256 = "0qx51rj6alzcagcixm59rvdpm54w6syrwr4184v439jh14ryw4wq";
+    sha256 = "0hjn1ywxhblqgj63qkp8x7qqjnwsgid3viw8az5i2i26dijmrgfh";
   };
 
   buildInputs = [ pkgconfig zlib freetype libjpeg jbig2dec openjpeg libX11 libXext ];
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 240a975e611..821b362b365 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchhg, fetchurl, pythonPackages, curl }:
+{ stdenv, fetchFromGitHub, fetchurl, pythonPackages, curl }:
 
 let
   getmodel = name: sha256: {
     src = fetchurl {
-      url = "http://iupr1.cs.uni-kl.de/~tmb/ocropus-models/${name}";
+      url = "http://www.tmbdev.net/ocropy/${name}";
       inherit sha256;
     };
     inherit name;
@@ -12,58 +12,47 @@ let
   models = [
     (getmodel "en-default.pyrnn.gz"
       "1xyi3k3p81mfw0491gb1haisazfyi2i18f1wjs1m34ak39qfqjdp")
-    (getmodel "en-uw3-linerel-2.cmodel.gz"
-      "0zdw0db2znxxd4h7aa09506nkbxd1cfqacxzyzlx42bjn951wcpw")
-    (getmodel "en-mixed-3.ngraphs.gz"
-      "1fqw7pxmjwapirp9xv3b0gn9pk53q4740qn5dw4wxfxk9dpp9lr4")
-    (getmodel "en-space.model.gz"
-      "0w5hnjm6rz5iiw1p2yixj147ifq11s9jfzrxk4v4xxmcyn365096")
-    (getmodel "en-mixed.lineest.gz"
-      "0skrziksn3zb3g8588y7jd10pnl2pzrby0119ac0awapzzg9vkvw")
-    (getmodel "uw3unlv.pyrnn.gz"
-      "0g08q9cjxxx3mg1jn4654nalxr56y2jq1h33pwxrj5lrckr7grb9")
-    (getmodel "en-uw3unlv-perchar.cmodel.gz"
-      "1izvm0wkb2vh58hjp59fw97drv17zdzrw6mz3aanrg5ax6fnfadk")
-    (getmodel "gradient.lineest.gz"
-      "1bw9hj9byjxi31rjh2xiysnx8c72jz0npxa54xgjwsqg7ihl8jzw")
-    (getmodel "en-mixed-round1.lineest.gz"
-      "1fjkygyrg4ng7kx4iqa4yhgvmw1zq72p3q5p0hcb2xxhqc04vx7c")
-    (getmodel "frakant.pyrnn.gz"
-      "0i1k95f2a8qlc6m7qq11pmjfcimyrjsfjvv20nrs2ygp9pwskmxp")
     (getmodel "fraktur.pyrnn.gz"
       "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b")
   ];
+
+  version = "20150316";
 in
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonPackage {
   name = "ocropus-${version}";
-  version = "20130905";
 
-  src = fetchhg {
-    url = "https://code.google.com/p/ocropus.ocropy";
-    rev = "a6e0fbd820ce";
-    sha256 = "1s0v0gd6psfjp6lghwl2dj49h18mgf2n2z8hqzw8430nzhglnlvr";
+  src = fetchFromGitHub {
+    sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g";
+    rev = "5ba07bb959d605ec15424dd2b8f3d7245820084e";
+    repo = "ocropy";
+    owner = "tmbdev";
   };
 
-  patches = [ ./display.patch ];
-
   propagatedBuildInputs = with pythonPackages; [ curl numpy scipy pillow
     matplotlib beautifulsoup4 pygtk lxml ];
 
   enableParallelBuilding = true;
   
   preConfigure = with stdenv.lib; ''
-    ${concatStrings (map (x: "ln -s ${x.src} models/${x.name};") models)}
+    ${concatStrings (map (x: "ln -s ${x.src} models/`basename ${x.name}`;")
+      models)}
+
+    substituteInPlace ocrolib/{common,default}.py --replace /usr/local $out
+  '';
 
-    sed -i 's|/usr/local|'$out'|' ocrolib/common.py
-    sed -i 's|/usr/local|'$out'|' ocrolib/default.py
-    ${pythonPackages.python}/bin/${pythonPackages.python.executable} setup.py download_models
+  checkPhase = ''
+    patchShebangs ./run-test
+    substituteInPlace ./run-test \
+      --replace 'ocropus-rpred' 'ocropus-rpred -Q $NIX_BUILD_CORES'
+    PATH=".:$PATH" ./run-test
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Open source document analysis and OCR system";
     license = licenses.asl20;
-    homepage = https://code.google.com/p/ocropus/;
-    maintainers = with maintainers; [ iElectric viric ];
+    homepage = https://github.com/tmbdev/ocropy/;
+    maintainers = with maintainers; [ iElectric nckx viric ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/ocropus/display.patch b/pkgs/applications/misc/ocropus/display.patch
deleted file mode 100644
index 2b4e63652b7..00000000000
--- a/pkgs/applications/misc/ocropus/display.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://code.google.com/p/ocropus/issues/detail?id=365
-
-diff --git a/setup.py b/setup.py
-index c6ade25..a2ad6bf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -8,7 +8,10 @@ assert sys.version_info[0]==2 and sys.version_info[1]>=7,\
- from distutils.core import setup, Extension, Command
- from distutils.command.install_data import install_data
- 
-+import matplotlib
-+matplotlib.use('Agg')
- from ocrolib import default
-+
- modeldir = "models/"
- modelfiles = default.installable
- modelprefix = "http://iupr1.cs.uni-kl.de/~tmb/ocropus-models/"
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 5f75c05a68f..cc8bd42ec39 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, python, fetchurl }:
 
-buildPythonPackage {
-  name = "ranger-1.6.1";
+buildPythonPackage rec {
+  name = "ranger-1.7.0";
 
   meta = {
     description = "File manager with minimalistic curses interface";
@@ -12,11 +12,9 @@ buildPythonPackage {
   };
 
   src = fetchurl {
-    url = "http://ranger.nongnu.org/ranger-1.6.1.tar.gz";
-    sha256 = "0pnvfwk2a1p35246fihm3fsr1m7r2njirbxm28ba276psajk1cnc";
+    url = "http://ranger.nongnu.org/${name}.tar.gz";
+    sha256 = "066lp1k2zcz2lnww2aj0m3fgn9g5ms67kxgclhgq66pxkjwgc4kx";
   };
 
-  doCheck = false;
-
   propagatedBuildInputs = with python.modules; [ curses ];
 }
diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix
index bb0cf451957..a57647e18e7 100644
--- a/pkgs/applications/misc/rescuetime/default.nix
+++ b/pkgs/applications/misc/rescuetime/default.nix
@@ -5,17 +5,17 @@ let
     if stdenv.system == "i686-linux" then fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb";
-      sha256 = "03dj0ivavxlcvx7dv7y6zllwqkclfyxkfax691zv2qclmk5gf8wz";
+      sha256 = "1np8fkmgcwfjv82v4y1lkqcgfki368w6317gac3i0vlqi4qbfjiq";
     } else fetchurl {
       name = "rescuetime-installer.deb";
       url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb";
-      sha256 = "11by4lkij1ryv8h3mz55hj3ssrikl697rs5b7mlg3g058gr2v3wl";
+      sha256 = "0bb0kzayj0wwvyh1b8g0l3aw2xqlrkhn85j3aw90xmchnsx42xh5";
     };
 
 in
 
 stdenv.mkDerivation {
-  name = "rescuetime-2.8.6.1015";
+  name = "rescuetime-2.8.8.1040";
   inherit src;
   buildInputs = [ dpkg makeWrapper ];
   unpackPhase = ''
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
new file mode 100644
index 00000000000..30ce67a82f6
--- /dev/null
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgs, python, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  version = "1.2.2";
+  name = "rtv-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/michael-lazar/rtv/archive/v${version}.tar.gz";
+    sha256 = "0pisairv28lhqvq8zs0whz3ww8fraj98941kk5idyxadbq0icmk3";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    requests
+    six
+    praw
+    python.modules.curses
+  ];
+
+  meta = {
+    homepage = https://github.com/michael-lazar/rtv;
+    description = "Browse Reddit from your Terminal";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+  };
+}
+
+
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index 746b5e5ef46..0d3337b478f 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "synergy-${version}";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "synergy";
     repo = "synergy";
     rev = version;
-    sha256 = "0himg6c50x5wz5nc6rgd54rph1w6nin6j9f08pa4spsxn9b5h8ks";
+    sha256 = "0n4zvz669vi2wyn6i6xhxp0j3nvjl4yzm441cqv6hb0d5k26wbcn";
   };
 
   patches = optional stdenv.isLinux ./cryptopp.patch;
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index 5133ad3c29e..c338a101563 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -1,50 +1,27 @@
-x@{builderDefsPackage
-  , jre, unzip
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, jre }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="vue";
-    version="3.2.2";
-    name="${baseName}-${version}";
-    url="releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
-    hash="0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
+stdenv.mkDerivation rec {
+  name = "vue-${version}";
+  version = "3.2.2";
+  src = fetchurl {
+    url = "releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
+    sha256 = "0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy"];
+  phases = "installPhase";
 
-  doDeploy = a.fullDepEntry ''
+  installPhase = ''
     mkdir -p "$out"/{share/vue,bin}
     cp ${src} "$out/share/vue/vue.jar"
-    echo '#!${a.stdenv.shell}' >> "$out/bin/vue"
-    echo '${a.jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
+    echo '#!${stdenv.shell}' >> "$out/bin/vue"
+    echo '${jre}/bin/java -jar "'"$out/share/vue/vue.jar"'" "$@"' >> "$out/bin/vue"
     chmod a+x "$out/bin/vue"
-  '' ["addInputs" "defEnsureDir"];
+  '';
 
   meta = {
     description = "Visual Understanding Environment - mind mapping software";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.free; # Apache License fork, actually
+    maintainers = with stdenv.lib.maintainers; [ raskin ];
+    platforms = with stdenv.lib.platforms; linux;
+    license = stdenv.lib.licenses.free; # Apache License fork, actually
   };
-}) x
+}
diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix
index 4ff838db653..69b98bc6f44 100644
--- a/pkgs/applications/misc/xkblayout-state/default.nix
+++ b/pkgs/applications/misc/xkblayout-state/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "xkblayout-state-${version}";
+  name = "${pname}-${version}";
+  pname = "xkblayout-state";
   version = "1b";
 
   src = fetchurl {
-    url = "https://github.com/nonpop/${name}/archive/v${version}.tar.gz";
+    url = "https://github.com/nonpop/${pname}/archive/v${version}.tar.gz";
     sha256 = "1m1nnplrdb2mclhj0881wf78ckvdnyk24g4k4p5s5gpd96cxxwnx";
   };
 
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index e65faeac6c2..dd3903cde27 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -1,13 +1,12 @@
-{ composableDerivation, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
+{ stdenv, fetchurl, lib, qt4, openssl, autoconf, automake, pkgconfig }:
 
-let inherit (composableDerivation) edf wwf; in
-
-composableDerivation.composableDerivation {} ( fixed : {
-  name = "yate-2.2.0_1";
+stdenv.mkDerivation rec {
+  name = "yate-${version}";
+  version = "5.4.2-1";
 
   src = fetchurl {
-    url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz;
-    sha256 = "1z1rvzcw6449cvczig1dkh6rlp6f8zv649sk0ldz38mwkyd07257";
+    url = "http://voip.null.ro/tarballs/yate5/${name}.tar.gz";
+    sha256 = "08gwz0gipc5v75jv46p2yg8hg31xjp6x7jssd0rrgsa3szi5697n";
   };
 
   # TODO zaptel ? postgres ?
@@ -17,7 +16,7 @@ composableDerivation.composableDerivation {} ( fixed : {
   preConfigure =
     ''
       sed -i 's@,/dev/null@@' configure
-    ''; 
+    '';
 
   # --unresolved-symbols=ignore-in-shared-libs makes ld no longer find --library=yate? Why?
   preBuild =
@@ -28,12 +27,14 @@ composableDerivation.composableDerivation {} ( fixed : {
         -e 's@-Wl,--retain-symbols-file@@'
     '';
 
-  meta = { 
-    description = "YATE - Yet Another Telephony Engine";
+  meta = {
+    description = "Yet another telephony engine";
     homepage = http://yate.null.ro/;
-    license = ["GPL" "MPL"]; # Yate's license is GPL with an exception for linking with OpenH323 and PWlib (licensed under MPL).
+    # Yate's license is GPL with an exception for linking with
+    # OpenH323 and PWlib (licensed under MPL).
+    license = ["GPL" "MPL"];
     maintainers = [ lib.maintainers.marcweber ];
     platforms = lib.platforms.linux;
   };
 
-} )
+}
diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
index 9a7c07c322e..83b6151e4f7 100644
--- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix
+++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
@@ -5,18 +5,18 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "cbce76f73f47c23d9073644504fa454976629450d008354bd8faef1bddf368fd"
-    else if stdenv.system == "i686-linux" then "d3e8583c8a54cbeb34ea3621daf0498316a959d944b30f24aa4e518a851ecdeb"
+  sha256 = if stdenv.system == "x86_64-linux" then "9e1427b7a6c6e960a378b97ac458ad53c445457ed0e5c8bf693f446597377b78"
+    else if stdenv.system == "i686-linux" then "4d446255ff6332da9a244737d6c20e7dcd32d24a8eaabffbaf73147e5898ed8f"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "2.0.93";
+  version = "2.0.105";
 
   src  = fetchurl {
-    url  = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz";
+    url  = "https://download-cdn.getsyncapp.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";
     inherit sha256;
   };
 
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 14d53357b89..247a27ca37b 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -3,7 +3,7 @@
 # default dependencies
 , bzip2, flac, speex, icu, libopus
 , libevent, expat, libjpeg, snappy
-, libpng, libxml2, libxslt
+, libpng, libxml2, libxslt, libcap
 , xdg_utils, yasm, minizip, libwebp
 , libusb1, libexif, pciutils
 
@@ -86,7 +86,7 @@ let
   defaultDependencies = [
     bzip2 flac speex icu opusWithCustomModes
     libevent expat libjpeg snappy
-    libpng libxml2 libxslt
+    libpng libxml2 libxslt libcap
     xdg_utils yasm minizip libwebp
     libusb1 libexif
   ];
diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index cfa5f1e009b..27af85de546 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -1,7 +1,7 @@
 { system ? builtins.currentSystem }:
 
 let
-  inherit (import <nixpkgs> {
+  inherit (import ../../../../../../. {
     inherit system;
   }) lib writeText stdenv;
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 4978ba0faeb..4d002119a89 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_source.rb > source.nix
 
 {
-  version = "37.0.1";
+  version = "37.0.2";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "179a537f1260b8e30b7449c5505b94b37f0d41e3"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "ae21b72d13a77cb0e573dc22ab3db0c5ed2fffec"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "b30cae46606cb15a631e30cf546784ae5bbe6ae1"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "7877dbf9eb3326065396cf89d6915d2e4ede8df3"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "7b6162cb4cdc708be730342d302663bba9bfd599"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "d9e94f06d3ce3d8effeb1621f34409e55394d355"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "df11def71fa21f35c56850d8e2f78d4613e6b3d9"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "992c0493f14b560fae2abeedbc89947af5e77b01"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "48cc7960eb1b7359dcb2ef764e7e46de1af7d764"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "fc352ac4830922c958def4a4a15440958435f396"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "43a11793cb0ccb23414d6a512d1482a484704794"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "8606132de8acc56a78a2f6453f154c77f2f30384"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "b437824b2bdebf7b776fa79630c774c2d4e20929"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "1cf7549ab160f5bdce07d69f16e79ed687ed9520"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "289bccea6a881fbd8df27cf97864019fd5ef2cd9"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "ea4eb7de6639c45f4890555d893213051bdb9a7a"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "3117f051ec7c13726d058559239845703be18fa4"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "f1803a5012b336b245bffb03ca5b2020b8173373"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "c99b3170636d5010e9a1392d0038d491766b9612"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "60c696a3a99ab7d3b632025994f807eef230fb88"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "7cce3dfd5433b5d84eab3fa66fd053be799dc12e"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "fe100cbdb83edb573397c7d9e1fe4c025bd0e44f"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "ec0ae6c4aad9cb9387a2250e983658bc900364ce"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "8e9ffba6ffe45ee90e0496807832fcb67f953417"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "158719e9e4c1d3cb7409e3cdd976b93e69157521"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "92d0be401e919366029c45f6c2faf06716a42b95"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "2107d600ef72ced48fa9c57356eeceb745ad3f4b"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "7bd119c52b7f15ed309250bee3c9e950be973373"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "21fb6a32d8812e33cae87c57a734a388dcaab659"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "d5a380fa2b03f94913c8286635582f448bb10f18"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "c5da1b20a262a4047d68ec5fa918ed0c34fd9319"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "afcf20e60c3e009e2fb4b63067794a5e10b3125c"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "29b13a3c401d23e7fc3e53c771c09a1646f1c2bd"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "fa2b458839cd002f29196fb011d898eb31f39591"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "3264268b5e8cae1e19db0270414a2124c6aa37c0"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "efd1ca985a514e706b8f6cacf067834539e01687"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "b439d609b77bc8471b1225772431d0045250872a"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "2541f627b0d70a0e82048fcd5d27314f2570e57e"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "f83a2c3b182850f0a42bb23bd59b3e0cd010f4a4"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "11152704a3317a8643765971081fd164a1fd412b"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "1fa9ecc9fca6843c43d7acf10f747ad7bccad1af"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "b0780f9ba0bd6192ac7bfb646221d1354044992d"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "78a696320ac627c92cdf8002d2ee64fc9ff91298"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "6cdef8a3ecf19adba73dff406a6e2347773145ea"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "6549568f0ccc153c9054f79eb3333c4a767b9acc"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "f606267a84ed0283faeed88984998a8b345ad2b7"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "8599d080063494131520abac51b8fe36015da47e"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "5bc6516b5bbcbc350c638facf02c48cb6422d4f3"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "affd50b2b4faedea658c054b15c68c30a101abd6"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "f968320f1e03edff75551832fc100f8926ab2cda"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "2d29f0f0e3c1a7cbdf9152a90a23f382f3ff33fc"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "1655f713a798ac64e208bc645892ac1a9730c42f"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "394fb56f9fe9e92d8d0462d26c1f23100cdfbbcb"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "3102debd55fdf4460a53e044628045296264fb26"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "1ff59b283608606766fc3f8170fed562990e28ef"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "faedfce978aaa04bc6b5b3e531307c2bf6911d92"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "383294c3debd1171cecbe7b9e69db918477057d3"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "be5c77971bea3a0ba520656264eafe23693d04eb"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "0e7dabd66975d5e8212da141c2eb36625ad8c583"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "d6d5cdf2c9a05916158016817f84229c6a24307b"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "6c066ba7a4bb05445bb4ce82e9515aeeaf25dab7"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "c343770fea544d5221d8af5899f0b8e6ad8f657a"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "264e2396bebafb6ab6a41481c7f33e3270769dff"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "78b2060ebabce282ed5bf7655ee9faf1696268c7"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "9c1a45b22d8fef51e101e4789200305cb38422a4"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "be45b36bf6bf913cee472d511e8bb6bfa03cb6d1"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "5d0caa1dd35e0388f70966b74582efb36bd290c1"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "3a5cc6d7f59e8e62d065edc4e6db3290228d067c"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "a35e82ebcf94bf9df32628c3d5e38ac1bf322f25"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "c02ab4bf770fe5bb1118aa7b6c826bd707255e79"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "4cd407afbb5f117e54da4749d75da9e604314f3b"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c01a19d7beab0cb221197ad9d441e6858bb7c3d4"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "11d4ad74f036dc24537623fe6b756679dfffa065"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "9e06f955e80fbf3f39f7b0e96aef0278c3d6cde3"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "6f2a82aae2d23a8f61413ad0db962498ce270015"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "03172a2c69014f3f6f1f2f3e1d5a911a765b7f63"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "39b2be58e0f86f8a63d64bca60e0e49d8cf269ba"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "8221c5423b6de5f8db50cdf452c6cb7c05213940"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "a39006387ad757f704e3630fca2569d1d287d05a"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "ef6ee8fa645fb2b4c6513b09b3b989589ac82148"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "69cd720b5783c30588ae1d8de6dd8adf4457f6d7"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "484b891931cfe7f5612b2b996cf71803da79ebae"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "da5d22d99afd0555a3e63bd42338fc1b819cdba7"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "95461441c10107f9bec5e3876ebb904a095d65c5"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "b55f4b75c3d2237728d368fe7257231de1d43e62"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "c8cfd162a1e59ff05a16f1426aee7142cbe4c55c"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "f0036a02921312d219fe77fb9ecc3fbbf1252796"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "1e322d3e0f113e03f3c2aaa4b324b5e26401a2a8"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d1dfc555a751e48ecc9c91a98cd9e4b8df9cc66f"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "3275da78c36df0ca6f1fc4754c2139d74fafea4d"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "63744d3b0e9eaa4d0e93f7b378882329e8f75c97"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "c36ae3ae88e3e7f6e0ab6e18648b2b165ac5a330"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "a65b62900cb3d0e24eff5d429995a01064b3aae2"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "092428e22d92d7f056339e3e79eb53463f01021b"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "79b528e45efc78b086a6d50789a4fc5e3c3ab0b9"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "ea0451cf50efe053e53a08085fa28de422f95c02"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "5ed262b081e2ac9bebf04a5b573a1260492263cb"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "ff41ad0691963bb19890905a4863d787725d2631"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "748146b26ed457344f9221c1cd9e58d59db6bf80"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "3758b66e89576150b4895256a3906a928fe69a20"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "b65a6e7e928c8d52cd2a78c94ded54a56d3c91cf"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "6dc34498250dea567811a8db9a0c52ebbc6fce35"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "90e6721fdfd1309d03c7ec7f8a083f555a33e535"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "6cafee1e4db15da7c291b0ce097c69258c664bf2"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "0af800c16d56132c57aa0f33e653e02ed6f1a8f8"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "ab2b7b49b970f2c6f5609d3874af5f7c9e0be28f"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "f0e53f8bc7b45bfdc4701f9cf7db245b648759cd"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "0463eddc64c8c85caf93b03d98ac39ee6f98ebab"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "aeca5283a62d0f7f13a9f58f9217fb97b7866b78"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "43a5ef9908a7141a710275e369dab51b08081673"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "c356c78e037807077161350b922d5a19357ec57f"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "d482e599c1de50bb99d819c9fa591fedc7d7f842"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "7b53ad61f5c0753307088053948459ac33e9f85d"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "ef7612a38e11aaa665eff285001bfb28f291471a"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "3f2d34b946dd8faaac6ffc4ad30a7df97d4a8ebf"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "222da5ce6f403935cbeff6162d28ba9d2b2f29bc"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "a86756be94c91d4a68010ec8ef150a8ff6203b66"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "a1f8f2f7205152c1fa14da8929ed8448d6aeaf9a"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "f6fb36516e34fdc3b768bec7183ebceea692608a"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "3b963c905a3c8236866fd5434e886aac79211831"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "1115c894abb78dfd344ca47754fed1d6b491f7b9"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "abf7305a7ab69b4b030e66d2893f092cf61b1497"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "7ac1d330dbe7eed29bf84d3bcb6f96092fdf1f3d"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "1acb6fb37b2b14b5516a5f156100afd21b29490f"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "119b92b8553aaa5cb568631cdb36127d27768de3"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "3495b2263d92763975ddf4c643774295c9066e22"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "da9628a56892b5b254326f5fc06ffa144871cbb4"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "dfc0931bc426e1230a3efd1d33e22f2fd3e1849a"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "87508f44b0b94e4a5565d7d78463ad9a38ff2686"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "b0fc5e86738ff973766671e34916f6a7d824b971"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "daa29d6040d813fa5218bb419a5cf68358dd477b"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "614f733bfeb6ec6bbcc2cad1e1ff107fc9e2edab"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "751738d7a999293e45f41876d9ce9df019b14552"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "814968337f9f0f8b115d6d5415c48486c321a5bc"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "7b4f7dd33edd25e70de793772f9c9072baf351d5"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "8c243f2e0dc99400aed67c761dfd80a2f500f749"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8edad0149c5a69515be113a399a9ea94459acb54"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "fb946da0f7620122aa31b8d16de54ce76d46ad42"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "43cdec3845b7051f36c432d48f20863ab2526272"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "46149817fe93b954acb284431d03b60cb91913b8"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "57c08ee9dfa72e15572ca6a698562b23a76b098e"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "79da06ee88fab7f6b947a14ee5eac79b0f8c9e6e"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "b91f1723e7811d89cc35a8b765dc69eee57a0655"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "55d456daa6525500d5e75a84d3206c395ebfa130"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "260cefb8b0057551b7b57e7b8c3bae2745a661b7"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "b9746f9bee2bbb166f165652207ab6820154947d"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "a2de5c4f49ea17a1ccda856ab44ad4dcb4d81bf2"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "aaaaa26ca608a519fc9f4176209b8c97d5993322"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "25582122ff73ced434f4e8f5a2c36eac2fef3d9b"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "d3f04f7942dd6d7013441fdbc2ff344a805c8e13"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "0a0e84c24d653e2931a24086518b09c88e9eaaec"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "60055d988359074dd464d1c5a58aad5bf77d363c"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "929f66a3e0789ea364af2dd50b23bf8b3eb2dc2e"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "c39f6fd009055f452a383f4fca0ec584de149488"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "782bf37d1f9de7c2453b6eac8531e50a011ef9fe"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "f9487559d2d958c7adc75d7a5004ee41b220ba3e"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "55934039ec798ae48b722c53b0556764e02f01fa"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "d3208d099c0f91a7bd51dc658ff92b686062aae4"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "6907ec5b393467d4025a771191ab8e8a5aa6c60d"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "3d982f8acca0983ace02ed50cf7705613aa4a4bc"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "463653494603fe52b078df637821cdfee275d7df"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "01319af6358d4acecf364c9c291cab8aa0d87245"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "16155e79b6bfdd08917e97d1fe362f1e1bba5d20"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "726bff6d145a8f7584b8da90e27649a0da8bcbc9"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "27c67d2697e2b3d30ea8b241329eee79a03dc698"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "0f7f67506517dd1196a9ca6f8cb66a78e87e32e9"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "40f2ae51e1f29511b7e7d97e92a5369ba392ac93"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "85ad767ada8a472b373dae5a0b72219860ca5cab"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "b0c41b4ac658b137505438fc79b4fba2518026ce"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "4192ad7e58ee26da69e7f634a272bf16c13b0f88"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "05d301387623e73ff8e47c55862b5a282a1da4bd"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "9db1bb46e9dd1326f1396c9f29a4607a9e0fd3ee"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "9fefd4b8b9082a7793d7e1a79d70ad85ea7a7b5e"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "1cd465d67089c9a85c18228a3f831e1359d16179"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "5a197ab692ecfa0e665cf3c03a29ff452c7dcad3"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "7637c196d5a8be4eefd805c088ef3ff33825603f"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "490b8af899c762e03608f37116293717b29e08f9"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "021ec599c4c9fc15dd88d4a7f5cc67ea5add17eb"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "77e30ca3d592424f80cf7c6cf31e90edddbebb3d"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "c101098915d8955da06751d5bdf2afe029054e3f"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "4287ba79e3aaaa601ae36643ad281c64554b847f"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "a787ec352ad94375600185902766ddfd91ac2d5d"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "4910dab93896ca7198b0154f0518ea5613b9a3b0"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "60d2c5122a67bae8d7c27fd01caa8d8eef0a143f"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "f2b70fc8a72d3d43a28cc51776eaacff22f288ad"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "409d2981a9aff39e23bd00231761899e65e80862"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "d27e921e475608cc52e6f07a22687497eb575b01"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "3bfa7ccaff6b04f9f1d0a479c10412a1308caf4f"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "d1c94f4c5fe83d52fa8e0ee586f78747616e1aaf"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "df3d38e59a5f233caa97134713e29cfa0dce6e27"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "5d01ef1267ddcc28e89009b86f2bb0a1e70fc386"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "440a5cd423147412335636326618e6b6b4c02416"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "1b9a9758c17ae74876ee6d09373dd99e89da05a3"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "940d2a07808aedc1f9c927b62f03b75270bbecd7"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "ee3f4b60ebb6fd3639ba7e2a3acd81ffcd13ba3f"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "f97ef4f7d3264b1aaf7699fe656f7dccf2cd4238"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "1a0e2da3014a811a766164953d003c136e28c174"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "703116b7d2583d21fda09933e5d8b9244c15c6ee"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "f501f69cf65bf340d5d5ce6744394f1a83c2daf3"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "eb74b7a12a2fddf8c47e9c0b0ab9359b7da10703"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "9ecc2ca3344559a63fefee144fde9faa391f1c29"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "5121ac58aa90f6a2e3b3f87bcf7dbd8670b7c9bf"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "42b9ace3d28e103fb195599c7c88ae78f16c3e4c"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "06b81108ec1509e36de108837f3c7ed1d96ebc0e"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "5fb5aee535cbede12169d1208d59fb1510207a66"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "e8e6ebb6d70a809cfe8e9102ede99b7ce6239b8e"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "13d157533dfca54b2a81625dbf3642b915f18e47"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "f7fc30f448e981a47c63c21756dcd6feff08783c"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "c9cdc5eefca689aabb7861e1ad9f44f42b36acb0"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "a76182a74992ce7031fa2254f056694910c963d1"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "afb09acee0d8456e2bab32d7579da39244754038"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "26bca2ea48a814b7b3ffb91fc461867bf775c6dc"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "36a8bf02f324d929c52a6f4f38bb8cd413bbec3e"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "2d39187c71ad006e1fbd7ab488c7560d1c88f9cb"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "8c9843547aec04af07a09c2f9902583b2daab3f0"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7778c1588580bf735e5dd4da89ab16528163a2c3"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "8aef1a9b8c6d1297d53002f1852bf52d6728c0fa"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "b7c2ad5da9c446939bf5e7071f84a6c3f8cd7b22"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "f85f36fcd900f642f53a74d6b843e2c67b3ab950"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "9dcc21ec189c588931e9bf38310522bb994d98c2"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "df80ad28979145a116d13db19c1c4e4b516c362d"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "b4e2da05fcd224ee01e2742d86d6b68bbdc108cd"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "73a83b23f2f1edcc4114df0b728e791c0626292a"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "fd451735b82a9b609b7f5f09aa0461191b490e5a"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "471873938d52ccebe8958407be1989937181ca9a"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "fc8c668d3d66a4e42be9aa0fd46ca84cf061dade"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "599823d54919efb62ffd4f65fd8b873720d64b08"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "cc2e509b55de680d4c9a95ac84765c5fb5fa8b44"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "754b32bbc0108f0e9c3c2e78f4c3e023e0486bff"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "7ab4206b66783a72fbe66c59fda120dc1afd0e3c"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "b52814a56ee620693aa4d658ada67e816a3daf59"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "b4cbbc984c7cc9f566ddce0e180410ccb79adc13"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "874cb197fe4498a83822fa386ac0824bffc9646d"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "056746dae1ba7e88a3f2403fb11b17ee831b199b"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "70bb834ac4d70fb1f20625027c73a6ece8f24cc8"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "57202dd5e34ed24e31f30bab79b0fcbb220e81b7"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "1e7287dfcd55f79e2157f3e49875a85f8a500c75"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "a6389d117c02ad2d9a997dcac64ba54c0310d715"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "5f82328712e7a16ae6dab5928623b0c652b646bc"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "5625f288967b3afc86a5d0136d64a1ba9581a6c1"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "73afc152eca2aeb346b1ea46a35b24132061c6af"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "ea1eab3e656f1bc68fc76425cd10be01945e7d66"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "24d0bc254438b96307c650700ca58d4e1b2d5fe8"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "d5b8f8f2052985c5f6dcbcdd5b122094347ed26b"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "118d981ae14f0425e27726afb516519b8de11390"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "af883c88b1a1e31a31a5a20d603b6109209c6f6b"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "44d6d4be0a1d1ddd75f476a94b3e2f6117ffca72"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "1629ea289914570257e611323618b477b2cf6576"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "c3ac3c11a490f37a6c209d753d6db5cd0c696dff"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "ea778a04a997632a38e70d3b96c5cc86545056d3"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "2e71d653007e589cd93a90e3239beb0074d33e9d"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "d878a2c149a96e2181d110e5ae265f35c0d44b62"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "2669d169a07cfbba062e147d12cd2a708579c76e"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "515622615f08c49a257ba6766ff0af1984c134a1"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "98bc0711616e665dc386e2c24b6a96ca5e3bfe25"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "a87c089251356074bc039c88e040138db3485539"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "b8fb6b91641f89159485ea65efb98c0f3aa23d84"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "2a2a6cc3dcf6b988138549649ede6b030c26818c"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "611ed2ff88f2872acfd1302f2ee3defe59142dbd"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "04922ffab952b7493059304d70064956cbaf5dce"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "13a43d380043f008e26f6fb77b16e6087c622a64"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "c7d45cdd831bafba438c81efa6cf5dd3f4a5657e"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "319a922186b3a8a9bea749014498e7f492043b4b"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "fdd0485af2b0684436bd6207701c287a2f3d05c6"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "33e82dea7e4a6e421ee23a94ba3a5ca5171fef34"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "fde72e1c7f93e4bcbebc9803e78d3e1cbce2d64b"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "ad702a8c047a5044ffb39039eaa74e7a86bd80ae"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "b83ff7323e9e66907a02f798cbb13a114fdc652c"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "c435f7c84ee188d09b5352163334a6458ec125ba"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "dc8858ac8ae9ef92013fa73f986daf6eade1ae26"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "c1d853deba529e750b8b705581aedb218f0c57d9"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "ba819e0bd9e630a6299fd8ef1dd99d1203abbd2d"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "1ffccd73282e28a52d99b8e98e3bf8ccefcf405b"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "9d68d2cb24ecf349ff504638e04272d56a636f90"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "e7cae2f72552fdcd1ccb57c760ddd4b694218513"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "57befb5643689b0ab2b456651735c75fc47a312a"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "345e0cf27301357d46ead1ef04fcc415c9db4f99"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "ac55fbb3ca6e8ad69c7aceebad99d18ed1353cbc"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "9c8d7c1a6b79dc2ff7a28e309e24fdb2d07385ba"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "e122a13e5485d9a8bf12e91487cf0247fb652eea"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "4da07bc2cdb714f8083032f99e702333ece64dfa"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "48b5f227919b06ee995b68ee0b6117df8f428942"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "ce22701571474e14ad690ccb5ee700c790667fe8"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "d901ffdec4217b389b96268f9094fc1d01cd2263"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "2191718817cbf9eefef3f7d994849a737e9adb88"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "f21245f7b00187d8b6fb3d30f6ec83510acf7546"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "47ebc8005959e431cca843a0514c2499449ed9b2"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "18220fab22a9737d1577455ec218f5b2f9226e53"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "e4e3d2de5a899c422b85ab1518c454d81ee54bd8"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "45a2551248ee43e189492b1416ed096799857382"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "aa1374d602fff2d393be86563d3cab72b35f7384"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "acfb03ba9f3d232ff68af24d61f80c6c0a94aeca"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "a9295e006982059b01f7bd7e2c6f8959de2a2e23"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "e37dcfc6bd29e8a5034624df71726091c6c768f0"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "b81b278d31aff4d4912da328f2c3ecdbb1ec830a"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "b5c21e4d32f9f78043eee8605d131e63d9568ef1"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "56d7cc6bf3a125c9e9f5b4799a2d34a5d941dc43"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "528db467e4f64f9149f88ecd36c19c8a23835c17"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "71482b740ea057ae9cdd15cfba89467639dbda63"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "bdaff803efa7cb1e2bd31e7f7a29b4c174fb60e3"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "1f4642a4dd61ad57d833ae961ce0f0f1c6c7471a"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "3e89f59c82ae0ee52af586364bad8b6e69fdec28"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "3292597b5f499193c8a1bd1f71b9df81925e4c87"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "ddb145bb406c096be680d246b9a727d6e926f9cb"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9cedfe3a1f98db1a999f64bcfdc77e8df72cbbc5"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "a58a8593b49cbf1d6f6b35feb61df95a51717127"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "b80d8770ce0358674d1b2f39c7bb5b8a042a5d32"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "66540a388aa07190fa98aff515f09a01d1c173ee"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d9e85c6de7487b13e91f400ce8a06c0104b08ddc"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "01da681d516c6b1febd0096c6dcd8ccbc9b6fdef"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "faa22ad8c24d6465976412d1bd252c74936f937c"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "5410dcf34d4207e005f207fc430892f23f160461"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0735e4827702f896332e1461dcdb3e7088e60d90"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "8b083ad5aad313afd9fa9c4e91ebbd03f205b67f"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "2fc593cebbfe2bdae3689255f46cd9c41314f00c"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "5bfa929956b1ce9a0ef2afb08ae3510326e962c6"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "81e5a280e47fbbac82d1c0e0604828ab9937e1e6"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "fbc333306bb32eaf2b2d815efa32a5915cd15ede"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "df75129e5c618cdfe180ddf71598704f8c652e5c"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6b0556075110eac4263e1b2ba9bef29a3504d302"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "3309c2e1bcc6d623a28c01cf3e61ed9d9a2d676b"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "f729504273d11b18f3b9c1f4918a18a2a63483da"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "9d54da726bd01800a7fa41de9bc0b9aaba9202b9"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "1550492673a913ecd0ff14ccdea0289bbfc680f6"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "d8b97959e6d77ac9d1e0c512414824c9c037d2f0"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "1056467b1726dc0469745d5eb80407e3715c6aee"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "9c51bd6b10adfb2dc3cf07d38981636c3a13557a"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "9f58166807385e0e95682b361e0654125311b4d6"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "cf5b8b7266e6c6c5054aeab213c37e61df68057f"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "36a609e8e1a2002653520b7a872562ecd34d6afc"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "6c723410982cf03559199122ce358757670f0d61"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "7e0dae98aa342781a5e89c7f531545704d48b9b6"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "eb000da14a0e48ffac929e51db640c721e8c9e11"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "5696ee19d90930527370021a9eb51f0579080293"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ed9c5d17963779cebd526a65abd10d82b9b7aadc"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "7086405ab9008c91c9acbe7685590ee4497b0576"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "0f0aea80ca1dbf604a3c0ac28a255431c1952f88"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "e794ceab525cbc0314d10398a807c436ef66d17d"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "09c3427c855d7c82e44997accc80a52317d0d22d"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "af19d02ed9dbb366d0c7b34b538ae83bf2f6212c"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "3064e5bcea910f32fbef60acd41a9917145c48a1"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "a7ad2f98a7a534667370ef3f22ae00f90002a1a7"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "76726e6bbbd89eb6469df960ec889ce781cfc68b"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "031b5eb83b6e96dcd9bdf2eabdfab7a370b0becb"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "5d31c283914d67dcfc0af09525ab3814d0e05db4"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "a9e577f4e9aba0af6b019b566f98121586112552"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "f84745683934f221dc5de1b970dae5c919979a71"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "95aef2a68a86030078ac64346445f5f92a85fb63"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "53e9197a3de8d63950b5d324a4da0d3533dd492c"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "be24b818a6ba1209d383c9c43af0bb0ddd82070b"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "be808769e77a47ace01b1b2455607c56a402e795"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "9feca0a4ba5ab71b05bad4ff0324c648ccae7f38"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "057c9ead60a3819eecae1f31ed512ea3e5e2aab4"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2503f8354c07929c1b943c64ea233bb6453c2740"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "75c439a7002183aa5ad8795c1986c109714c2f00"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "add241bb07ff446df18f98f6eec18ebec3bb4e31"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 03316b3ee71..bd8fb4d2cd7 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -15,14 +15,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "37.0.1"; in
+let version = "37.0.2"; in
 
 stdenv.mkDerivation rec {
   name = "firefox-${version}";
 
   src = fetchurl {
     url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2";
-    sha1 = "8bbffaa3cb81916bb44e11773d3f05fc4f2b9f36";
+    sha1 = "6e306d56e4e00ffdc2ddbdfbbabe4cb9fc527071";
   };
 
   buildInputs =
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index c8457427945..5ebd2607841 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
     }
 
     mkdir -p $out/share/icons
-    ln -s $out/lib/${browserName}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png
+    ln -s $out/lib/${browserName}${nameSuffix}/browser/icons/mozicon128.png $out/share/icons/${browserName}.png
 
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications/* $out/share/applications
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 26ba5c51480..35541b39ee8 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.451";
+  version = "11.2.202.457";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "0jlk3bgpv998ajm5wlxngxy82h3mcd847wm8mkvmyfmjn4x9dv7z";
+        sha256 = "0nkr6p4h5l03ywsj1sbap359cl1x9rq3m12j9gvwvbvn935rmyr2";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1lpvx6dz3hdf3jhs3xdf09jyh1563msq0icr832432d4a1jgqkds";
+        sha256 = "0qil5rb61bkn80fij31nv29q2wa7bxiwwxgy5zlkm2hsyrz3y4kc";
       }
     else throw "Flash Player is not supported on this platform";
 
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index c89ad0a5168..fbfe4de23b8 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -2,25 +2,27 @@
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "0.12.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1891wpssfp04nkk1h4y3cdgn096b0kq16pc0m2fzilbh3daa6pml";
+    sha256 = "1jiczhx01i8czm1gzd232z2ds2f1lvs5ifa9zjabhzw5ykfzdjg8";
   };
 
   buildInputs = [ makeWrapper which go iptables rsync ];
 
-  preBuild = "patchShebangs ./hack";
-
-  postBuild = ''go build --ldflags '-extldflags "-static" -s' build/pause/pause.go'';
+  buildPhase = ''
+    substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
+    GOPATH=$(pwd)
+    patchShebangs ./hack
+    hack/build-go.sh --use_go_build
+  '';
 
   installPhase = ''
     mkdir -p "$out/bin"
     cp _output/local/go/bin/* "$out/bin/"
-    cp pause $out/bin/kube-pause
   '';
 
   preFixup = ''
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Open source implementation of container cluster management.";
+    description = "Open source implementation of container cluster management";
     license = licenses.asl20;
     homepage = https://github.com/GoogleCloudPlatform;
     maintainers = with maintainers; [offline];
diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 36ce79aaf34..1714aa274f0 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://mesosphere.github.io/marathon;
-    description = "Cluster-wide init and control system for services in cgroups or Docker containers.";
+    description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
     maintainers = with maintainers; [ rushmorem ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/dropbox-cli/default.nix b/pkgs/applications/networking/dropbox-cli/default.nix
index 1a9c7e0aa2f..6e7b6b6ac02 100644
--- a/pkgs/applications/networking/dropbox-cli/default.nix
+++ b/pkgs/applications/networking/dropbox-cli/default.nix
@@ -1,6 +1,6 @@
 { stdenv, pkgconfig, fetchurl, python, dropbox }:
 let
-  version = "2.10.0";
+  version = "2015.02.12";
   dropboxd = "${dropbox}/bin/dropbox";
 in
 stdenv.mkDerivation {
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://linux.dropbox.com/packages/nautilus-dropbox-${version}.tar.bz2";
-    sha256 = "0f765rpp357vy7zvn1jq6q48d10fi4v13yb7vv3qx3az3f3472lg";
+    sha256 = "12md01ymxsly1rdhdi2sw3aiwykd4y8z8isipc8mjfk8bbp55q86";
   };
 
   buildInputs = [ pkgconfig python ];
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index bd557a27ec0..97573fb1e7b 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -26,9 +26,10 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Dropbox client for: ${stdenv.system} not supported!";
 
-  version = "3.2.9";
-  sha256 = if stdenv.system == "x86_64-linux" then "1w1xqizd4xhf9d3gwg9wwys2rdbacs390zf4a7z76m9h5r2lz049"
-    else if stdenv.system == "i686-linux" then "0lzrb0b7hi22ij7fmn7i3wkzbzv99858ah7w8ysg65za0c8qwksc"
+  # NOTE: When updating, please also update in current stable, as older versions stop working  
+  version = "3.4.4";
+  sha256 = if stdenv.system == "x86_64-linux" then "05ncbxwkimq7cl3bad759qvda7zjdh07f5wh6aw12g472l4yqq98"
+    else if stdenv.system == "i686-linux" then "18089bh6i64yw75pswgn2vkcl1kf7ipxxncmssw3qhb6791qfhbk"
     else throw "Dropbox client for: ${stdenv.system} not supported!";
 
   # relative location where the dropbox libraries are stored
diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix
index 9fd8e7412c2..cf895ac5cf4 100644
--- a/pkgs/applications/networking/esniper/default.nix
+++ b/pkgs/applications/networking/esniper/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     description = "Simple, lightweight tool for sniping eBay auctions";
-    homepage    = http://esnipe.rsourceforge.net;
+    homepage    = http://esniper.sourceforge.net;
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 simons ];
     platforms   = platforms.all;
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index ae4746a3f1e..0a65f8dd70f 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
 
 python34Packages.buildPythonPackage rec {
-  version = "0.9.1";
+  version = "0.9.3";
   name = "canto-curses-${version}";
 
   src = fetchFromGitHub {
     owner = "themoken";
     repo = "canto-curses";
     rev = "v${version}";
-    sha256 = "1vb5g0vdkp233r09qv0g4rgz7nprr2a625lf6nf6a51wpimdwgdy";
+    sha256 = "1k3rbniyfdbqhbkclgrrvfjgvfl5if4c2rbgpcb6l2l5v6i1y742";
   };
 
   buildInputs = [ readline ncurses canto-daemon ];
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index fc494c6aebc..231b3195b5f 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
   
   meta = {
     homepage = "http://offog.org/code/rawdog/";
-    description = "an RSS Aggregator Without Delusions Of Grandeur.";
+    description = "An RSS Aggregator Without Delusions Of Grandeur";
     license = stdenv.lib.licenses.gpl2;
     platform = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
new file mode 100644
index 00000000000..df5f7954182
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cppcheck, libmrss }:
+
+let version = "1.9"; in
+stdenv.mkDerivation rec {
+  name = "rsstail-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "0igkkhwzhi2cxbfirmq5xgaidnv0gdhmh2w7052xqpyvzg069faf";
+    rev = "aab4fbcc5cdf82e439ea6abe562e9b648fc1a6ef";
+    repo = "rsstail";
+    owner = "flok99";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Monitor RSS feeds for new entries";
+    longDescription = ''
+      RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
+      detects a new entry it'll emit only that new entry.
+    '';
+    homepage = http://www.vanheusden.com/rsstail/;
+    license = with licenses; gpl2Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ libmrss ]
+    ++ stdenv.lib.optional doCheck cppcheck;
+
+  postPatch = ''
+    substituteInPlace Makefile --replace /usr $out
+  '';
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  preInstall = ''
+    mkdir -p $out/{bin,share/man/man1}
+  '';
+}
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index bf8f9234f5a..e102f8037f1 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite }:
 
-let version = "3.9.0.6"; in
+let version = "3.10.3"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1dxhj4ijpl5m2r5f9p04kbaqcvivy3lrb1kdn5axqngshfrmczyf";
+    sha256 = "13fyg64vszq8zm1qb8g963cjar8mfz0gnymx86bvih1pjiwy4s3r";
   };
 
   configureFlags = [
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index c9b8a959bf9..586ce26e8c9 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://sourceforge.net/projects/pidgin-latex/;
     description = "LaTeX rendering plugin for Pidgin IM";
-    licenses = licenses.gpl2;
+    license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = maintainers.abbradar;
   };
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
new file mode 100644
index 00000000000..149f62bb981
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pidgin, intltool, python } :
+
+stdenv.mkDerivation rec {
+  name = "purple-plugin-pack-2.7.0";
+  src = fetchurl {
+    url = "https://bitbucket.org/rekkanoryo/purple-plugin-pack/downloads/${name}.tar.bz2";
+    sha256 = "0g5hmy7fwgjq59j52h9yps28jsjjrfkd4r18gyx6hfd3g3kzbg1b";
+  };
+
+  buildInputs = [ pidgin intltool python ];
+
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/rekkanoryo/purple-plugin-pack;
+    description = "Plugin pack for Pidgin 2.x";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainters = with maintainers; [ bdimcheff ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
new file mode 100644
index 00000000000..d268cbc55cf
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -0,0 +1,68 @@
+{ fetchurl, stdenv, dpkg, makeWrapper, xlibs, qt5, gstreamer, zlib, sqlite, libxslt }:
+
+assert stdenv.system == "x86_64-linux";
+
+# BUG: viber tries to access contacts list and that causes segfault
+# FIX: you have to do `chmod 444 ~/.ViberPC/<your mobile phone number>/Avatars`
+# BUG: viber tries to it's downloads and that causes segfault
+# FIX: you have to do `chmod 444 ~/Documents/ViberDownloads`
+# TODO: fix bugs
+
+stdenv.mkDerivation rec {
+  name = "viber-${version}";
+  version = "4.2.2.6";
+
+  src = fetchurl {
+    url = "http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
+    sha256 = "1fv269z9sni21lc1ka25jnxr9w8zfg1gfn2c7fnd8cdd5fm57d26";
+  };
+
+  buildInputs = [ dpkg makeWrapper ];
+
+  unpackPhase = "true";
+
+  libPath = stdenv.lib.makeLibraryPath [
+      qt5
+      xlibs.libX11
+      gstreamer
+      zlib
+      sqlite
+      xlibs.libXrender
+      libxslt
+      stdenv.cc.cc
+      xlibs.libXScrnSaver
+      xlibs.libXext
+  ];
+
+  installPhase = ''
+    dpkg-deb -x $src $out
+    mkdir -p $out/bin
+    mv $out/opt/viber/{Sound,icons,libqfacebook.so} $out
+    mv $out/opt/viber/Viber $out/viber
+    rm -rf $out/opt
+    ln -s $out/viber $out/bin/viber
+    mkdir -p usr/lib/mozilla/plugins
+
+    patchelf \
+      --set-rpath $libPath \
+      $out/libqfacebook.so
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath $libPath:$out \
+      $out/viber
+
+    wrapProgram $out/viber --prefix LD_LIBRARY_PATH : $libPath:$out
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = {
+    homepage = http://www.viber.com;
+    description = "An instant messaging and Voice over IP (VoIP) app";
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ jagajaga ];
+  };
+
+}
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 343e53bc947..b5bf86690ed 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -19,12 +19,12 @@ let
 
 in with stdenv; mkDerivation rec {
 
-  version = "0.11.0";
+  version = "0.12.2";
   name = "quassel${tag}-${version}";
 
   src = fetchurl {
     url = "http://quassel-irc.org/pub/quassel-${version}.tar.bz2";
-    sha256 = "01251y5i1fvm6s2g9acxaczk2jdyw1byr45q41q0yh9apjw938cr";
+    sha256 = "15vqjiw38mifvnc95bhvy0zl23xxldkwg2byx9xqbyw8rfgggmkb";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix
index 87e824a977d..03c2c21aed0 100644
--- a/pkgs/applications/networking/mailreaders/alpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/alpine/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   };
   configureFlags = [
     "--with-ssl-include-dir=${openssl}/include/openssl"
-    "--with-tcl-lib=tcl8.5"
+    "--with-tcl-lib=${tcl.libPrefix}"
     ];
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index 7c60864b486..40d302464f6 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-mailpath=" "--enable-smtp"
 
+    # Look in $PATH at runtime, instead of hardcoding /usr/bin/sendmail
+    "ac_cv_path_SENDMAIL=sendmail"
+
     # This allows calls with "-d N", that output debug info into ~/.muttdebug*
     "--enable-debug"
 
diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix
index 11097672ae7..c1835992158 100644
--- a/pkgs/applications/networking/mailreaders/realpine/default.nix
+++ b/pkgs/applications/networking/mailreaders/realpine/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   };
   configureFlags = [
     "--with-ssl-include-dir=${openssl}/include/openssl"
-    "--with-tcl-lib=tcl8.5"
+    "--with-tcl-lib=${tcl.libPrefix}"
     ];
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 358a0bb1228..611d77eb215 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, pkgconfig
 , avahi, boost, libopus, libsndfile, protobuf, qt4, speex
-, jackSupport ? false, jack2 ? null
+, jackSupport ? false, libjack2 ? null
 , speechdSupport ? false, speechd ? null
-, pulseSupport ? false, pulseaudio ? null
+, pulseSupport ? false, libpulseaudio ? null
 }:
 
-assert jackSupport -> jack2 != null;
+assert jackSupport -> libjack2 != null;
 assert speechdSupport -> speechd != null;
-assert pulseSupport -> pulseaudio != null;
+assert pulseSupport -> libpulseaudio != null;
 
 let
   optional = stdenv.lib.optional;
   optionalString = stdenv.lib.optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "mumble-" + version;
+  name = "mumble-${version}";
   version = "1.2.8";
 
   src = fetchurl {
@@ -44,9 +44,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ avahi boost libopus libsndfile protobuf qt4 speex ]
-    ++ optional jackSupport jack2
+    ++ optional jackSupport libjack2
     ++ optional speechdSupport speechd
-    ++ optional pulseSupport pulseaudio;
+    ++ optional pulseSupport libpulseaudio;
 
   installPhase = ''
     mkdir -p $out
diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
index 1c06392f60b..cb10fca6cd9 100644
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ b/pkgs/applications/networking/mumble/murmur.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, boost, protobuf
+{ stdenv, qt4, boost, protobuf, mumble
 , avahi, libcap, pkgconfig
 , iceSupport ? false
 , zeroc_ice ? null
@@ -11,13 +11,9 @@ let
   optionalString = stdenv.lib.optionalString;
 in
 stdenv.mkDerivation rec {
-  name = "murmur-" + version;
-  version = "1.2.8";
+  name = "murmur-${version}";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz";
-    sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc";
-  };
+  inherit (mumble) version src;
 
   patchPhase = optional iceSupport ''
     sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix
new file mode 100644
index 00000000000..49d15f59c7f
--- /dev/null
+++ b/pkgs/applications/networking/p2p/firestr/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, cmake, boost, botan, snappy, libopus, libuuid, qt5
+, libXScrnSaver, openssl }:
+
+stdenv.mkDerivation {
+  name = "firestr-0.8";
+
+  buildInputs = [ cmake boost botan snappy libopus libuuid qt5 libXScrnSaver openssl ];
+
+  src = fetchFromGitHub {
+    owner  = "mempko";
+    repo   = "firestr";
+    rev    = "f888890f71d49953d05bccdd27a1c4f6690e165c";
+    sha256 = "0s2kdi8rw3i3f8gbiy0ykyi6xj5n8p80m0d1i86mhh8jpagvbfzb";
+  };
+
+  patches = ./return.patch;
+
+  postPatch =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace "set(Boost_USE_STATIC_LIBS on)" "" \
+        --replace "/usr/include/botan" "${botan}/include/botan" \
+        --replace "libopus.a"       "libopus.so" \
+        --replace "libsnappy.a"     "libsnappy.so" \
+        --replace "libbotan-1.10.a" "libbotan-1.10.so.0"
+    '';
+
+  meta = with stdenv.lib;
+    { description = "Grass computing platform";
+      homepage = http://firestr.com/;
+      license = licenses.gpl3;
+      maintainers = [ maintainers.emery ];
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/applications/networking/p2p/firestr/return.patch b/pkgs/applications/networking/p2p/firestr/return.patch
new file mode 100644
index 00000000000..c3e469ae92b
--- /dev/null
+++ b/pkgs/applications/networking/p2p/firestr/return.patch
@@ -0,0 +1,13 @@
+diff --git a/src/message/master_post.cpp b/src/message/master_post.cpp
+index c3a5ea9..7c821b9 100644
+--- a/src/message/master_post.cpp
++++ b/src/message/master_post.cpp
+@@ -56,7 +56,7 @@ namespace fire
+ 
+         metadata::encryption_type to_message_encryption_type(sc::encryption_type s)
+         {
+-            metadata::encryption_type r;
++            metadata::encryption_type r = metadata::encryption_type::asymmetric;
+             switch(s)
+             {
+                 case sc::encryption_type::plaintext: r = metadata::encryption_type::plaintext; break;
diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix
index 6f282b30fa1..14b68d71e79 100644
--- a/pkgs/applications/networking/p2p/ldcpp/default.nix
+++ b/pkgs/applications/networking/p2p/ldcpp/default.nix
@@ -1,37 +1,28 @@
-{ builderDefs, scons, pkgconfig, gtk, bzip2, libglade, openssl, libX11, boost, zlib }:
+{ stdenv, fetchurl, scons, pkgconfig, gtk, bzip2, libglade, openssl
+, libX11, boost, zlib, libnotify }:
 
-with builderDefs;
-  let localDefs = builderDefs.passthru.function ((rec {
-    src = /* put a fetchurl here */
-    fetchurl {
-      url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2;
-      sha256 = "66012740e9347a2e994c8af5609c40ebf3f86f767258e071a03ef39a2314298a";
-    };
-
-    buildInputs = [scons pkgconfig gtk bzip2 libglade
-      openssl libX11 boost];
-    configureFlags = [];
-    doScons = fullDepEntry (''
-      mkdir -p $out
-      export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
-      
-      for i in gettext xgettext msgfmt msgcat; do
-        echo > $i
-	chmod a+x $i
-      done
-      export PATH=$PATH:$PWD
-
-      scons PREFIX=$out 
-      scons PREFIX=$out install
-    '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
-  }));
-  in with localDefs;
 stdenv.mkDerivation rec {
   name = "ldcpp-1.1.0";
-  builder = writeScript (name + "-builder")
-    (textClosure localDefs 
-      [doScons doForceShare doPropagate]);
+  src = fetchurl {
+    url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2;
+    sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6";
+  };
+  buildInputs = [ scons pkgconfig gtk bzip2 libglade openssl libX11 boost libnotify ];
+
+  installPhase = ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lX11";
+
+    touch gettext xgettext msgfmt msgcat
+    chmod +x gettext xgettext msgfmt msgcat
+    export PATH=$PATH:$PWD
+
+    mkdir -p $out
+    scons PREFIX=$out
+    scons PREFIX=$out install
+  '';
+
   meta = {
-    description = "Linux DC++ - Direct Connect client";
+    description = "Direct Connect client";
+    license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix
index 59e381e9e22..4ac3a0448de 100644
--- a/pkgs/applications/networking/pond/default.nix
+++ b/pkgs/applications/networking/pond/default.nix
@@ -14,7 +14,12 @@ buildGoPackage rec {
 
   subPackages = [ "client" ];
 
-  buildInputs = [ trousers net crypto protobuf ed25519 ];
+  renameImports = [
+    "code.google.com/p/go.crypto golang.org/x/crypto"
+    "code.google.com/p/goprotobuf github.com/golang/protobuf"
+  ];
+
+  buildInputs = [ trousers net crypto protobuf ed25519 govers ];
     
   buildFlags = "--tags nogui";
 
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 8afe5650ca8..f3215e7befd 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
-, gnutls, libgcrypt, geoip, heimdal, lua5, makeDesktopItem, python, libcap, glib
+, gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
 , withGtk ? false, gtk ? null
 , withQt ? false, qt4 ? null
 }:
@@ -10,7 +10,7 @@ assert withQt -> !withGtk && qt4 != null;
 with stdenv.lib;
 
 let
-  version = "1.12.3";
+  version = "1.12.4";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 in
 
@@ -19,11 +19,11 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/wireshark-${version}.tar.bz2";
-    sha256 = "1sikmjslxl68i3psxikghpff0znjfd6mb07nnn10jqqsrffhp5b9";
+    sha256 = "04n3xfakg6368ba49vj6n3csqnkzipac4sldsaavgr2jwac4x06y";
   };
 
   buildInputs = [
-    bison flex perl pkgconfig libpcap lua5 heimdal libgcrypt gnutls
+    bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
     geoip libnl c-ares python libcap glib
   ] ++ optional withQt qt4
     ++ optional withGtk gtk;
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 430ab70caa1..84d0d4ba239 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.30";
+  version = "0.11.1";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "bd554d42586c85e0a5e766b6a6e87ccc6047f30e189753a1e68e44fd54ca506a";
+    sha256 = "518add39e2239fc8575cdf5cafc3562f006df7201fbd272077ed3bbbbfd816d4";
   };
 
   subPackages = [ "cmd/syncthing" ];
diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix
index 7e7d58c9a32..a8ae393598d 100644
--- a/pkgs/applications/networking/umurmur/default.nix
+++ b/pkgs/applications/networking/umurmur/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "umurmur-${version}";
-  version = "0.2.15";
+  version = "0.2.16";
   
   src = fetchFromGitHub {
     owner = "fatbob313";
     repo = "umurmur";
     rev = version;
-    sha256 = "0q0apnnb3pszhpsbadw52k6mhdc0hk38rk7vnn7dl4fsisfhgmx2";
+    sha256 = "0njvdqvjda13v1a2yyjn47mb0l0cdfb2bfvb5s13wpgwy2xxk0px";
   };
   
   buildInputs = [ autoreconfHook openssl protobufc libconfig ];
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index d3ee682329d..3d0f408659f 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl, ncurses}:
 
+let version = "1.14"; in
 stdenv.mkDerivation rec {
-  name = "vnstat-1.13";
+  name = "vnstat-${version}";
 
   src = fetchurl {
+    sha256 = "11l39qqv5pgli9zzn0xilld67bi5qzxymsn97m4r022xv13jlipq";
     url = "http://humdi.net/vnstat/${name}.tar.gz";
-    sha256 = "1kcrxpvp3al1j6kh7k69vwva6kd1ba32wglx95gv55dixfcjakkg";
   };
 
   installPhase = ''
@@ -18,10 +19,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ncurses];
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     homepage = http://humdi.net/vnstat/;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     description = "Console-based network statistics utility for Linux";
-    maintainers = with stdenv.lib.maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix
index 30e882a7f38..e9849d0460c 100644
--- a/pkgs/applications/science/electronics/tkgate/1.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/1.x.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i config.h \
-      -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "8.5"|' \
+      -e 's|.*#define.*TKGATE_TCLTK_VERSIONS.*|#define TKGATE_TCLTK_VERSIONS "${tcl.release}"|' \
       -e 's|.*#define.*TKGATE_INCDIRS.*|#define TKGATE_INCDIRS "${tcl}/include ${tk}/include ${libiconvInc} ${libX11}/include"|' \
       -e 's|.*#define.*TKGATE_LIBDIRS.*|#define TKGATE_LIBDIRS "${tcl}/lib ${tk}/lib ${libiconvLib} ${libX11}/lib"|' \
       \
diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix
new file mode 100644
index 00000000000..87b476249f4
--- /dev/null
+++ b/pkgs/applications/science/logic/coq/8.5.nix
@@ -0,0 +1,68 @@
+# - coqide compilation can be disabled by setting lablgtk to null;
+
+{stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
+
+let
+  version = "8.5b2";
+  coq-version = "8.5";
+  buildIde = lablgtk != null;
+  ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
+in
+
+stdenv.mkDerivation {
+  name = "coq-${version}";
+
+  inherit coq-version;
+  inherit ocaml camlp5;
+
+  src = fetchurl {
+    url = https://coq.inria.fr/distrib/V8.5beta2/files/coq-8.5beta2.tar.gz;
+    sha256 = "1z34ch56lld86srgsjdwdq3girz0k0wqmvyxsa7jwvvxn3qmmq2v";
+  };
+
+  buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
+
+  postPatch = ''
+    UNAME=$(type -tp uname)
+    RM=$(type -tp rm)
+    substituteInPlace configure --replace "/bin/uname" "$UNAME"
+    substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM"
+    substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)"
+  '';
+
+  setupHook = writeText "setupHook.sh" ''
+    addCoqPath () {
+      if test -d "''$1/lib/coq/${coq-version}/user-contrib"; then
+        export COQPATH="''${COQPATH}''${COQPATH:+:}''$1/lib/coq/${coq-version}/user-contrib/"
+      fi
+    }
+
+    envHooks=(''${envHooks[@]} addCoqPath)
+  '';
+
+  preConfigure = ''
+    configureFlagsArray=(
+      -opt
+      ${ideFlags}
+    )
+  '';
+
+  prefixKey = "-prefix ";
+
+  buildFlags = "revision coq coqide";
+
+  meta = with stdenv.lib; {
+    description = "Coq proof assistant";
+    longDescription = ''
+      Coq is a formal proof management system.  It provides a formal language
+      to write mathematical definitions, executable algorithms and theorems
+      together with an environment for semi-interactive development of
+      machine-checked proofs.
+    '';
+    homepage = "http://coq.inria.fr";
+    license = licenses.lgpl21;
+    branch = coq-version;
+    maintainers = with maintainers; [ roconnor thoughtpolice vbgl ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 391dba244ef..5a8fa9ff4dc 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -3,7 +3,7 @@
 {stdenv, fetchurl, pkgconfig, writeText, ocaml, findlib, camlp5, ncurses, lablgtk ? null}:
 
 let
-  version = "8.4pl5";
+  version = "8.4pl6";
   coq-version = "8.4";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://coq.inria.fr/distrib/V${version}/files/coq-${version}.tar.gz";
-    sha256 = "0iajsabyrgypk1ncm0kqcxqv02k24xa1bayaxacjgmsqiavmm09m";
+    sha256 = "1mpbj4yf36kpjg2v2sln12i8dzqn8rag6fd07hslj2lpm4qs4h55";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 0bd6f5a35c3..d0adb338207 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.1.3";
+  name = "R-3.2.0";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "04kk6wd55bi0f0qsp98ckjxh95q2990vkgq4j83kiajvjciq7s87";
+    sha256 = "0dagyqgvi8i3nw158qi2zpwm04s4ffzvnmk5niaksvxs30zrbbpm";
   };
 
   buildInputs = [ blas bzip2 gfortran liblapack libX11 libXmu libXt
diff --git a/pkgs/applications/science/programming/kframework/default.nix b/pkgs/applications/science/programming/kframework/default.nix
new file mode 100644
index 00000000000..e8a4f2b3156
--- /dev/null
+++ b/pkgs/applications/science/programming/kframework/default.nix
@@ -0,0 +1,102 @@
+{ stdenv, fetchFromGitHub, maven, openjdk8, releaseTools }:
+
+# TODO:
+# - Investigate builds on platforms other than 64-bit linux
+# - Separate package for Maven cache? This would speed up builds and
+#   theoretically could still be pure
+# - Find a way to prevent Maven from downloading artifacts irrelevant
+#   to the platform for which we are building
+
+releaseTools.mvnBuild rec {
+  name = "kframework-20150415";
+
+  mvn8 = maven.override {
+    jdk = openjdk8; # K uses Java 8. The official docs reference the
+                    # Oracle VM, but it's been working with OpenJDK
+  };
+
+  src = fetchFromGitHub {
+    owner = "kframework";
+    repo = "k";
+    rev = "85a41bc024"; # nightly build for April 15th, 2015
+    sha256 = "01ndfdnqxp2w86pg3ax39sxayb2pfm39lj1h3818zzn86gqwa1vc";
+  };
+
+  buildInputs = [ mvn8 openjdk8 ];
+
+  preSetupPhase = ''
+    # z3 needs this to pass tests
+    export LD_LIBRARY_PATH=$(cat $NIX_CC/nix-support/orig-cc)/lib
+    # not sure if this does anything, since it might only speed up incremental builds
+    export MAVEN_OPTS="-XX:+TieredCompilation"
+  '';
+
+  mvnAssembly = ''
+    mvn package -Dcheckstyle.skip -Dmaven.test.skip=true -Dmaven.repo.local=$M2_REPO
+  '';
+
+  mvnRelease = ''
+    true # do nothing, since mvn package is sufficient
+  '';
+
+  # this is a custom version of k-distribution/src/main/scripts/lib/k
+  kscript = ''
+    #!/usr/bin/env bash
+    export JAVA=${openjdk8}/bin/java
+
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$out/lib"
+
+    export K_OPTS="-Xms64m -Xmx1024m -Xss32m -XX:+TieredCompilation"
+    export MISC_ARGS="-Djava.awt.headless=true"
+    export ARGS="$MISC_ARGS $K_OPTS"
+    $JAVA $ARGS -cp "$out/share/kframework/lib/java/*" org.kframework.main.Main "$@"
+  '';
+
+  finalPhase = ''
+    # set some environment variables
+    export K_ROOT=$PWD/k-distribution/target/release/k/
+    export K_SHARE=$out/share/kframework/
+    # make requisite directories
+    mkdir -p $out/lib $K_SHARE/lib/native
+    # copy over bin
+    cp -R $K_ROOT/bin                             $K_SHARE/
+    # symlink $out/bin to $out/share/kframework/bin
+    ln -s $K_SHARE/bin                            $out/bin
+    # copy everything relevant to $out/share/kframework
+    # we may want to consider adding the documentation etc.
+    cp -R $K_ROOT/include                         $K_SHARE/
+    cp -R $K_ROOT/lib/java                        $K_SHARE/lib/
+    cp -R $K_ROOT/lib/native/linux                $K_SHARE/lib/native/
+    cp -R $K_ROOT/lib/native/linux64              $K_SHARE/lib/native/
+    # remove Windows batch scripts
+    rm $K_SHARE/bin/*.bat # */
+    # TODO: fix these scripts so they work
+    rm $K_SHARE/bin/kserver $K_SHARE/bin/stop-kserver
+    # make our k wrapper script and substitute $out for its value
+    echo -n "$kscript" | sed "s:\$out:$out:g" > $K_SHARE/lib/k
+    chmod +x $K_SHARE/lib/k
+    # symlink requisite binaries
+    ln -s $K_SHARE/lib/k                           $out/lib/k
+    ln -s $K_SHARE/lib/native/linux/sdf2table      $out/bin/sdf2table
+    ln -s $K_SHARE/lib/native/linux64/z3           $out/bin/z3
+    ln -s $K_SHARE/lib/native/linux64/libz3.so     $out/lib/libz3.so
+    ln -s $K_SHARE/lib/native/linux64/libz3java.so $out/lib/libz3java.so
+    # patch Z3 so it uses the right interpreter/libs
+    patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib \
+      --force-rpath \
+      $K_SHARE/lib/native/linux64/z3
+  '';
+
+  meta = {
+    description = "A rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined";
+    homepage = http://www.kframework.org;
+    license = stdenv.lib.licenses.bsd3;     # technically it is the UIUC/NCSA license
+                                            # but LLVM uses that license as well and
+                                            # it is marked as BSD3
+    maintainers = [ stdenv.lib.maintainers.taktoa ];
+    platforms = stdenv.lib.platforms.linux; # I haven't done testing on other OSes, but
+                                            # since it's Java it should run anywhere
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index b206fc671b5..56a6618e531 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -46,7 +46,7 @@ rec {
     sendEmailSupport = !stdenv.isDarwin;
   };
 
-  gitAnnex = pkgs.haskellngPackages.git-annex;
+  gitAnnex = pkgs.haskell-ng.packages.ghc784.git-annex;
 
   qgit = import ./qgit {
     inherit fetchurl stdenv;
@@ -102,4 +102,6 @@ rec {
   git-extras = callPackage ./git-extras { };
 
   git-cola = callPackage ./git-cola { };
+
+  git-imerge = callPackage ./git-imerge { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
new file mode 100644
index 00000000000..91180b33cde
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "git-imerge-${version}";
+  version = "0.7.0";
+
+  src = fetchurl {
+    url = "https://github.com/mhagger/git-imerge/archive/${version}.tar.gz";
+    sha256 = "00nwn3rfhf15wsv01lfji5412d7yz827ric916lnyp662d6gx206";
+  };
+
+  buildInputs = [ pythonPackages.python pythonPackages.wrapPython ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make install PREFIX=$out
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mhagger/git-imerge;
+    description = "Perform a merge between two branches incrementally";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.spwhitt ];
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 1ea9d967cd1..474d509297f 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.3.5";
+  version = "2.3.6";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0nk4q7r6dj5a2my10483z9wmzv3zw465ck8ydp2b8hcdllj16wfp";
+    sha256 = "1z30gj5a9n0sylqlwd35vvpi49051ql44xzmarkkcirbx5a1rq1w";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 15874922725..0a119624227 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "2.2.0-rc1";
+  version = "2.2.1";
 
   src = fetchgit {
     url = https://github.com/github/hub.git;
     rev = "refs/tags/v${version}";
-    sha256 = "1f6r8vlwnmqmr85drfv24vhqx1aacz6s83c2i804v9997n0wrwfm";
+    sha256 = "1rklqm5b0n5rcbdsr6kvk24cw7dc505ylb1608fva7qman49vlls";
   };
 
 
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index 9d54ac99273..e7cc9b78195 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -5,34 +5,35 @@
 , libass, fftw, ffms
 , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
 , icu, boost, intltool # New dependencies
-, spellChecking ? true, hunspell ? null
+, spellcheckSupport ? true, hunspell ? null
 , automationSupport ? true, lua ? null
 , openalSupport ? false, openal ? null
 , alsaSupport ? true, alsaLib ? null
 , pulseaudioSupport ? true, pulseaudio ? null
 , portaudioSupport ? false, portaudio ? null }:
 
-assert spellChecking -> (hunspell != null);
+assert spellcheckSupport -> (hunspell != null);
 assert automationSupport -> (lua != null);
 assert openalSupport -> (openal != null);
 assert alsaSupport -> (alsaLib != null);
 assert pulseaudioSupport -> (pulseaudio != null);
 assert portaudioSupport -> (portaudio != null);
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "aegisub-${version}";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchurl {
     url = "http://ftp.aegisub.org/pub/releases/${name}.tar.xz";
-    sha256 = "1p7qdnxyyyrlpvxdrrp15b5967d7bzpjl3vdy0q66g4aabr2h6ln";
+    sha256 = "11b83qazc8h0iidyj1rprnnjdivj1lpphvpa08y53n42bfa36pn5";
   };
 
   buildInputs = with stdenv.lib;
   [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa
     libass fftw ffms ffmpeg zlib icu boost boost.lib libiconv
   ]
-    ++ optional spellChecking hunspell
+    ++ optional spellcheckSupport hunspell
     ++ optional automationSupport lua
     ++ optional openalSupport openal
     ++ optional alsaSupport alsaLib
@@ -40,12 +41,11 @@ stdenv.mkDerivation rec {
     ++ optional portaudioSupport portaudio
     ;
 
-
   enableParallelBuilding = true;
 
   postInstall = "ln -s $out/bin/aegisub-* $out/bin/aegisub";
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "An advanced subtitle editor";
     longDescription = ''
       Aegisub is a free, cross-platform open source tool for creating and
diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix
index 63c1adb15e4..60b5b20ff24 100644
--- a/pkgs/applications/video/xawtv/default.nix
+++ b/pkgs/applications/video/xawtv/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "TV application for Linux with apps and tools such as a teletext browser";
     license = stdenv.lib.licenses.gpl2;
-    homePage = https://www.kraxel.org/blog/linux/xawtv/;
+    homepage = https://www.kraxel.org/blog/linux/xawtv/;
     maintainers = with stdenv.lib.maintainers; [ iElectric ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c456c9aa9f2..240973044d1 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchurl {
     url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz";
-    sha256 = "0j1wlh0jj84ly3iykp2iqvm01g5il5v56fvlrfvx6qsslyrs35yg";
+    sha256 = "03nzhikxp60falshzyk6ip8g9fhrczhvnvgmzqr8bny6w8x1v84b";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     patchShebangs ./project
     export AUTO_GOPATH=1
-    export DOCKER_GITCOMMIT="c78088f"
-    ./project/make.sh dynbinary
+    export DOCKER_GITCOMMIT="03nzhikx"
+    ./hack/make.sh dynbinary
   '';
 
   installPhase = ''
diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix
index efa820b0b6a..7efacafd6a1 100644
--- a/pkgs/applications/window-managers/compton/default.nix
+++ b/pkgs/applications/window-managers/compton/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig dbus libconfig libdrm libxml2 mesa pcre
     libXcomposite libXfixes libXdamage libXinerama libXrandr libXrender libXext ];
-  buildFlagsArray = ["CFLAGS=-O3 -fomit-frame-pointer"];
   installFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
new file mode 100644
index 00000000000..be2586c9e27
--- /dev/null
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -0,0 +1,54 @@
+{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
+  docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre,
+  pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
+  libXrandr, libXrender }:
+
+stdenv.mkDerivation {
+  name = "compton-git-2015-04-20";
+
+  src = fetchFromGitHub {
+    owner  = "chjj";
+    repo   = "compton";
+    rev    = "b1889c1245e6f47eedfae6063100d5a16f584e2b";
+    sha256 = "0brnbidxi7wg08yiwgnijzcyqv5lnkd74xzfymvb0i7pgy465vaf";
+  };
+
+  buildInputs = [
+    asciidoc
+    dbus
+    docbook_xml_dtd_45
+    docbook_xml_xslt
+    libXcomposite
+    libXdamage
+    libXext
+    libXfixes
+    libXinerama
+    libXrandr
+    libXrender
+    libconfig
+    libdrm
+    libxml2
+    libxslt
+    mesa
+    pcre
+    pkgconfig
+  ];
+
+  installFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    description =
+      "A fork of XCompMgr, a sample compositing manager for X servers (git version)";
+    homepage = https://github.com/chjj/compton/;
+    license = licenses.mit;
+    longDescription = ''
+      A fork of XCompMgr, which is a sample compositing manager for X
+      servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE
+      extensions.  It enables basic eye-candy effects. This fork adds
+      additional features, such as additional effects, and a fork at a
+      well-defined and proper place.
+    '';
+    maintainer = maintainers.ertes;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index a8d2b42bb3b..21836bd4fff 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,14 +1,15 @@
 { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
 , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl
-, xcb-util-cursor, coreutils, perl, pango, perlPackages, xdummy, libxkbcommon }:
+, xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
+, xorgserver, xvfb_run }:
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.9.1";
+  version = "4.10.2";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "0hyw2rdxigiklqvv7fbhcdqdxkgcxvx56vk4r5v55l674zqfy3dp";
+    sha256 = "1n6grkpv5rsn9zgg8if76mmg85w1asbm3rpplxyn6fzr8wds7587";
   };
 
   buildInputs = [
@@ -16,6 +17,7 @@ stdenv.mkDerivation rec {
     libstartup_notification libX11 pcre libev yajl xcb-util-cursor perl pango
     perlPackages.AnyEventI3 perlPackages.X11XCB perlPackages.IPCRun
     perlPackages.ExtUtilsPkgConfig perlPackages.TestMore perlPackages.InlineC
+    xorgserver xvfb_run
   ];
 
   postPatch = ''
@@ -26,8 +28,7 @@ stdenv.mkDerivation rec {
 
   checkPhase = stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
   ''
-    ln -sf "${xdummy}/bin/xdummy" testcases/Xdummy
-    (cd testcases && perl complete-run.pl -p 1)
+    (cd testcases && xvfb-run ./complete-run.pl -p 1 --keep-xserver-output)
     ! grep -q '^not ok' testcases/latest/complete-run.log
   '';
 
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index bf3367d7843..99562ebd662 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -2,11 +2,11 @@
   }:
 
 stdenv.mkDerivation rec {
-  name = "i3status-2.8";
+  name = "i3status-2.9";
 
   src = fetchurl {
     url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "1zh7z2qbw0jsrqdkc1irviq2n20mc5hq4h1mckyfcm238pfwa1mb";
+    sha256 = "1qwxbrga2fi5wf742hh9ajwa8b2kpzkjjnhjlz4wlpv21i80kss2";
   };
 
   buildInputs = [ confuse yajl alsaLib wirelesstools ];
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index 4281eb99dd0..f3b19e84610 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -1,17 +1,25 @@
-{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo, makeWrapper }:
+{ stdenv, fetchgit, pkgconfig, which, autoreconfHook, rep-gtk, pango
+, gdk_pixbuf, libXinerama, libXrandr, libXtst, imlib, gettext, texinfo
+, makeWrapper
+}:
 
 with stdenv.lib;
+
 stdenv.mkDerivation rec {
 
-  name = "sawfish-git-2015-02-15";
+  name = "sawfish-${version}";
+  version = "1.11.90";
 
   src = fetchgit {
     url = "https://github.com/SawfishWM/sawfish.git";
-    rev = "44729f44017e6779b4b66a7ecdbd63a98731f668";
-    sha256 = "bd3f42f1604f37ecb2515008341cac4f6965840b2d6a6639dd1f3f2459f68e73";
+    rev = "b121f832571c9aebd228691c32604146e49f5e55";
+    sha256 = "0y7rmjzp7ha5qj9q1dasw50gd6jiaxc0qsjbvyfzxvwssl3i9hsc";
   };
 
-  buildInputs = [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama libXrandr libXtst imlib gettext texinfo makeWrapper ];
+  buildInputs =
+    [ pkgconfig which autoreconfHook rep-gtk pango gdk_pixbuf libXinerama
+      libXrandr libXtst imlib gettext texinfo makeWrapper
+    ];
 
   patchPhase = ''
     sed -e 's|REP_DL_LOAD_PATH=|REP_DL_LOAD_PATH=$(REP_DL_LOAD_PATH):|g' -i Makedefs.in
@@ -25,7 +33,7 @@ stdenv.mkDerivation rec {
 	--set REP_LOAD_PATH "$out/share/sawfish/lisp"
     done
   '';
-  
+
   meta = {
     description = "An extensible, Lisp-based window manager";
     longDescription = ''
diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix
index af368d0a042..f9165e0bbd4 100644
--- a/pkgs/applications/window-managers/sxhkd/default.nix
+++ b/pkgs/applications/window-managers/sxhkd/default.nix
@@ -1,26 +1,21 @@
 { stdenv, fetchurl, asciidoc, libxcb, xcbutil, xcbutilkeysyms, xcbutilwm }:
 
 stdenv.mkDerivation rec {
-  name = "sxhkd-0.5.4";
- 
+  name = "sxhkd-${version}";
+  version = "0.5.5";
+
   src = fetchurl {
-    url = "https://github.com/baskerville/sxhkd/archive/0.5.4.tar.gz";
-    sha256 = "de95f97155319ded41ece9403ac9e9f18bfdd914a09f553ab09b331bbfe5d332";
+    url = "https://github.com/baskerville/sxhkd/archive/${version}.tar.gz";
+    sha256 = "04s3y2bq9502gw72jj3y2zsh96yj3qg2av3zsa8ahd2farvrysg6";
   };
-  
-  buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
 
-  buildPhase = ''
-     make PREFIX=$out
-  '';
+  buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ];
 
-  installPhase = ''
-     make PREFIX=$out install
-  '';
+  makeFlags = ''PREFIX=$(out)'';
 
   meta = {
     description = "Simple X hotkey daemon";
-    homepage = "http://github.com/baskerville/sxhkd";
+    homepage = http://github.com/baskerville/sxhkd/;
     license = stdenv.lib.licenses.bsd2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/build-support/build-fhs-chrootenv/env.nix b/pkgs/build-support/build-fhs-chrootenv/env.nix
index d80e2869e5e..b659655f74b 100644
--- a/pkgs/build-support/build-fhs-chrootenv/env.nix
+++ b/pkgs/build-support/build-fhs-chrootenv/env.nix
@@ -65,25 +65,56 @@ let
       gnutar gzip bzip2 xz glibcLocales
     ];
 
-  # Compose a global profile for the chroot environment
-  profilePkg = nixpkgs.stdenv.mkDerivation {
-    name         = "${name}-chrootenv-profile";
+  # Compose /etc for the chroot environment
+  etcPkg = nixpkgs.stdenv.mkDerivation {
+    name         = "${name}-chrootenv-etc";
     buildCommand = ''
       mkdir -p $out/etc
-      cat >> $out/etc/profile << "EOF"
+      cd $out/etc
+
+      # environment variables
+      cat >> profile << "EOF"
       export PS1='${name}-chrootenv:\u@\h:\w\$ '
       export LOCALE_ARCHIVE='/usr/lib${if is64Bit then "64" else ""}/locale/locale-archive'
       export LD_LIBRARY_PATH=/run/opengl-driver/lib:/run/opengl-driver-32/lib:/lib:/lib32:/lib64
       export PATH='/bin:/sbin'
       ${profile}
       EOF
+
+      # compatibility with NixOS
+      ln -s /host-etc/static static
+
+      # symlink some NSS stuff
+      ln -s /host-etc/passwd passwd
+      ln -s /host-etc/group group
+      ln -s /host-etc/shadow shadow
+      ln -s /host-etc/hosts hosts
+      ln -s /host-etc/resolv.conf resolv.conf
+      ln -s /host-etc/nsswitch.conf nsswitch.conf
+
+      # symlink other core stuff
+      ln -s /host-etc/localtime localtime
+      ln -s /host-etc/machine-id machine-id
+
+      # symlink PAM stuff
+      ln -s /host-etc/pam.d pam.d
+
+      # symlink fonts stuff
+      ln -s /host-etc/fonts fonts
+
+      # symlink ALSA stuff
+      ln -s /host-etc/asound.conf asound.conf
+
+      # symlink SSL certs
+      mkdir -p ssl
+      ln -s /host-etc/ssl/certs ssl/certs
     '';
   };
 
   # Composes a /usr like directory structure
   staticUsrProfileTarget = nixpkgs.buildEnv {
-    name = "system-profile-target";
-    paths = basePkgs ++ [ profilePkg ] ++ targetPaths;
+    name = "${name}-usr-target";
+    paths = [ etcPkg ] ++ basePkgs ++ targetPaths;
     ignoreCollisions = true;
   };
 
@@ -94,7 +125,7 @@ let
   };
 
   linkProfile = profile: ''
-    for i in ${profile}/{bin,sbin,share,var}; do
+    for i in ${profile}/{bin,sbin,share,var,etc}; do
         if [ -x "$i" ]
         then
             ln -s "$i"
@@ -102,18 +133,6 @@ let
     done
   '';
 
-  # the target profile is the actual profile that will be used for the chroot
-  setupTargetProfile = ''
-    ${linkProfile staticUsrProfileTarget}
-    ${setupLibDirs}
-
-    mkdir -m0755 usr
-    cd usr
-    ${linkProfile staticUsrProfileTarget}
-    ${setupLibDirs}
-    cd ..
-  '';
-
   # this will happen on x86_64 host:
   # /x86         -> links to the whole profile defined by multiPaths
   # /lib, /lib32 -> links to 32bit binaries
@@ -126,15 +145,12 @@ let
     cd ..
   '';
 
-  setupLibDirs = if isTargetBuild then setupLibDirs_target
-                                  else setupLibDirs_multi;
-
   # setup library paths only for the targeted architecture
   setupLibDirs_target = ''
     mkdir -m0755 lib
 
     # copy content of targetPaths
-    cp -rsf ${staticUsrProfileTarget}/lib/* lib/ && chmod u+w -R lib/
+    cp -rsf ${staticUsrProfileTarget}/lib/* lib/
   '';
 
   # setup /lib, /lib32 and /lib64
@@ -144,7 +160,7 @@ let
     ln -s lib lib32
 
     # copy glibc stuff
-    cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/
+    cp -rsf ${staticUsrProfileTarget}/lib/32/* lib/ && chmod u+w -R lib/
 
     # copy content of multiPaths (32bit libs)
     [ -d ${staticUsrProfileMulti}/lib ] && cp -rsf ${staticUsrProfileMulti}/lib/* lib/ && chmod u+w -R lib/
@@ -163,38 +179,21 @@ let
     cp -rsf ${chosenGcc.cc}/lib64/* lib64/
   '';
 
-  setupEtc = ''
-    mkdir -m0755 etc
-
-    # copy profile content
-    cp -rsf ${staticUsrProfileTarget}/etc/* etc/ && chmod u+w -R etc/
-    [ -d ${staticUsrProfileMulti}/etc ] && cp -rsf ${staticUsrProfileMulti}/etc/* etc/ && chmod u+w -R etc/
-
-    # compatibility with NixOS
-    ln -s /host-etc/static etc/static
-
-    # symlink some NSS stuff
-    ln -s /host-etc/passwd etc/passwd
-    ln -s /host-etc/group etc/group
-    ln -s /host-etc/shadow etc/shadow
-    ln -s /host-etc/hosts etc/hosts
-    ln -s /host-etc/resolv.conf etc/resolv.conf
-    ln -s /host-etc/nsswitch.conf etc/nsswitch.conf
-
-    # symlink other core stuff
-    ln -s /host-etc/localtime etc/localtime
-    ln -s /host-etc/machine-id etc/machine-id
+  setupLibDirs = if isTargetBuild then setupLibDirs_target
+                                  else setupLibDirs_multi;
 
-    # symlink PAM stuff
-    rm -rf etc/pam.d
-    ln -s /host-etc/pam.d etc/pam.d
 
-    # symlink fonts stuff
-    rm -rf etc/fonts
-    ln -s /host-etc/fonts etc/fonts
+  # the target profile is the actual profile that will be used for the chroot
+  setupTargetProfile = ''
+    ${linkProfile staticUsrProfileTarget}
+    ${setupLibDirs}
 
-    # symlink ALSA stuff
-    ln -s /host-etc/asound.conf etc/asound.conf
+    mkdir -m0755 usr
+    cd usr
+    ${linkProfile staticUsrProfileTarget}
+    ${setupLibDirs}
+    cd ..
+    rm -rf usr/etc usr/var
   '';
 
 in nixpkgs.stdenv.mkDerivation {
@@ -204,7 +203,6 @@ in nixpkgs.stdenv.mkDerivation {
     cd $out
     ${setupTargetProfile}
     ${setupMultiProfile}
-    ${setupEtc}
     cd $out
     ${extraBuildCommands}
     cd $out
diff --git a/pkgs/build-support/build-fhs-chrootenv/load.sh.in b/pkgs/build-support/build-fhs-chrootenv/load.sh.in
index 99da20c34b2..f3a6d13e8ff 100644
--- a/pkgs/build-support/build-fhs-chrootenv/load.sh.in
+++ b/pkgs/build-support/build-fhs-chrootenv/load.sh.in
@@ -9,4 +9,5 @@ sudo chroot --userspec "$USER:${GROUPS[0]}" --groups "${GROUPS[0]}" $chrootenvDe
      HOME="$HOME" \
      XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" \
      LANG="$LANG" \
+     SSL_CERT_FILE="$SSL_CERT_FILE" \
      /bin/bash --login
diff --git a/pkgs/build-support/build-fhs-userenv/chroot-user.rb b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
index 3e140fac97e..c555f053875 100755
--- a/pkgs/build-support/build-fhs-userenv/chroot-user.rb
+++ b/pkgs/build-support/build-fhs-userenv/chroot-user.rb
@@ -11,12 +11,21 @@ mounts = [ ['/nix/store', nil],
            ['/var', nil],
            ['/run', nil],
            ['/root', nil],
-         ].map! { |x| [ x[0], x[1].nil? ? x[0].sub(/^\/*/, '') : x[1] ] }
+         ]
 
 # Create directories
 mkdirs = ['tmp',
          ]
 
+# Propagate environment variables
+envvars = [ 'TERM',
+            'DISPLAY',
+            'HOME',
+            'XDG_RUNTIME_DIR',
+            'LANG',
+            'SSL_CERT_FILE',
+          ]
+
 require 'tmpdir'
 require 'fileutils'
 require 'pathname'
@@ -59,6 +68,9 @@ abort "Usage: chrootenv swdir program args..." unless ARGV.length >= 2
 swdir = Pathname.new ARGV[0]
 execp = ARGV.drop 1
 
+# Set destination paths for mounts
+mounts.map! { |x| [x[0], x[1].nil? ? x[0].sub(/^\/*/, '') : x[1]] }
+
 # Create temporary directory for root and chdir
 root = Dir.mktmpdir 'chrootenv'
 
@@ -88,7 +100,7 @@ if $cpid == 0
   write_file '/proc/self/gid_map', "#{gid} #{gid} 1"
 
   # Do mkdirs
-  mkdirs.each { |x| FileUtils.mkdir_p x }
+  mkdirs.each { |x| FileUtils.mkdir_p "#{root}/#{x}" }
 
   # Do rbind mounts.
   mounts.each do |x|
@@ -120,12 +132,7 @@ if $cpid == 0
   link_swdir.call swdir, Pathname.new('')
 
   # New environment
-  ENV.replace({ 'TERM' => ENV['TERM'],
-                'DISPLAY' => ENV['DISPLAY'],
-                'HOME' => ENV['HOME'],
-                'XDG_RUNTIME_DIR' => ENV['XDG_RUNTIME_DIR'],
-                'LANG' => ENV['LANG'],
-              })
+  ENV.replace(Hash[ envvars.map { |x| [x, ENV[x]] } ])
 
   # Finally, exec!
   exec *execp
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 67484857ee1..546345c7e6c 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,37 +1,21 @@
-{ writeTextFile, stdenv, ruby } : { env, runScript } :
+{ writeText, writeScriptBin, stdenv, ruby } : { env, runScript } :
 
 let
   name = env.pname;
 
   # Sandboxing script
-  chroot-user = writeTextFile {
-    name = "chroot-user";
-    executable = true;
-    destination = "/bin/chroot-user";
-    text = ''
-      #! ${ruby}/bin/ruby
-      ${builtins.readFile ./chroot-user.rb}
-    '';
-  };
+  chroot-user = writeScriptBin "chroot-user" ''
+    #! ${ruby}/bin/ruby
+    ${builtins.readFile ./chroot-user.rb}
+  '';
 
-in stdenv.mkDerivation {
-  name = "${name}-userenv";
-  buildInputs = [ ruby ];
-  preferLocalBuild = true;
-  buildCommand = ''
-    mkdir -p $out/bin
-    cat > $out/bin/${name} <<EOF
-    #! ${stdenv.shell}
-    exec ${chroot-user}/bin/chroot-user ${env} $out/libexec/run "\$@"
-    EOF
-    chmod +x $out/bin/${name}
+  init = writeText "init" ''
+           [ -d "$1" ] && [ -r "$1" ] && cd "$1"
+           shift
+           exec "${runScript}" "$@"
+         '';
 
-    mkdir -p $out/libexec
-    cat > $out/libexec/run <<EOF
-    #! ${stdenv.shell}
-    source /etc/profile
-    ${runScript} "\$@"
-    EOF
-    chmod +x $out/libexec/run
-  '';
-}
+in writeScriptBin name ''
+  #! ${stdenv.shell}
+  exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init} "$(pwd)" "$@"
+''
diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
new file mode 100644
index 00000000000..678ba450211
--- /dev/null
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -0,0 +1,71 @@
+{ stdenv, makeWrapper, emacs }:
+
+with stdenv.lib;
+
+explicitRequires: # packages explicitly requested by the user
+
+stdenv.mkDerivation {
+  name = (appendToName "with-packages" emacs).name;
+  nativeBuildInputs = [ emacs makeWrapper ];
+  inherit emacs explicitRequires;
+  phases = [ "installPhase" ];
+  installPhase = ''
+    requires=""
+    for pkg in $explicitRequires; do
+      findInputs $pkg requires propagated-user-env-packages
+    done
+    # requires now holds all requested packages and their transitive dependencies
+
+    siteStart="$out/share/emacs/site-lisp/site-start.el"
+
+    addEmacsPath() {
+      local list=$1
+      local path=$2
+      # Add the path to the search path list, but only if it exists
+      if [[ -d "$path" ]]; then
+        echo "(add-to-list '$list \"$path\")" >>"$siteStart"
+      fi
+    }
+
+    # Add a dependency's paths to site-start.el
+    addToEmacsPaths() {
+      addEmacsPath "exec-path" "$1/bin"
+      addEmacsPath "load-path" "$1/share/emacs/site-lisp"
+      addEmacsPath "package-directory-list" "$1/share/emacs/site-lisp/elpa"
+    }
+
+    mkdir -p $out/share/emacs/site-lisp
+    # Begin the new site-start.el by loading the original, which sets some
+    # NixOS-specific paths. Paths are searched in the reverse of the order
+    # they are specified in, so user and system profile paths are searched last.
+    echo "(load-file \"$emacs/share/emacs/site-lisp/site-start.el\")" >"$siteStart"
+    echo "(require 'package)" >>"$siteStart"
+
+    # Set paths for the dependencies of the requested packages. These paths are
+    # searched before the profile paths, but after the explicitly-required paths.
+    for pkg in $requires; do
+      # The explicitly-required packages are also in the list, but we will add
+      # those paths last.
+      if ! ( echo "$explicitRequires" | grep "$pkg" >/dev/null ) ; then
+        addToEmacsPaths $pkg
+      fi
+    done
+
+    # Finally, add paths for all the explicitly-required packages. These paths
+    # will be searched first.
+    for pkg in $explicitRequires; do
+      addToEmacsPaths $pkg
+    done
+
+    # Byte-compiling improves start-up time only slightly, but costs nothing.
+    emacs --batch -f batch-byte-compile "$siteStart"
+
+    mkdir -p $out/bin
+    # Wrap emacs and friends so they find our site-start.el before the original.
+    for prog in $emacs/bin/*; do # */
+      makeWrapper "$prog" $out/bin/$(basename "$prog") \
+        --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:"
+    done
+  '';
+  inherit (emacs) meta;
+}
diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix
index 4675cbe6ec8..26426ce7d83 100644
--- a/pkgs/build-support/fetchhg/default.nix
+++ b/pkgs/build-support/fetchhg/default.nix
@@ -6,13 +6,17 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   buildInputs = [mercurial];
 
+  impureEnvVars = [
+    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
+  ];
+
   # Nix <= 0.7 compatibility.
   id = md5;
 
   outputHashAlgo = if md5 != null then "md5" else "sha256";
   outputHashMode = "recursive";
   outputHash = if md5 != null then md5 else sha256;
-  
+
   inherit url rev;
   preferLocalBuild = true;
 }
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index f339be3954b..5c93ecc9469 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl }:
 
+let version = "3.83"; in
 stdenv.mkDerivation rec {
-  name = "man-pages-3.78";
+  name = "man-pages-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "0zm3sc0zbfng440jjqha8qnzivvg5nqpwgi7zv9h8qxwgyhrfa65";
+    sha256 = "1wksxxfvn8avfl01qk0i61zzgkkay29lpmbfal26a542yahydz3j";
   };
 
-  preBuild =
-    ''
-      makeFlagsArray=(MANDIR=$out/share/man)
-    '';
+  makeFlags = "MANDIR=$(out)/share/man";
 
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "Linux development manual pages";
     homepage = http://www.kernel.org/doc/man-pages/;
     repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index adcb4fa42e9..c2bec7707c2 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       app), available for Linux and Windows.
     '';
     homepage = "http://zealdocs.org/";
-    licenses = with stdenv.lib.licenses; [ gpl3 ];
+    license = with stdenv.lib.licenses; [ gpl3 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix
index 91608d17db4..5d3da910e0b 100644
--- a/pkgs/data/fonts/comic-neue/default.nix
+++ b/pkgs/data/fonts/comic-neue/default.nix
@@ -1,20 +1,27 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl
+, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "comic-neue-1.1";
+  name = "comic-neue-${version}";
+  version = "2.2";
 
   src = fetchurl {
-    url = "http://comicneue.com/comic-neue-1.1.zip";
-    sha256 = "f9442fc42252db62ea788bd0247ae0e74571678d1dbd3e3edc229389050d6923";
+    url = "http://comicneue.com/${name}.zip";
+    sha256 = "1dmmjhxxc0bj2755yksiiwh275vmnyciknr9b995lmdkjgh7sz6n";
   };
 
-  buildInputs = [unzip];
+  buildInputs = [ unzip ];
   phases = [ "unpackPhase" "installPhase" ];
   sourceRoot = name;
 
   installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp -v *.ttf $out/share/fonts/truetype
+    mkdir -vp $out/share/fonts/truetype $out/share/fonts/opentype $out/share/fonts/EOT $out/share/fonts/WOFF $out/share/fonts/WOFF2 $out/share/doc/${name}
+    cp -v OTF/*.otf  $out/share/fonts/opentype
+    cp -v Web/*.ttf $out/share/fonts/truetype
+    cp -v Web/*.eot  $out/share/fonts/EOT
+    cp -v Web/*.woff  $out/share/fonts/WOFF
+    cp -v Web/*.woff2  $out/share/fonts/WOFF2
+    cp -v Booklet-ComicNeue.pdf FONTLOG.txt OFL-FAQ.txt SIL-License.txt $out/share/doc/${name}
   '';
 
   meta = with stdenv.lib; {
@@ -27,7 +34,8 @@ stdenv.mkDerivation rec {
       the latter angular terminals.  Both variants come in Light,
       Regular, and Bold weights with Oblique variants.
     '';
-    license = licenses.cc0;
+    license = licenses.ofl;
     platforms = platforms.all;
+    maintainers = [ maintainers.AndersonTorres ];
   };
 }
diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix
index da7a1bc5fb9..e79dcd014d3 100644
--- a/pkgs/data/fonts/dina/default.nix
+++ b/pkgs/data/fonts/dina/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   preferLocalBuild = true;
 
   meta = with stdenv.lib; {
-    description = "A monospace bitmap font aimed at programmers.";
+    description = "A monospace bitmap font aimed at programmers";
     longDescription = ''
       Dina is a monospace bitmap font, primarily aimed at programmers. It is
       relatively compact to allow a lot of code on screen, while (hopefully)
diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix
new file mode 100644
index 00000000000..92d6b1e25b5
--- /dev/null
+++ b/pkgs/data/fonts/fira-mono/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "fira-mono-3.2";
+
+  src = fetchurl {
+    url = http://www.carrois.com/downloads/fira_mono_3_2/FiraMonoFonts3200.zip;
+    sha256 = "0g3i54q8czf3vylgasj62w2n7l1a2yrbyibjlx1qk3awh7fr1r7p";
+  };
+
+  buildInputs = [ unzip ];
+  phases = [ "unpackPhase" "installPhase" ];
+  sourceRoot = "FiraMonoFonts3200";
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.carrois.com/fira-4-1/;
+    description = "Monospace font for Firefox OS";
+    longDescription = ''
+      Fira Mono is a monospace font designed by Erik Spiekermann,
+      Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois
+      Type Design for Mozilla Firefox OS. Available in Regular,
+      Medium, and Bold.
+    '';
+    license = licenses.ofl;
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix
index 532abd4e587..151c945ee9e 100644
--- a/pkgs/data/fonts/fira/default.nix
+++ b/pkgs/data/fonts/fira/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "fira-4.004";
+  name = "fira-4.1";
 
   src = fetchurl {
-    url = "http://www.carrois.com/downloads/fira_4_0/FiraFonts4004.zip";
-    sha256 = "0mab1n4i8ayhzmpfm0dj07annghrfpnsfr2rhnwsyhkk5zxlh6v7";
+    url = "http://www.carrois.com/downloads/fira_4_1/FiraFonts4100.zip";
+    sha256 = "0mqmmq1m2p0hb0x4mr74gghqr75iglilah7psfb3vdc80fc9h6yk";
   };
 
   buildInputs = [unzip];
   phases = [ "unpackPhase" "installPhase" ];
-  sourceRoot = "FiraFonts4004";
+  sourceRoot = "FiraFonts4100";
 
   installPhase = ''
     mkdir -p $out/share/fonts/opentype
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.carrois.com/fira-4-0/;
-    description = "Sans-serif and monospace font for Firefox OS";
+    homepage = http://www.carrois.com/fira-4-1/;
+    description = "Sans-serif font for Firefox OS";
     longDescription = ''
       Fira Sans is a sans-serif font designed by Erik Spiekermann,
       Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois
@@ -27,9 +27,7 @@ stdenv.mkDerivation rec {
       Spiekermann's FF Meta typeface.  Available in Two, Four, Eight,
       Hair, Thin, Ultra Light, Extra Light, Light, Book, Regular,
       Medium, Semi Bold, Bold, Extra Bold, Heavy weights with
-      corresponding italic versions.  Fira Mono is a matching
-      monospace variant of Fira Sans.  It is available in regular, and
-      bold weights.
+      corresponding italic versions.
     '';
     license = licenses.ofl;
     platforms = platforms.all;
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
new file mode 100644
index 00000000000..0d3d9c104d4
--- /dev/null
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "powerline-fonts-2014-12-27";
+
+  src = fetchFromGitHub {
+    owner = "powerline";
+    repo = "fonts";
+    rev = "39c99c02652f25290b64e24a7e9a7cfb8ce89a3e";
+    sha256 = "9c83a30f36dc980582c0a079bd2896f95d19e1cb0ba5afbd8cae936c944256dd";
+  };
+
+  buildPhase = "true";
+
+  installPhase =
+    ''
+      mkdir -p $out/share/fonts/opentype
+      cp -v */*.otf $out/share/fonts/opentype
+
+      mkdir -p $out/share/fonts/truetype
+      cp -v */*.ttf $out/share/fonts/truetype
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/powerline/fonts;
+    description = "Patched fonts for Powerline users.";
+    longDescription = ''
+      Pre-patched and adjusted fonts for usage with the Powerline plugin.
+    '';
+    license = "asl20 free ofl";
+    platforms = platforms.all;
+    maintainer = with maintainers; [ malyn ];
+  };
+}
diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix
index dc5bcb5b9a7..b3761bc0b5b 100644
--- a/pkgs/data/fonts/source-code-pro/default.nix
+++ b/pkgs/data/fonts/source-code-pro/default.nix
@@ -1,42 +1,26 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    version="1.017";
-    name="SourceCodePro";
-    url="mirror://sourceforge/sourcecodepro.adobe/${name}_FontsOnly-${version}.zip";
-    hash="07xjfxin883a3g3admdddxxqyzigihbsnmik0zpjii09cdlb8dl1";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
+stdenv.mkDerivation rec {
+  name = "source-code-pro-${version}";
+  version = "1.017";
 
-  name = "source-code-pro-${sourceInfo.version}";
-  inherit buildInputs;
+  src = fetchurl {
+    url="https://github.com/adobe-fonts/source-code-pro/archive/${version}R.tar.gz";
+    sha256="03q4a0f142c6zlngv6kjaik52y0yzwq5z5qj3j0fvvcbfy9sanjr";
+  };
 
-  phaseNames = ["doUnpack" "installFonts"];
+  phases = "unpackPhase installPhase";
 
-  doUnpack = a.fullDepEntry (''
-    unzip ${src}
-    cd ${sourceInfo.name}*/OTF/
-  '') ["addInputs"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    find . -name "*.otf" -exec cp {} $out/share/fonts/opentype \;
+  '';
 
   meta = {
     description = "A set of monospaced OpenType fonts designed for coding environments";
-    maintainers = with a.lib.maintainers; [ relrod ];
-    platforms = with a.lib.platforms; all;
+    maintainers = with stdenv.lib.maintainers; [ relrod ];
+    platforms = with stdenv.lib.platforms; all;
     homepage = "http://blog.typekit.com/2012/09/24/source-code-pro/";
-    license = a.lib.licenses.ofl;
+    license = stdenv.lib.licenses.ofl;
   };
-}) x
+}
diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix
index eccddc8f14c..83b6a3f2d57 100644
--- a/pkgs/data/fonts/source-sans-pro/default.nix
+++ b/pkgs/data/fonts/source-sans-pro/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "source-sans-pro-1.050";
+  name = "source-sans-pro-2.010";
   src = fetchurl {
-    url = "mirror://sourceforge/sourcesans.adobe/SourceSansPro_FontsOnly-1.050.zip";
-    sha256 = "002z7kx8jxp5pfrilqaxbwbr5yp9fl3zsp0imawmf5wqagpzayf3";
+    url = "https://github.com/adobe-fonts/source-sans-pro/archive/2.010R-ro/1.065R-it.tar.gz";
+    sha256 = "1s3rgia6x9fxc2pvlwm203grqkb49px6q0xnh8kbqxqsgna615p2";
   };
 
-  buildInputs = [ unzip ];
-
   phases = "unpackPhase installPhase";
 
   installPhase = ''
diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix
index 00ebf22d469..0ccb0299a36 100644
--- a/pkgs/data/fonts/source-serif-pro/default.nix
+++ b/pkgs/data/fonts/source-serif-pro/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "source-serif-pro-1.014";
-  src = fetchurl {
-    url = "mirror://sourceforge/sourceserifpro.adobe/SourceSerifPro_FontsOnly-1.014.zip";
-    sha256 = "1agack195jqq4g2hmga6f9nwg44garii1g3jpbrdlrwr97rwvqsh";
-  };
+stdenv.mkDerivation rec {
+  name = "source-serif-pro-${version}";
+  version = "1.017";
 
-  buildInputs = [ unzip ];
+  src = fetchurl rec {
+    url = "https://github.com/adobe-fonts/source-serif-pro/archive/${version}R.tar.gz";
+    sha256 = "04h24iywjl4fd08x22ypdb3sm979wjfq4wk95r3rk8w376spakrg";
+  };
 
   phases = "unpackPhase installPhase";
 
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index c36e6f83106..cf8e7ab47ae 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -1,35 +1,30 @@
 { stdenv, fetchurl }:
 
-# Annoyingly, these files are updated without a change in URL. This means that
-# builds will start failing every month or so, until the hashes are updated.
-let version = "2015-03-26"; in
+let
+  fetchDB = name: sha256: fetchurl {
+    inherit sha256;
+    url = "https://geolite.maxmind.com/download/geoip/database/${name}.dat.gz";
+  };
+
+  # Annoyingly, these files are updated without a change in URL. This means that
+  # builds will start failing every month or so, until the hashes are updated.
+  version = "2015-04-21";
+in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
 
-  srcGeoIP = fetchurl {
-    url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz;
-    sha256 = "01xw896n9wcm1pv7sixfbh4gv6isl6m1i6lwag1c2bbcx6ci1zvr";
-  };
-  srcGeoIPv6 = fetchurl {
-    url = https://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz;
-    sha256 = "07l10hd7fkgk1nbw5gx4hjp61kdqqgri97fidn78dlk837rb02d0";
-  };
-  srcGeoLiteCity = fetchurl {
-    url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz;
-    sha256 = "1xqjyz9xnga3dvhj0f38hf78wv781jflvqkxm6qni3sj781nfr4a";
-  };
-  srcGeoLiteCityv6 = fetchurl {
-    url = https://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz;
-    sha256 = "03s41ffc5a13qy5kgx8jqya97jkw2qlvdkak98hab7xs0i17z9pd";
-  };
-  srcGeoIPASNum = fetchurl {
-    url = https://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz;
-    sha256 = "1h766l8dsfgzlrz0q76877xksaf5qf91nwnkqwb6zl1gkczbwy6p";
-  };
-  srcGeoIPASNumv6 = fetchurl {
-    url = https://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz;
-    sha256 = "0dwi9b3amfpmpkknf9ipz2r8aq05gn1j2zlvanwwah3ib5cgva9d";
-  };
+  srcGeoIP = fetchDB "GeoLiteCountry/GeoIP"
+    "15c7j6yyjl0k42ij7smdz2j451y3hhfbmxwkx8kp5ja0afrlw41k";
+  srcGeoIPv6 = fetchDB "GeoIPv6"
+    "0kz6yjprzqr2pi4rczbmw7489gdjzf957azahdqjai8fx0s5w93i";
+  srcGeoLiteCity = fetchDB "GeoLiteCity"
+    "0lc696axcdgz7xrh9p6ac5aa7nlxfgngwyabjwqiwazz3wcmw05a";
+  srcGeoLiteCityv6 = fetchDB "GeoLiteCityv6-beta/GeoLiteCityv6"
+    "1k8sig8w43cdm19rpwndr1akj1d3mxl5sch60qbinjrb05l6xbgv";
+  srcGeoIPASNum = fetchDB "asnum/GeoIPASNum"
+    "0r4v2zs4alxb46kz679hw4w34s7n9pxw32wcfs5x4nhnq051y6ms";
+  srcGeoIPASNumv6 = fetchDB "asnum/GeoIPASNumv6"
+    "04ciwh5gaxja4lzlsgbg1p7rkrhnn637m4nj9ld8sb36bl2ph6gc";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 1953152fdd8..57417022176 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl }:
 
-let version = "2015a"; in
+let version = "2015c"; in
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "0k4fy5x1813az0dwh82v5dhnvivfxxjin2szkgyfga00gn8r0965";
+        sha256 = "0nin48g5dmkfgckp25bngxchn3sw3yyjss5sq7gs5xspbxgsq3w6";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "06fxf9yw39wcpqifxf3lr8cn64nlwznqcyhd0cs2z1c6y88snnw8";
+        sha256 = "0bplibiy70dvlrhwqzkzxgmg81j6d2kklvjgi2f1g2zz1nkb3vkz";
       })
     ];
 
diff --git a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
index 74d054f8c88..5985dbe0e01 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/disable_x_access_control.patch
@@ -1,7 +1,7 @@
-diff --git a/daemon/gdm-slave.c b/daemon/gdm-slave.c
+diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c
 index 1afe48e..e3d1ec2 100644
---- a/daemon/gdm-slave.c
-+++ b/daemon/gdm-slave.c
+--- a/daemon/gdm-display.c
++++ b/daemon/gdm-display.c
 @@ -291,9 +291,10 @@ gdm_slave_connect_to_x11_display (GdmSlave *slave)
 
                  gdm_error_trap_push ();
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
new file mode 100644
index 00000000000..fae47476898
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
+, udev, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-bluetooth-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0rsw27yj6887axk7s2vwpsr0pmic0wdskl7sx8rk4kns7b0ifs88";
+  };
+
+  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
+                               gsettings_desktop_schemas itstool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
+    description = "Application that let you manage Bluetooth in the GNOME destkop";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
index 7b9e2097bef..066951c63a6 100644
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gnome3.gnome_icon_theme ];
 
+  propagatedUserEnvPkgs = [ gnome3.gnome_icon_theme ];
+
   meta = with stdenv.lib; {
     platforms = platforms.linux;
   };
diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix
index ac5427d0e40..670ceb105af 100644
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@@ -1,6 +1,24 @@
 { callPackage, pkgs }:
 
 rec {
+  corePackages = with gnome3; [
+    pkgs.desktop_file_utils pkgs.ibus
+    pkgs.shared_mime_info # for update-mime-database
+    gtk3 # for gtk-update-icon-cache
+    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
+    gnome-menus gnome_settings_daemon gnome_shell
+    gnome_themes_standard defaultIconTheme
+  ];
+
+  optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
+    gucharmap nautilus totem vino yelp gnome-bluetooth
+    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
+    gnome-shell-extensions gnome-system-log gnome-system-monitor
+    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
+    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
+    nautilus-sendto
+  ];
+
   inherit (pkgs) glib gtk2 gtk3 gnome2;
   gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; };
 
@@ -16,6 +34,11 @@ rec {
   orbit = ORBit2;
   inherit (pkgs) libsoup;
 
+  version = "3.12";
+
+# Simplify the nixos module and gnome packages
+  defaultIconTheme = gnome_icon_theme_symbolic;
+
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
   baobab = callPackage ./core/baobab { };
@@ -52,6 +75,8 @@ rec {
 
   gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
 
+  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
+
   gnome-contacts = callPackage ./core/gnome-contacts { };
 
   gnome_control_center = callPackage ./core/gnome-control-center { };
@@ -158,10 +183,12 @@ rec {
     inherit gnome3;
   };
 
+  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
+    inherit gnome3;
+  };
+
   networkmanagerapplet = pkgs.networkmanagerapplet.override {
-    inherit gnome3 gsettings_desktop_schemas glib_networking
-      networkmanager_openvpn networkmanager_pptp networkmanager_vpnc
-      networkmanager_openconnect;
+    inherit gnome3 gsettings_desktop_schemas glib_networking;
   };
 
   rest = callPackage ./core/rest { };
@@ -178,10 +205,6 @@ rec {
 
   vte = callPackage ./core/vte { };
 
-  vte_038 = callPackage ./core/vte/0.38.0.nix { }; # To be moved in gnome 3.14 when available
-
-  vte-select-text = vte_038.override { selectTextPatch = true; };
-
   vino = callPackage ./core/vino { };
 
   yelp = callPackage ./core/yelp {
diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
new file mode 100644
index 00000000000..3bce034507a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, evolution_data_server, evolution, sqlite
+, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils
+, clutter_gtk, libuuid, webkitgtk, zeitgeist
+, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "bijiben-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/bijiben/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0ndb7bv03rqxh4an44xd4cwxxp5z1wywk9xazmab01jsa0a0zx7r";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig glib intltool itstool libxml2
+                  clutter_gtk libuuid webkitgtk gnome3.tracker
+                  gnome3.gnome_online_accounts zeitgeist desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  evolution_data_server evolution sqlite
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/bijiben" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Bijiben;
+    description = "Note editor designed to remain simple to use";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
new file mode 100644
index 00000000000..af60d890673
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
+, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite
+, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
+
+let
+  majVer = gnome3.version;
+in stdenv.mkDerivation rec {
+  name = "evolution-${majVer}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution/${majVer}/${name}.tar.xz";
+    sha256 = "1lm877rrcfy98mpp4iq7m9p8r1nr9kir916n4qin2ygas9zx0qlb";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  propagatedBuildInputs = [ gnome3.gtkhtml ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg db icu
+                  gnome3.evolution_data_server libsecret libical gcr
+                  webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
+                  libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  nss nspr libnotify procps highlight gnome3.libgweather
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
+                     "--disable-libcryptui" ];
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Evolution;
+    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
new file mode 100644
index 00000000000..d36162e13c2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
+, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "file-roller-${version}";
+
+  majVersion = gnome3.version;
+  version = "${majVersion}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
+    sha256 = "12c6lpvc3mi1q10nas64kfcjw2arv3z4955zdfgf4c5wy4dczqyh";
+  };
+
+  # TODO: support nautilus
+  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
+
+  buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/file-roller" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/FileRoller;
+    description = "Archive manager for the GNOME desktop environment";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
new file mode 100644
index 00000000000..172c817f6f9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, intltool, fetchurl, enchant, isocodes
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libsoup, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "gedit-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gedit/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0bs0vf773l0k7f4zxqlyb8z772s5dcn7ww0073hs7z3hj0l3lzrc";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg libsoup
+                  gnome3.libpeas gnome3.gtksourceview libxml2
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gedit" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Gedit;
+    description = "Official text editor of the GNOME desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
new file mode 100644
index 00000000000..22b896c3337
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, python
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libxml2, docbook_xsl
+, gnome3, librsvg, gdk_pixbuf, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "glade-3.16.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
+    sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
+                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg libxslt
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/glade" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Glade;
+    description = "User interface designer for GTK+ applications";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
new file mode 100644
index 00000000000..3b30cdbbcfb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
+, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
+, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
+, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
+, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio
+}:
+
+# TODO: ovirt (optional)
+
+stdenv.mkDerivation rec {
+  name = "gnome-boxes-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-boxes/${gnome3.version}/${name}.tar.xz";
+    sha256 = "03a8x1bnbchsh2bs86gnwvddnwbf643wp5nrhyvg9j86d57axvs1";
+  };
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  buildInputs = [
+    makeWrapper pkgconfig intltool itstool libvirt-glib glib
+    gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
+    libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
+    gdbm cyrus_sasl gnome3.adwaita-icon-theme
+    librsvg hicolor_icon_theme desktop_file_utils
+  ];
+
+  preFixup = ''
+    for prog in "$out/bin/"*; do
+        wrapProgram "$prog" \
+            --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+            --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple GNOME 3 application to access remote or virtual systems";
+    homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
new file mode 100644
index 00000000000..8bdfcfd9f88
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, intltool, fetchurl, libgweather, libnotify
+, pkgconfig, gtk3, glib, hicolor_icon_theme, gsound
+, makeWrapper, itstool, libcanberra_gtk3, libtool
+, gnome3, librsvg, gdk_pixbuf, geoclue2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-clocks-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-clocks/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1k7khghaq7y3j0r3kn9q7dwgi1875bfn4iy0sr1ls14m1p2bl10q";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+                  gnome3.gsettings_desktop_schemas makeWrapper
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
+                  libgweather libnotify libtool gsound
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-clocks" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Clocks;
+    description = "Clock application designed for GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
new file mode 100644
index 00000000000..50fff0cd1d2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, intltool, fetchurl, evince, gjs
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, libxslt, webkitgtk
+, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
+, gobjectIntrospection, json_glib
+, gmp, desktop_file_utils }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-documents-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-documents/${gnome3.version}/${name}.tar.xz";
+    sha256 = "154ssnyq4lwq2rsy3l5kqk8x1qjvn2j5gqm23i0aiw7qsbx5phrs";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
+                  docbook_xsl desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper gmp
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg evince
+                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
+                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
+                  gnome3.gnome_desktop gnome3.libzapojit json_glib
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  enableParallelBuilding = true;
+
+  preFixup =
+    ''
+    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
+
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+        --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Documents;
+    description = "Document manager application designed to work with GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
new file mode 100644
index 00000000000..31ee8a7230c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
+, python3, libxml2, python3Packages, libnotify
+, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
+, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-music-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-music/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1pyj192kva0swad6w2kaj5shcwpgiflyda6zmsiaximsgzc4as8i";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg python3
+                  gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
+                  python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-music" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Music;
+    description = "Music player and management application for the GNOME desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
new file mode 100644
index 00000000000..fba1a541812
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, intltool, fetchurl, exempi, libxml2
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, gegl, babl, lcms2
+, desktop_file_utils, gmp, libmediaart
+, gnome3, librsvg, gdk_pixbuf, libexif }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-photos-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-photos/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0jv3b5nd4sazyq2k132rdjizfg24sj6i63ls1m6x2qqqf8grxznj";
+  };
+
+  # doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
+                  gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg exempi
+                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
+                  gnome3.gnome_online_accounts gnome3.gnome_desktop
+                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Photos;
+    description = "Photos is an application to access, organize and share your photos with GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
new file mode 100644
index 00000000000..5a85e00e4e4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
+, gobjectIntrospection, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "nautilus-sendto-${version}";
+
+  version = "3.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
+    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
+  };
+
+  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
new file mode 100644
index 00000000000..bce514364ce
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/pomodoro/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
+  dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3, gtk3, gst_plugins_base,
+  glib, gobjectIntrospection, hicolor_icon_theme
+}:
+
+stdenv.mkDerivation rec {
+  rev = "0.10.3";
+  name = "gnome-shell-pomodoro-${rev}-61df3fa";
+
+  src = fetchFromGitHub {
+      owner = "codito";
+      repo = "gnome-shell-pomodoro";
+      rev = "${rev}";
+      sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship";
+  };
+
+  configureScript = ''./autogen.sh'';
+
+  buildInputs = [
+    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
+    makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
+    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
+    gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
+  ];
+
+  preBuild = ''
+    sed -i \
+        -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
+        -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3.gnome_desktop}\1|' \
+        vapi/Makefile
+  '';
+
+  preFixup = ''
+    wrapProgram $out/bin/gnome-pomodoro \
+        --prefix XDG_DATA_DIRS : \
+        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/codito/gnome-shell-pomodoro;
+    description =
+      "Personal information management application that provides integrated " + 
+      "mail, calendaring and address book functionality";
+    maintainers = with maintainers; [ DamienCassou ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
new file mode 100644
index 00000000000..cebbce78177
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, intltool, fetchurl, vala
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, makeWrapper, itstool, gnupg, libsoup
+, gnome3, librsvg, gdk_pixbuf, gpgme
+, libsecret, avahi, p11_kit }:
+
+let
+  majVer = "3.14";
+in stdenv.mkDerivation rec {
+  name = "seahorse-${majVer}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/seahorse/${majVer}/${name}.tar.xz";
+    sha256 = "14syy2qxxrim220aj64mbp76jbrrc6wmdwc4lfl4sngsh84qjah9";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
+                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme
+                  libsecret avahi libsoup p11_kit vala gnome3.gcr
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/seahorse" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Seahorse;
+    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
new file mode 100644
index 00000000000..a445ff73608
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnome3
+, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }:
+
+stdenv.mkDerivation rec {
+  name = "adwaita-icon-theme-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.version}/${name}.tar.xz";
+    sha256 = "a3c8ad3b099ca571b423811a20ee9a7a43498cfa04d299719ee43cd7af6f6eb1";
+  };
+
+  # For convenience, we can specify adwaita-icon-theme only in packages
+  propagatedBuildInputs = [ hicolor_icon_theme ];
+
+  buildInputs = [ gdk_pixbuf librsvg ];
+  
+  nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
new file mode 100644
index 00000000000..87c21e3eb01
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, vala, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "baobab-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/baobab/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1wnf3yd3qi0xsmm37s6pk23qh095pk1fv9nhqjya1p9svwrh9r0z";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/baobab" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Baobab;
+    description = "Graphical application to analyse disk usage in any Gnome environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
new file mode 100644
index 00000000000..b75b055fc3f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
+, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }:
+
+let
+  majorVersion = "0.4";
+in
+stdenv.mkDerivation rec {
+  name = "caribou-${majorVersion}.18.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz";
+    sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf";
+  };
+
+  buildInputs = with gnome3;
+    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x
+      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
+
+  propagatedBuildInputs = [ gnome3.libgee libxklavier ];
+
+  preBuild = ''
+    patchShebangs .
+    substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
new file mode 100644
index 00000000000..06c01d305f8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
+, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+
+let
+  majorVersion = "3.16";
+in
+stdenv.mkDerivation rec {
+  name = "dconf-editor-${version}";
+  version = "${majorVersion}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/dconf-editor/${majorVersion}/${name}.tar.xz";
+    sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88";
+  };
+
+  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+                  intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/dconf-editor" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
new file mode 100644
index 00000000000..3f71165e713
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
+, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
+
+let
+  majorVersion = "0.24";
+in
+stdenv.mkDerivation rec {
+  name = "dconf-${version}";
+  version = "${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz";
+    sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2";
+  };
+
+  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
+                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
new file mode 100644
index 00000000000..ab5ea0cbcca
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
+, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
+, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
+, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
+, telepathy_logger, libnotify, clutter, libsoup, gnutls
+, evolution_data_server
+, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
+, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee  }:
+
+# TODO: enable more features
+
+let
+  majorVersion = "3.12";
+in
+stdenv.mkDerivation rec {
+  name = "empathy-${majorVersion}.8";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz";
+    sha256 = "10z6ksia6yx7vg0wsdbk4w6vjgfg3cg3n04jf9bj2vr7kr5zvs7w";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
+                            gnome_online_accounts shared_mime_info ];
+  propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
+                            telepathy_mission_control ];
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
+                  libxml2 libxslt icu file makeWrapper
+                  telepathy_glib clutter_gtk clutter-gst cogl
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
+                  libnotify clutter libsoup gnutls libgee p11_kit
+                  libcanberra_gtk3 telepathy_farstream farstream
+                  gnome3.adwaita-icon-theme hicolor_icon_theme 
+                  gnome3.gsettings_desktop_schemas file libtool librsvg ];
+
+  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
+                         "-I${dbus_libs}/include/dbus-1.0"
+                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Empathy;
+    description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
+    maintainers = with maintainers; [ lethalman ];
+    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
new file mode 100644
index 00000000000..093bab63fe4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
+, shared_mime_info, makeWrapper, librsvg, libexif }:
+
+
+stdenv.mkDerivation rec {
+  name = "eog-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/eog/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1ry10wvd2zq7vv4rf1qz0x1b77sdzaqlxyjbw3a0lccp4f2x2y99";
+  };
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
+      gsettings_desktop_schemas shared_mime_info adwaita-icon-theme gnome_desktop libexif ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/eog" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.adwaita-icon-theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
+    platforms = platforms.linux;
+    description = "GNOME image viewer";
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
new file mode 100644
index 00000000000..b03fbd4e9c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
+, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
+, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
+, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
+, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }:
+
+stdenv.mkDerivation rec {
+  name = "epiphany-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/epiphany/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1bicv1rfi697hk12p5n3jmcgjc81bwicjsmppdfjmvj94r4iniz8";
+  };
+
+  # Tests need an X display
+  configureFlags = [ "--disable-static --disable-tests" ];
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  nativeBuildInputs = [ pkgconfig file ];
+
+  configureScript = "./autogen.sh";
+
+  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
+                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
+                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg which gnome_common
+                  gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  patches = [ ./libxml_depend.patch ];
+
+  patchFlags = [ "-p0" ];
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram "$f" \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Epiphany;
+    description = "WebKit based web browser for GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
new file mode 100644
index 00000000000..89e3694a02d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2015-04-08 18:53:52.284580835 +0200
++++ configure.ac	2015-04-08 18:55:55.697225280 +0200
+@@ -113,6 +113,7 @@
+ PKG_CHECK_MODULES(WEB_EXTENSION, [
+                   webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED
+                   libsecret-1 >= $LIBSECRET_REQUIRED
++                  libxml-2.0 >= $LIBXML_REQUIRED
+                   ])
+ AC_SUBST(WEB_EXTENSION_CFLAGS)
+ AC_SUBST(WEB_EXTENSION_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
new file mode 100644
index 00000000000..aa75b55358b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
@@ -0,0 +1,69 @@
+{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
+, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
+, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
+, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
+, gobjectIntrospection
+}:
+
+stdenv.mkDerivation rec {
+  name = "evince-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evince/${gnome3.version}/${name}.tar.xz";
+    sha256 = "016d9i83srv49saslmjl7v02n7sc6d7v6h68y06y9rfgbk8f4f2i";
+  };
+
+  buildInputs = [
+    pkgconfig intltool perl perlXMLParser libxml2
+    glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
+    itstool gnome3.adwaita-icon-theme
+    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
+    poppler ghostscriptX djvulibre libspectre
+    makeWrapper libsecret librsvg gnome3.adwaita-icon-theme
+  ];
+
+  configureFlags = [
+    "--disable-nautilus" # Do not use nautilus
+    "--enable-introspection"
+  ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  preConfigure = with stdenv.lib;
+    optionalString doCheck ''
+      for file in test/*.py; do
+        echo "patching $file"
+        sed '1s,/usr,${python},' -i "$file"
+      done
+    '' + optionalString (recentListSize != null) ''
+      sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
+      sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
+    '';
+
+  preFixup = ''
+    # Tell Glib/GIO about the MIME info directory, which is used
+    # by `g_file_info_get_content_type ()'.
+    wrapProgram "$out/bin/evince" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+
+  '';
+
+  doCheck = false; # would need pythonPackages.dogTail, which is missing
+
+  meta = with stdenv.lib; {
+    homepage = http://www.gnome.org/projects/evince/;
+    description = "GNOME's document viewer";
+
+    longDescription = ''
+      Evince is a document viewer for multiple document formats.  It
+      currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
+      of Evince is to replace the multiple document viewers that exist
+      on the GNOME Desktop with a single simple application.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.vcunat ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
new file mode 100644
index 00000000000..7193b845468
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, python
+, intltool, libsoup, libxml2, libsecret, icu, sqlite
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
+
+
+stdenv.mkDerivation rec {
+  name = "evolution-data-server-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/evolution-data-server/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0lgb8jvn8kx50692gg1m9klvwm7msvk4f7wm0yl7rj880wbxzvh4";
+  };
+
+  buildInputs = with gnome3;
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
+      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite ]
+    ++ stdenv.lib.optional valaSupport vala;
+
+  propagatedBuildInputs = [ libsecret nss nspr libical db ];
+
+  # uoa irrelevant for now
+  configureFlags = [ "--disable-uoa" ]
+                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
+
+  preFixup = ''
+    for f in "$out/libexec/"*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
new file mode 100644
index 00000000000..5f3954f14f3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
@@ -0,0 +1,43 @@
+{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
+, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
+, telepathy_glib, evolution_data_server, libsecret, db }:
+
+# TODO: enable more folks backends
+
+let
+  majorVersion = "0.11";
+in
+stdenv.mkDerivation rec {
+  name = "folks-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
+    sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz";
+  };
+
+  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
+  # dbus_daemon needed for tests
+  buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
+                  vala libsecret libxml2 libsoup nspr nss intltool db ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  configureFlags = "--disable-fatal-warnings";
+
+  NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
+                        "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
+
+  enableParallelBuilding = true;
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Folks";
+
+    homepage = https://wiki.gnome.org/Projects/Folks;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
new file mode 100644
index 00000000000..47dae0486e9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3, glib, libxml2
+, intltool, polkit, orbit }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "3.2";
+  versionMinor = "6";
+  moduleName   = "GConf";
+
+  origName = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  name = "gconf-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
+    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
+  };
+
+  buildInputs = [ libxml2 polkit gnome3.gtk orbit ];
+  propagatedBuildInputs = [ glib dbus_glib  ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  # ToDo: ldap reported as not found but afterwards reported as supported
+
+  meta = with stdenv.lib; {
+    homepage = http://projects.gnome.org/gconf/;
+    description = "A system for storing application preferences";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
new file mode 100644
index 00000000000..b3acdee072d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
+, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
+, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "gcr-3.14.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gcr/3.14/${name}.tar.xz";
+    sha256 = "2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d";
+  };
+
+  buildInputs = [
+    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt
+    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
+  ];
+
+  #doCheck = true;
+
+  preFixup = ''
+    wrapProgram "$out/bin/gcr-viewer" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
new file mode 100644
index 00000000000..450914ce745
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
+, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gdm-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0qg2qxlfdvi1081r8bbid5hg7vqlpm91996ck2z7fq6kczy4hvdv";
+  };
+
+  # Only needed to make it build
+  preConfigure = ''
+    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
+    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
+    substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
+ '';
+
+  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
+                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
+  buildInputs = [ pkgconfig glib itstool libxml2 intltool
+                  accountsservice gnome3.dconf systemd
+                  gobjectIntrospection libX11 gtk
+                  libcanberra_gtk3 pam libtool ];
+
+  #enableParallelBuilding = true; # problems compiling
+
+  # Disable Access Control because our X does not support FamilyServerInterpreted yet
+  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GDM;
+    description = "A program that manages graphical display servers and handles graphical user logins";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
new file mode 100644
index 00000000000..7691a9e86f0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
@@ -0,0 +1,15 @@
+--- gdm-3.16.0/daemon/gdm-display.c.orig	2015-04-08 13:53:14.370274369 +0200
++++ gdm-3.16.0/daemon/gdm-display.c	2015-04-08 13:53:36.287520435 +0200
+@@ -1706,9 +1706,10 @@
+ 
+                 gdm_error_trap_push ();
+ 
+-                for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
++                /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
+                         XAddHost (self->priv->x11_display, &host_entries[i]);
+-                }
++                }*/
++                XDisableAccessControl(self->priv->x11_display);
+ 
+                 XSync (self->priv->x11_display, False);
+                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
new file mode 100644
index 00000000000..b8fbad4d731
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
@@ -0,0 +1,17 @@
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index f759d2d..d154716 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -373,9 +373,12 @@ get_system_session_dirs (void)
+ #ifdef ENABLE_WAYLAND_SUPPORT
+                 DATADIR "/wayland-sessions/",
+ #endif
++                NULL,
+                 NULL
+         };
+ 
++        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
++
+         return search_dirs;
+ }
+ 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
new file mode 100644
index 00000000000..b451d129391
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
@@ -0,0 +1,83 @@
+--- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
++++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
+@@ -322,7 +322,11 @@
+ fallback:
+ #endif
+ 
+-        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++        if (g_getenv("GDM_X_SERVER") != NULL) {
++            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
++        } else {
++            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++        }
+ }
+ 
+ static gboolean
+--- gdm-3.16.0/daemon/gdm-x-session.c.orig	2015-04-15 18:44:16.875743928 +0200
++++ gdm-3.16.0/daemon/gdm-x-session.c	2015-04-16 13:34:02.335708638 +0200
+@@ -207,6 +207,8 @@
+         char     *display_fd_string = NULL;
+         char     *vt_string = NULL;
+         char     *display_number;
++        int nixos_argc = 0;
++        char **nixos_argv = NULL;
+         gsize     display_number_size;
+ 
+         auth_file = prepare_auth_file ();
+@@ -236,7 +238,15 @@
+ 
+         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
+ 
+-        g_ptr_array_add (arguments, X_SERVER);
++        if (g_getenv("GDM_X_SERVER") != NULL) {
++                int i = 0;
++                g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
++                for (i = 0; i < nixos_argc; i++) {
++                        g_ptr_array_add (arguments, nixos_argv[i]);
++                }
++        } else {
++                g_ptr_array_add (arguments, X_SERVER);
++        }
+ 
+         if (vt_string != NULL) {
+                 g_ptr_array_add (arguments, vt_string);
+@@ -259,12 +269,12 @@
+         g_ptr_array_add (arguments, "-noreset");
+         g_ptr_array_add (arguments, "-keeptty");
+ 
+-        g_ptr_array_add (arguments, "-verbose");
++        /*g_ptr_array_add (arguments, "-verbose");
+         if (state->debug_enabled) {
+                 g_ptr_array_add (arguments, "7");
+         } else {
+                 g_ptr_array_add (arguments, "3");
+-        }
++        }*/
+ 
+         if (state->debug_enabled) {
+                 g_ptr_array_add (arguments, "-core");
+@@ -275,6 +285,9 @@
+                                                    (const char * const *) arguments->pdata,
+                                                    &error);
+         g_free (display_fd_string);
++        if (nixos_argv) {
++                 g_strfreev (nixos_argv);
++        }
+         g_clear_object (&launcher);
+         g_ptr_array_free (arguments, TRUE);
+ 
+--- gdm-3.16.0/daemon/gdm-session.c.orig	2015-04-16 14:19:01.392802683 +0200
++++ gdm-3.16.0/daemon/gdm-session.c	2015-04-16 14:20:36.012296764 +0200
+@@ -2359,6 +2359,12 @@
+         gchar *desktop_names;
+         const char *locale;
+ 
++        if (g_getenv ("GDM_X_SERVER") != NULL) {
++                gdm_session_set_environment_variable (self,
++                                                      "GDM_X_SERVER",
++                                                      g_getenv ("GDM_X_SERVER"));
++        }
++
+         gdm_session_set_environment_variable (self,
+                                               "GDMSESSION",
+                                               get_session_name (self));
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
new file mode 100644
index 00000000000..43a3d450ac7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
+, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gdm-3.14.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gdm/3.14/${name}.tar.xz";
+    sha256 = "0c2rvgcrf4s0nkxb19hf9pgh9c5pm6pginsq21dxj6hnjqabc3p2";
+  };
+
+  # Only needed to make it build
+  preConfigure = ''
+    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+  '';
+
+  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes"
+                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
+  buildInputs = [ pkgconfig glib itstool libxml2 intltool
+                  accountsservice gnome3.dconf systemd
+                  gobjectIntrospection libX11 gtk
+                  libcanberra_gtk3 pam libtool ];
+
+  #enableParallelBuilding = true; # problems compiling
+
+  preBuild = ''
+    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
+    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
+  '';
+
+  # Disable Access Control because our X does not support FamilyServerInterpreted yet
+  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GDM;
+    description = "A program that manages graphical display servers and handles graphical user logins";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
new file mode 100644
index 00000000000..e100e013b78
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
@@ -0,0 +1,13 @@
+--- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200
++++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200
+@@ -369,8 +369,9 @@
+                 gdm_error_trap_push ();
+ 
+                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
+-                        XAddHost (slave->priv->server_display, &host_entries[i]);
++                        //XAddHost (slave->priv->server_display, &host_entries[i]);
+                 }
++                XDisableAccessControl(slave->priv->server_display);
+ 
+                 XSync (slave->priv->server_display, False);
+                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
new file mode 100644
index 00000000000..b8fbad4d731
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
@@ -0,0 +1,17 @@
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index f759d2d..d154716 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -373,9 +373,12 @@ get_system_session_dirs (void)
+ #ifdef ENABLE_WAYLAND_SUPPORT
+                 DATADIR "/wayland-sessions/",
+ #endif
++                NULL,
+                 NULL
+         };
+ 
++        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
++
+         return search_dirs;
+ }
+ 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
new file mode 100644
index 00000000000..412daee9f27
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
@@ -0,0 +1,15 @@
+--- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
++++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
+@@ -322,7 +322,11 @@
+ fallback:
+ #endif
+ 
+-        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++        if (g_getenv("GDM_X_SERVER") != NULL) {
++            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
++        } else {
++            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
++        }
+ }
+ 
+ static gboolean
diff --git a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
new file mode 100644
index 00000000000..8c546394bd2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
@@ -0,0 +1,21 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
+
+
+stdenv.mkDerivation rec {
+  name = "geocode-glib-${gnome3.version}.0";
+
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/geocode-glib/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1cbfv0kds6b6k0cl7q47xpj3x1scwcd7m68zl1rf7i4hmhw4hpqj";
+  };
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig glib libsoup json_glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
new file mode 100644
index 00000000000..2bb4364a19e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
+
+let
+  majorVersion = "1.42";
+in
+stdenv.mkDerivation rec {
+  name = "gjs-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz";
+    sha256 = "0c9afb7d5be6ead5b68059596f08eb7c3902b1676ee9c8846aa8df09647dba13";
+  };
+
+  buildInputs = with gnome3;
+    [ gobjectIntrospection pkgconfig glib pango ];
+
+  propagatedBuildInputs = [ spidermonkey_24 ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
new file mode 100644
index 00000000000..d48e2341722
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-backgrounds-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0fx0pjz356v4w462i9a3z9r26khxqmj0zhp7wfl5scyq07fzkqvn";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
new file mode 100644
index 00000000000..ab8f380f672
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
+, udev, itstool, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-bluetooth-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
+    sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
+  };
+
+  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
+                               gsettings_desktop_schemas itstool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
+    description = "Application that let you manage Bluetooth in the GNOME destkop";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
new file mode 100644
index 00000000000..c2eb745a7e5
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libxml2
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-calculator-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-calculator/${gnome3.version}/${name}.tar.xz";
+    sha256 = "068mnwkxliwafcfk70cz85fqna76vjj7kgsm4yqs4c1fd72gphmv";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  libxml2 gnome3.gtksourceview mpfr gmp
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-calculator" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
+    description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
new file mode 100644
index 00000000000..b5c99849afe
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, which, gnome3, autoconf, automake }:
+
+let
+  majVer = "3.14";
+in stdenv.mkDerivation rec {
+  name = "gnome-common-${majVer}.0";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/gnome-common/${majVer}/${name}.tar.xz";
+    sha256 = "0b1676g4q44ah73c5gwl1kg88pc93pnq1pa9kwl43d0vg0pj802c";
+  };
+
+  patches = [(fetchurl {
+    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
+    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
+  })];
+
+  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
new file mode 100644
index 00000000000..0983fd26635
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, intltool, fetchurl, evolution_data_server, db
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
+, libchamplain, clutter_gtk, geocode_glib
+, bash, makeWrapper, itstool, folks, libnotify, libxml2
+, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
+, libsoup, vala, dbus_glib, automake115x, autoconf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-contacts-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-contacts/${gnome3.version}/${name}.tar.xz";
+    sha256 = "09syi67ijdx9dhsx9c740mf3fhs6z3kaijdr3fyj8gd80h7a3hym";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
+
+  # force build from vala
+  preBuild = ''
+   touch src/*.vala
+  '';
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
+                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
+                  folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
+                  libxml2 libsoup gnome3.gnome_online_accounts nspr nss
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  libchamplain clutter_gtk geocode_glib
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  vala automake115x autoconf db ];
+
+  preFixup = ''
+    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  patches = [ ./gio_unix.patch ];
+
+  patchFlags = "-p0";
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Contacts;
+    description = "Contacts is GNOME's integrated address book";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
new file mode 100644
index 00000000000..f1b3d3c94ac
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig	2015-04-09 18:45:50.581232289 +0200
++++ configure.ac	2015-04-09 18:45:59.744280137 +0200
+@@ -54,6 +54,7 @@
+ 	     champlain-0.12
+ 	     clutter-gtk-1.0
+ 	     geocode-glib-1.0 >= 3.15.3
++	     gio-unix-2.0
+ 	     "
+ PKG_CHECK_MODULES(CONTACTS, [$pkg_modules])
+ 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
new file mode 100644
index 00000000000..f442bd88973
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -0,0 +1,60 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
+, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig
+, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
+, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
+, cracklib, python, krb5, networkmanagerapplet, networkmanager
+, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
+, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
+
+# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
+# TODO: bluetooth, wacom, printers
+
+stdenv.mkDerivation rec {
+  name = "gnome-control-center-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-control-center/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07vvmnqjjcc0cblpr6cdmg3693hihpjrq3q30mm3q68pdyfzbjgf";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = with gnome3;
+    [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
+      libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
+      gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
+      accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
+      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
+      gdk_pixbuf gnome3.adwaita-icon-theme librsvg clutter clutter_gtk
+      hicolor_icon_theme gnome3.adwaita-icon-theme gnome3.vino udev
+      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
+
+  preBuild = ''
+    substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
+    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
+
+    # hack to make test-endianess happy
+    mkdir -p $out/share/locale
+    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
+  '';
+
+  patches = [ ./vpn_plugins_path.patch ];
+
+  preFixup = with gnome3; ''
+    wrapProgram $out/bin/gnome-control-center \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    for i in $out/share/applications/*; do
+      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Single sign-on framework for GNOME";
+    maintainers = with maintainers; [ lethalman ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
new file mode 100644
index 00000000000..e25105a303f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
@@ -0,0 +1,19 @@
+diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
+index 7dc23c2..fcb1384 100644
+--- a/panels/network/connection-editor/vpn-helpers.c
++++ b/panels/network/connection-editor/vpn-helpers.c
+@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
+ 		if (!so_path)
+ 			goto next;
+ 
+-		/* Remove any path and extension components, then reconstruct path
+-		 * to the SO in LIBDIR
+-		 */
+-		so_name = g_path_get_basename (so_path);
+-		g_free (so_path);
+-		so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
+-		g_free (so_name);
+-
+ 		module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+ 		if (!module) {
+ 			g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
new file mode 100644
index 00000000000..fc721f93648
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
+, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
+, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+
+  majorVersion = gnome3.version;
+  minorVersion = "1";
+  name = "gnome-desktop-${majorVersion}.${minorVersion}";
+
+  # this should probably be setuphook for glib
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
+    sha256 = "0v7md6csbnv55j4kns2q0zjl4040zwf3ld6lc3qvik40fkzzbrjb";
+  };
+
+  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
+                  xkeyboard_config isocodes itstool wayland
+                  gtk3 glib intltool gnome_doc_utils libxkbfile
+                  gnome3.gsettings_desktop_schemas gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
new file mode 100644
index 00000000000..a99ddbc9eb4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-dictionary-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-dictionary/${gnome3.version}/${name}.tar.xz";
+    sha256 = "17ha4pmnh9v98hxqy4pr3ri9wsck9njfjwd8qa0gycksmbyd1cag";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-dictionary" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Dictionary;
+    description = "Dictionary is the GNOME application to look up definitions";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
new file mode 100644
index 00000000000..54034798a49
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
+, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
+, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-disk-utility-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.version}/${name}.tar.xz";
+    sha256 = "14h92bznizq0k4qz7hn41axhhfjyw2ncnmbkf8kldi9x909fvpml";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  libxslt libtool libsecret libpwquality cracklib
+                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
+                  gdk_pixbuf gnome3.adwaita-icon-theme
+                  librsvg udisks2 gnome3.gnome_settings_daemon
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-disks" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
+    description = "A udisks graphical front-end";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
new file mode 100644
index 00000000000..60492c52164
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool
+, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-font-viewer-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0dnkpg1d71dbzazi5chg3vj8bbia2w6k0ji4vh2f4s0b9rvybgzc";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-font-viewer" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Program that can preview fonts and create thumbnails for fonts";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
new file mode 100644
index 00000000000..aacc62a30a9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
+, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
+, docbook_xsl_ns, docbook_xsl, gnome3 }:
+
+let
+  majVer = gnome3.version;
+in stdenv.mkDerivation rec {
+  name = "gnome-keyring-${majVer}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-keyring/${majVer}/${name}.tar.xz";
+    sha256 = "1xg1xha3x3hzlmvdq2zm90hc61pj7pnf9yxxvgq4ynl5af6bp8qm";
+  };
+
+  buildInputs = with gnome3; [
+    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
+    pango gcr gdk_pixbuf atk p11_kit makeWrapper
+  ];
+
+  propagatedBuildInputs = [ glib libtasn1 libxslt ];
+
+  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
+
+  configureFlags = [
+    "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
+    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
+    "--with-pkcs11-modules=$$out/lib/pkcs11/"
+  ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-keyring" \
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+    wrapProgram "$out/bin/gnome-keyring-daemon" \
+      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
new file mode 100644
index 00000000000..37d2ea1c086
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-menus-${version}";
+  version = "3.10.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
+    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
+  };
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  preBuild = "patchShebangs ./scripts";
+
+  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
+
+  meta = {
+    homepage = "http://www.gnome.org";
+    description = "Gnome menu specification";
+
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
new file mode 100644
index 00000000000..8e0c1709642
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
+, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
+, telepathy_glib, intltool, dbus_libs, icu, autoreconfHook
+, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
+}:
+
+stdenv.mkDerivation rec {
+  name = "gnome-online-accounts-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+
+  enableParallelBuilding = true;
+
+  preAutoreconf = ''
+    sed '/disable-settings/d' -i configure.ac
+    sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am
+  '';
+
+  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
+                  libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook
+                  docbook_xsl_ns docbook_xsl ];
+
+  preFixup = ''
+    for f in "$out/libexec/"*; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
new file mode 100644
index 00000000000..a44d31e9ccb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
+, libsoup, json_glib, gmp, openssl, makeWrapper }:
+
+let
+  majVer = "3.14";
+in stdenv.mkDerivation rec {
+  name = "gnome-online-miners-${majVer}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-online-miners/${majVer}/${name}.tar.xz";
+    sha256 = "0bbak8srcrvnw18s4ls5mqaamx9nqdi93lij6yjs0a3q320k22xl";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
+                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
+                  gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
+                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    for f in $out/libexec/*; do
+      wrapProgram "$f" \
+        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
+    description = "A set of crawlers that go through your online content and index them locally in Tracker";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
new file mode 100644
index 00000000000..d571c90f898
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-screenshot-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-screenshot/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0hjbay906xk31rbjmm1ihrhnysh9hf4xgxlkvxj2jlnypx4hvdrv";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-screenshot" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
+    description = "Utility used in the GNOME desktop environment for taking screenshots";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
new file mode 100644
index 00000000000..63fea43baed
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
@@ -0,0 +1,31 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
+, libxslt, intltool, makeWrapper, systemd, xorg }:
+
+
+stdenv.mkDerivation rec {
+  name = "gnome-session-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-session/${gnome3.version}/${name}.tar.xz";
+    sha256 = "17d9zryq13ajmai6fqynpfgghms52sj9h756f086i7fxbr2nsm4v";
+  };
+
+  configureFlags = "--enable-systemd";
+
+  buildInputs = with gnome3;
+    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
+      gnome3.gnome_settings_daemon xorg.xtrans
+      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-session" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
new file mode 100644
index 00000000000..e4d2d80e9f4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
+, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
+, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager
+, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-settings-daemon-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1l61h497v57g3iqfmyzjh15z4c4akky3xziymphswzigb1ssv3da";
+  };
+
+  # fatal error: gio/gunixfdlist.h: No such file or directory
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
+
+  buildInputs = with gnome3;
+    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
+      libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio
+      libcanberra_gtk3 upower colord libgweather xkeyboard_config
+      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
+      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
+
+  preFixup = ''
+    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix PATH : "${glib}/bin" \
+      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
new file mode 100644
index 00000000000..abb7b882a2b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, intltool, fetchurl, libgtop
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool
+, gnome3, file }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-extensions-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0hd7jskwhrki0s9lmx6vc6rw9y689zp2h7zhlxk90hghy4nkvkc8";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
+                  makeWrapper file ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
+    description = "Modify and extend GNOME Shell functionality and behavior";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
new file mode 100644
index 00000000000..f7e3efd1dd9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
@@ -0,0 +1,61 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
+, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
+, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
+, hicolor_icon_theme, sqlite, libgweather
+, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
+
+# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
+
+stdenv.mkDerivation rec {
+  name = "gnome-shell-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-shell/${gnome3.version}/${name}.tar.xz";
+    sha256 = "00gjdfaznpnspb4jmjc19axiz6snd9drvqmzpq4sw0xh1ysgpncv";
+  };
+
+  # Needed to find /etc/NetworkManager/VPN
+  configureFlags = [ "--sysconfdir=/etc" ];
+
+  buildInputs = with gnome3;
+    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
+      libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
+      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
+      libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
+      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
+      hicolor_icon_theme adwaita-icon-theme sqlite gnome3.gnome-bluetooth
+      libgweather # not declared at build time, but typelib is needed at runtime
+      gnome3.gnome-clocks # schemas needed
+      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
+
+  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
+
+  preBuild = ''
+    patchShebangs src/data-to-c.pl
+    substituteInPlace data/Makefile --replace " install-keysDATA" ""
+  '';
+
+  preFixup = with gnome3; ''
+    wrapProgram "$out/bin/gnome-shell" \
+      --prefix PATH : "${unzip}/bin" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
+      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+    echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
+  '';
+
+  passthru = {
+    mozillaPlugin = "/lib/mozilla/plugins";
+  };
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
new file mode 100644
index 00000000000..f0f2f829a33
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, intltool, fetchurl, pkgconfig
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-system-log-3.9.90";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
+    sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                            hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
+                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-system-log" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
+    description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
new file mode 100644
index 00000000000..e1f4944f86c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
+, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-system-monitor-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.version}/${name}.tar.xz";
+    sha256 = "14akcz4dwjnfx47gncyavjr82zc78a912v5gdp6h3z19bn5nx4q0";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
+                  gtkmm3 libgtop makeWrapper
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-system-monitor" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
+    description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
new file mode 100644
index 00000000000..4a07dbee129
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
+, gnome_doc_utils, intltool, libX11, which, libuuid, vala
+, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = gnome3.version;
+  versionMinor = "1";
+
+  name = "gnome-terminal-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
+    sha256 = "0nxlsz9hwajqfrblvqzc09599dra3van2znmcknnhjcfv3slvkkx";
+  };
+
+  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
+                  gnome3.dconf itstool makeWrapper gnome3.nautilus vala ];
+
+  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
+
+  # FIXME: enable for gnome3
+  configureFlags = [ "--disable-search-provider" "--disable-migration" ];
+
+  preFixup = ''
+    for f in "$out/libexec/gnome-terminal-server"; do
+      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
new file mode 100644
index 00000000000..6e98b9817c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-themes-standard-${gnome3.version}.0";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0kyrbfrgl6g6wm6zpllldz36fclvl8vwmn1snwk18kf7f6ncpsac";
+  };
+  
+  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
new file mode 100644
index 00000000000..969459aad31
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-user-docs-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-user-docs/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0cck9hnp9az6qan97cv2d5lxlnzfss38h73g1a6dbspl4bnghy4n";
+  };
+
+  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
+    description = "User and system administration help for the GNOME desktop";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.cc-by-30;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
new file mode 100644
index 00000000000..2f158be4e0d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
@@ -0,0 +1,53 @@
+{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
+, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
+, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
+
+let
+  majVer = "3.14";
+in stdenv.mkDerivation rec {
+  name = "gnome-user-share-${majVer}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-user-share/${majVer}/${name}.tar.xz";
+    sha256 = "1s9fjzr161hy53i9ibk6aamc9af0cg8s151zj2fb6fxg67pv61bb";
+  };
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  preConfigure = ''
+    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
+  '';
+
+  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
+                     "--with-modules-path=${apacheHttpd_2_2}/modules"
+                     "--disable-bluetooth"
+                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
+                  makeWrapper file gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  nautilus libnotify libcanberra_gtk3 ];
+
+  postInstall = ''
+    mkdir -p $out/share/gsettings-schemas/$name
+    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
+    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/libexec/gnome-user-share" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
+    description = "Service that exports the contents of the Public folder in your home directory on the local network";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
new file mode 100644
index 00000000000..9076d5c5839
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
+, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
+, gmime, json_glib, avahi, tracker, itstool }:
+
+stdenv.mkDerivation rec {
+  name = "grilo-plugins-0.2.13";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
+    sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
+  };
+
+  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
+
+  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
+                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
+                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
+                  avahi gnome3.libmediaart tracker intltool itstool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+    description = "A collection of plugins for the Grilo framework";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
new file mode 100644
index 00000000000..a9be29f2b0e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib
+, libxml2, gnome3, gobjectIntrospection, libsoup }:
+
+stdenv.mkDerivation rec {
+  name = "grilo-0.2.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
+    sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m";
+  };
+
+  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
+
+  preConfigure = ''
+    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
+       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
+       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
+    done
+  '';
+
+  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
+                  gnome3.totem-pl-parser gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
+    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
new file mode 100644
index 00000000000..a13b17fe5e0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
+  # just for passthru
+, gnome3, gtk3, gsettings_desktop_schemas }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = gnome3.version;
+  versionMinor = "1";
+  moduleName   = "gsettings-desktop-schemas";
+
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "0q9l9fr90pcb3s6crbxkj3wiwn7wp9zfpv7bdxkadj0hspd9zzkl";
+  };
+
+  buildInputs = [ glib gobjectIntrospection ];
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
new file mode 100644
index 00000000000..a9dbbb61316
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool }:
+
+let
+  majVer = "1.0";
+in stdenv.mkDerivation rec {
+  name = "gsound-${majVer}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz";
+    sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
+  };
+
+  buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/GSound;
+    description = "Small library for playing system sounds";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
new file mode 100644
index 00000000000..0de89bc5dd6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
+, libxml2Python, perl, intltool, gettext, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "gtksourceview-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtksourceview/${gnome3.version}/${name}.tar.xz";
+    sha256 = "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6";
+  };
+
+  propagatedBuildInputs = [ gtk3 ];
+
+  buildInputs = [ pkgconfig atk cairo glib pango
+                  libxml2Python perl intltool gettext ];
+
+  preBuild = ''
+    substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
+  ''; 
+
+  patches = [ ./nix_share_path.patch ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
new file mode 100644
index 00000000000..c87350167c2
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
@@ -0,0 +1,11 @@
+--- a/gtksourceview/gtksourceview-utils.c	2014-07-13 16:13:57.418687726 +0200
++++ b/gtksourceview/gtksourceview-utils.c	2014-07-13 16:14:20.550847767 +0200
+@@ -68,6 +68,8 @@
+ 							 basename,
+ 							 NULL));
+ 
++        g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
++
+ 	g_ptr_array_add (dirs, NULL);
+ 
+ 	return (gchar**) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
new file mode 100644
index 00000000000..454196df7a6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, intltool, fetchurl, pkgconfig, gtk3
+, glib, desktop_file_utils, bash, appdata-tools
+, makeWrapper, gnome3, file, itstool, libxml2 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.adwaita-icon-theme 
+
+stdenv.mkDerivation rec {
+  name = "gucharmap-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gucharmap/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1l26prbi5dmzxs62fz3vrhsif9jwqw4065qxp8hnc8bv34h59phw";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools
+                  gnome3.yelp_tools libxml2 file desktop_file_utils
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gucharmap" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Gucharmap;
+    description = "GNOME Character Map, based on the Unicode Character Database";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
new file mode 100644
index 00000000000..1875c1491f9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
+
+stdenv.mkDerivation rec {
+  name = "libcroco-0.6.8";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
+    sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
+  };
+
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+
+  buildInputs = [ pkgconfig libxml2 glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
new file mode 100644
index 00000000000..bedbbee2dfe
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib
+, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
+
+let
+  majorVersion = "0.16";
+in
+stdenv.mkDerivation rec {
+  name = "libgdata-${majorVersion}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
+    sha256 = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827";
+  };
+
+  # TODO: need libuhttpmock
+  configureFlags = "--disable-tests";
+  
+  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
+
+  buildInputs = with gnome3;
+    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection 
+      liboauth gcr gnome_online_accounts p11_kit openssl ];
+
+  propagatedBuildInputs = [ json_glib ];
+      
+  meta = with stdenv.lib; {
+    description = "GData API library";
+    maintainers = with maintainers; [ raskin lethalman ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21Plus;
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
new file mode 100644
index 00000000000..82536735b39
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
+let
+  ver_maj = "0.16";
+  ver_min = "1";
+in
+stdenv.mkDerivation rec {
+  name = "libgee-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
+    sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5";
+  };
+
+  doCheck = true;
+
+  patches = [ ./fix_introspection_paths.patch ];
+
+  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
new file mode 100644
index 00000000000..67003f45164
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
@@ -0,0 +1,13 @@
+--- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
++++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
+@@ -12085,8 +12085,8 @@
+        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
++       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
new file mode 100644
index 00000000000..c6c9323c010
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "libgnome-keyring-3.12.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
+    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
+  };
+
+  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = {
+    description = "Framework for managing passwords and other secrets";
+    homepage = http://live.gnome.org/GnomeKeyring;
+    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    inherit (glib.meta) platforms maintainers;
+
+    longDescription = ''
+      gnome-keyring is a program that keeps password and other secrets for
+      users. The library libgnome-keyring is used by applications to integrate
+      with the gnome-keyring system.
+    '';
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
new file mode 100644
index 00000000000..1156474e5a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "libgnomekbd-3.6.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
+    sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
+  };
+
+  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
+
+  preFixup = ''
+    wrapProgram $out/bin/gkbd-keyboard-display \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Keyboard management library";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
new file mode 100644
index 00000000000..571fc73e039
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
+, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "libgweather-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgweather/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1zadscn3i86fy7xpqiyw14pvz4f5cdw50ir77wd0zfr72hk5a2fv";
+  };
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
+  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
new file mode 100644
index 00000000000..72d307f4f1a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
+, openssl, bzip2, acl, attr
+}:
+
+stdenv.mkDerivation rec {
+  name = "libgxps-0.2.2";
+
+  src = fetchurl {
+    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
+    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
+  };
+
+  buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
+
+  configureFlags = "--without-liblcms2";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
new file mode 100644
index 00000000000..e59d81f3c1d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, intltool
+, glib, gtk3, gobjectIntrospection, python, pygobject3
+}:
+
+let
+  majorVersion = "1.12";
+in
+stdenv.mkDerivation rec {
+  name = "libpeas-${version}";
+  version = "${majorVersion}.1";
+
+  buildInputs =  [
+   intltool pkgconfig
+   glib gtk3 gobjectIntrospection python pygobject3
+  ];
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libpeas/${majorVersion}/${name}.tar.xz";
+    sha256 = "e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6";
+  };
+
+  preFixup = ''
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A GObject-based plugins engine";
+    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
new file mode 100644
index 00000000000..5a8117528b6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
+
+stdenv.mkDerivation rec {
+  name = "libzapojit-0.0.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
+    sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
+  };
+
+  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
new file mode 100644
index 00000000000..3df5d9f55d9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
@@ -0,0 +1,35 @@
+{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
+, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
+, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }:
+
+
+stdenv.mkDerivation rec {
+  name = "mutter-${gnome3.version}.1.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz";
+    sha256 = "07059jmwhc7zf2gww2xw94hhy4csjj2v30ivyzllbas2nvv88l3r";
+  };
+
+  # fatal error: gio/gunixfdlist.h: No such file or directory
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 
+
+  buildInputs = with gnome3;
+    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
+      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
+      gnome3.geocode_glib
+      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/mutter" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
new file mode 100644
index 00000000000..6d004ceb2a3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
+, gtk, gnome3, libunique, intltool, gobjectIntrospection
+, libnotify, makeWrapper, exempi, librsvg, tracker }:
+
+stdenv.mkDerivation rec {
+  name = "nautilus-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/nautilus/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0y83adhfaq4ns01rdkqmrvdwj0ch2pb10hl43as98kqqzm0qxs3y";
+  };
+
+  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
+                  gnome3.gnome_desktop gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/nautilus" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  patches = [ ./extension_dir.patch ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
new file mode 100644
index 00000000000..317b8257992
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
@@ -0,0 +1,24 @@
+diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
+index 6273a76..4adcc8a 100644
+--- a/libnautilus-private/nautilus-module.c
++++ b/libnautilus-private/nautilus-module.c
+@@ -242,11 +242,17 @@ void
+ nautilus_module_setup (void)
+ {
+ 	static gboolean initialized = FALSE;
++	const gchar* extensiondir = NULL;
+ 
+ 	if (!initialized) {
+ 		initialized = TRUE;
+-		
+-		load_module_dir (NAUTILUS_EXTENSIONDIR);
++	
++		extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
++		if (extensiondir == NULL) {
++			extensiondir = NAUTILUS_EXTENSIONDIR;
++		}
++	
++		load_module_dir (extensiondir);
+ 
+ 		eel_debug_call_at_shutdown (free_module_objects);
+ 	}
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
new file mode 100644
index 00000000000..d1bfee5c14a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "rest-0.7.92";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
+    sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec";
+  };
+
+  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
+
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
new file mode 100644
index 00000000000..9105dd8e736
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
+, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
+, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
+, gdk_pixbuf, librsvg, hicolor_icon_theme, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "sushi-3.12.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz";
+    sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff";
+  };
+
+  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
+
+  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
+                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg
+                  gnome3.adwaita-icon-theme hicolor_icon_theme 
+                  libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ];
+
+  enableParallelBuilding = true;
+
+  preFixup = ''
+    wrapProgram $out/libexec/sushi-start \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
+    description = "A quick previewer for Nautilus";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
new file mode 100644
index 00000000000..f1b3bfe53c1
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }:
+
+stdenv.mkDerivation rec {
+  name = "totem-pl-parser-3.10.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
+    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
+  };
+
+  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Videos;
+    description = "Simple GObject-based library to parse and save a host of playlist formats";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
new file mode 100644
index 00000000000..511a37e09a0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, intltool, fetchurl, gst_all_1
+, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, libxml2, dbus_glib
+, gnome3, librsvg, gdk_pixbuf, file }:
+
+stdenv.mkDerivation rec {
+  name = "totem-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/totem/${gnome3.version}/${name}.tar.xz";
+    sha256 = "1qv6s7c06r6kdrd3jjqk8h79y8a7h8pjcx02rzp869jr7d9hkcb9";
+  };
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
+                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
+                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
+                  gnome3.libpeas pygobject3 shared_mime_info dbus_glib
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gnome_desktop
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas makeWrapper file ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/totem" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Videos;
+    description = "Movie player for the GNOME desktop based on GStreamer";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
new file mode 100644
index 00000000000..2b11c22c5f3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, intltool, fetchurl, libxml2, upower
+, pkgconfig, gtk3, glib, hicolor_icon_theme
+, bash, makeWrapper, itstool, vala, sqlite, libxslt
+, gnome3, librsvg, gdk_pixbuf, file, libnotify
+, evolution_data_server, gst_all_1, poppler
+, icu, taglib, libjpeg, libtiff, giflib, libcue
+, libvorbis, flac, exempi, networkmanager
+, libpng, libexif, libgsf, libuuid, bzip2 }:
+
+let
+  majorVersion = "1.4";
+in
+stdenv.mkDerivation rec {
+  name = "tracker-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz";
+    sha256 = "1ssisbix7ib3d6bgx9s675gx6ayy68jq2srhpzv038mkbaskaz68";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler";
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
+                  bzip2 gnome3.totem-pl-parser libxslt
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg sqlite
+                  upower libnotify evolution_data_server gnome3.libgee
+                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
+                  poppler icu taglib libjpeg libtiff giflib libvorbis
+                  exempi networkmanager libpng libexif libgsf libuuid
+                  hicolor_icon_theme gnome3.adwaita-icon-theme ];
+
+  preConfigure = ''
+    substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
+  '';
+
+  preFixup = ''
+    for f in $out/bin/* $out/libexec/*; do
+      wrapProgram $f \
+        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/Tracker;
+    description = "Desktop-neutral user information store, search tool and indexer";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
new file mode 100644
index 00000000000..c4082095918
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
+, hicolor_icon_theme, gnome3
+, libnotify, file, telepathy_glib, dbus_glib }:
+
+stdenv.mkDerivation rec {
+  name = "vino-${versionMajor}.${versionMinor}";
+  versionMajor = gnome3.version;
+  versionMinor = "0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
+    sha256 = "1icdc2y78xfg7czfiz05y9vsxkzzgrc0dpsrcxb41bg0sh9kd3b0";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  dbus_glib telepathy_glib file makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/libexec/vino-server" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
+    description = "GNOME desktop sharing server";
+    maintainers = with maintainers; [ lethalman iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
index 548ca347a45..82252224906 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vte/0.38.0.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2
-, selectTextPatch ? false }:
+, gnutls, selectTextPatch ? false }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "0.38";
+  versionMajor = "0.40";
   versionMinor = "0";
   moduleName   = "vte";
 
@@ -10,12 +10,15 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "1llg2xnjpn630vd86ci8csbjjacj3ia6syck2bsq4kinr66z5zsw";
+    sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal";
   };
 
   patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.38.0.patch;
 
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses vala libxml2 ];
+  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib 
+                  gnome3.gtk3 ncurses vala libxml2 ];
+
+  propagatedBuildInputs = [ gnutls ];
 
   preConfigure = "patchShebangs .";
 
diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.0.38.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch
index 0a9b82a8598..0a9b82a8598 100644
--- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.0.38.0.patch
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.38.0.patch
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
new file mode 100644
index 00000000000..adf01c6df84
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
+
+let
+  majVer = gnome3.version;
+in stdenv.mkDerivation rec {
+  name = "yelp-tools-${majVer}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/yelp-tools/${majVer}/${name}.tar.xz";
+    sha256 = "177qzvj5w019isdp41qxqcys2kc4sq2x6dqhqn6l9ipib8a6rxml";
+  };
+
+  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
+    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
+    maintainers = with maintainers; [ iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
new file mode 100644
index 00000000000..3ade5f355d4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, bash
+, itstool, libxml2, libxslt, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-xsl-${gnome3.version}.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/yelp-xsl/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0jhpni4mmfvj3xf57rjm61nc8d0x66hz9gd1ywws5lh39g6fx59j";
+  };
+
+  doCheck = true;
+
+  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp;
+    description = "Yelp's universal stylesheets for Mallard and DocBook";
+    maintainers = with maintainers; [ lethalman ];
+    license = [licenses.gpl2 licenses.lgpl2];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
new file mode 100644
index 00000000000..413042d752c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
+, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
+, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
+
+stdenv.mkDerivation rec {
+  name = "yelp-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/yelp/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0az2f1g8gz341i93zxnm6sabrqx416a348ylwfr8vzlg592am2r3";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
+
+  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
+                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
+                  librsvg gdk_pixbuf gnome3.adwaita-icon-theme
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/yelp" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Yelp;
+    description = "The help viewer in Gnome";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
new file mode 100644
index 00000000000..72e8ee6a593
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
+, gnome_doc_utils, intltool, libX11, which, itstool }:
+
+stdenv.mkDerivation rec {
+
+  versionMajor = "3.14";
+  versionMinor = "0";
+
+  name = "zenity-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
+    sha256 = "0bw95d6ns67h0mw90qcbhxvhbglbpgd66vinvha7gwba8mnfqmvb";
+  };
+
+  buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
+
+  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+	maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
new file mode 100644
index 00000000000..937d73b9421
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/default.nix
@@ -0,0 +1,316 @@
+{ callPackage, pkgs, self }:
+
+rec {
+  corePackages = with gnome3; [
+    pkgs.desktop_file_utils pkgs.ibus
+    pkgs.shared_mime_info # for update-mime-database
+    gtk3 # for gtk-update-icon-cache
+    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
+    gnome-menus gnome_settings_daemon gnome_shell
+    gnome_themes_standard defaultIconTheme
+  ];
+
+  optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
+    gucharmap nautilus totem vino yelp gnome-bluetooth
+    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
+    gnome-shell-extensions gnome-system-log gnome-system-monitor
+    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
+    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
+    nautilus-sendto dconf-editor
+  ];
+
+  inherit (pkgs) libsoup glib gtk2;
+  inherit (pkgs.gnome2) ORBit2;
+  gtk3 = pkgs.gtk3_16;
+  gtkmm3 = pkgs.gtkmm3_16;
+  orbit = ORBit2;
+  gnome3 = self // { recurseForDerivations = false; };
+  clutter = pkgs.clutter_1_22;
+  clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; };
+  clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter; };
+  cogl = pkgs.cogl_1_20;
+  gtk = gtk3;
+  gtkmm = gtkmm3;
+  vala = pkgs.vala_0_26;
+  gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
+
+  # Due to gtk 3.12 -> 3.16 transition
+  libcanberra_gtk3 = pkgs.libcanberra_gtk3.override { inherit gtk; }; 
+  libcanberra = libcanberra_gtk3;
+  ibus = pkgs.ibus.override { inherit gnome3; };
+  colord-gtk = pkgs.colord-gtk.override { inherit gtk3; };
+  webkitgtk24x = pkgs.webkitgtk24x.override { inherit gtk3; };
+  webkitgtk = pkgs.webkitgtk.override { inherit gtk3; };
+  libwnck3 = pkgs.libwnck3.override { inherit gtk3; };
+  gtkspell3 = pkgs.gtkspell3.override { inherit gtk3; };
+  librsvg = pkgs.librsvg.override { inherit gtk3; };
+  iconnamingutils = pkgs.iconnamingutils.override { inherit librsvg; };
+  libchamplain = pkgs.libchamplain.override { inherit gtk3 clutter_gtk; };
+  djvulibre = pkgs.djvulibre.override { inherit librsvg; };
+
+  version = "3.16";
+
+# Simplify the nixos module and gnome packages
+  defaultIconTheme = adwaita-icon-theme;
+
+# Backward compatibility, must be removed in favor of defaultIconTheme
+  gnome_icon_theme = adwaita-icon-theme;
+  gnome_icon_theme_symbolic = adwaita-icon-theme;
+
+#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
+
+  adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };
+
+  baobab = callPackage ./core/baobab { };
+
+  caribou = callPackage ./core/caribou { };
+
+  dconf = callPackage ./core/dconf { };
+  dconf-editor = callPackage ./core/dconf-editor { };
+
+  empathy = callPackage ./core/empathy { 
+    webkitgtk = webkitgtk24x;
+    clutter-gst = pkgs.clutter-gst;
+  };
+
+  epiphany = callPackage ./core/epiphany { };
+
+  evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
+
+  evolution_data_server = callPackage ./core/evolution-data-server { };
+
+  gconf = callPackage ./core/gconf { };
+
+  geocode_glib = callPackage ./core/geocode-glib { };
+
+  gcr = callPackage ./core/gcr { }; # ToDo: tests fail
+
+  gdm = callPackage ./core/gdm { };
+
+  gjs = callPackage ./core/gjs { };
+
+  glib_networking = pkgs.glib_networking.override {
+    inherit gsettings_desktop_schemas;
+  };
+
+  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
+
+  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
+
+  gnome-contacts = callPackage ./core/gnome-contacts { };
+
+  gnome_control_center = callPackage ./core/gnome-control-center { };
+
+  gnome-calculator = callPackage ./core/gnome-calculator { };
+
+  gnome_common = callPackage ./core/gnome-common { };
+
+  gnome_desktop = callPackage ./core/gnome-desktop { };
+
+  gnome-dictionary = callPackage ./core/gnome-dictionary { };
+
+  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
+
+  gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
+
+  gnome-menus = callPackage ./core/gnome-menus { };
+
+  gnome_keyring = callPackage ./core/gnome-keyring { };
+
+  libgnome_keyring = callPackage ./core/libgnome-keyring { };
+
+  libgnomekbd = callPackage ./core/libgnomekbd { };
+
+  folks = callPackage ./core/folks { };
+
+  gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
+
+  gnome-online-miners = callPackage ./core/gnome-online-miners { };
+
+  gnome_session = callPackage ./core/gnome-session { };
+
+  gnome_shell = callPackage ./core/gnome-shell { };
+
+  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
+
+  gnome-screenshot = callPackage ./core/gnome-screenshot { };
+
+  gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
+
+  gnome-system-log = callPackage ./core/gnome-system-log { };
+
+  gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
+
+  gnome_terminal = callPackage ./core/gnome-terminal { };
+
+  gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
+
+  gnome-user-docs = callPackage ./core/gnome-user-docs { };
+
+  gnome-user-share = callPackage ./core/gnome-user-share { };
+
+  grilo = callPackage ./core/grilo { };
+
+  grilo-plugins = callPackage ./core/grilo-plugins { };
+
+  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
+
+  gsound = callPackage ./core/gsound { };
+
+  gtksourceview = callPackage ./core/gtksourceview { };
+
+  gucharmap = callPackage ./core/gucharmap { };
+
+  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
+
+  eog = callPackage ./core/eog { };
+
+  libcroco = callPackage ./core/libcroco {};
+
+  libgee = callPackage ./core/libgee { };
+
+  libgdata = callPackage ./core/libgdata { };
+
+  libgxps = callPackage ./core/libgxps { };
+
+  libpeas = callPackage ./core/libpeas {};
+
+  libgweather = callPackage ./core/libgweather { };
+
+  libzapojit = callPackage ./core/libzapojit { };
+
+  mutter = callPackage ./core/mutter { };
+
+  nautilus = callPackage ./core/nautilus { };
+
+  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
+    inherit gnome3;
+  };
+
+  networkmanager_pptp = pkgs.networkmanager_pptp.override {
+    inherit gnome3;
+  };
+
+  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
+    inherit gnome3;
+  };
+
+  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
+    inherit gnome3;
+  };
+
+  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
+    inherit gnome3;
+  };
+
+  networkmanagerapplet = pkgs.networkmanagerapplet.override {
+    inherit gnome3 gsettings_desktop_schemas glib_networking;
+  };
+
+  rest = callPackage ./core/rest { };
+
+  sushi = callPackage ./core/sushi {
+    webkitgtk = webkitgtk24x;
+    clutter-gst = pkgs.clutter-gst;
+  };
+
+  totem = callPackage ./core/totem { };
+
+  totem-pl-parser = callPackage ./core/totem-pl-parser { };
+
+  tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
+
+  vte = callPackage ./core/vte { };
+
+  vte-select-text = vte.override { selectTextPatch = true; };
+
+  vino = callPackage ./core/vino { };
+
+  yelp = callPackage ./core/yelp { 
+    webkitgtk = webkitgtk24x;
+  };
+
+  yelp_xsl = callPackage ./core/yelp-xsl { };
+
+  yelp_tools = callPackage ./core/yelp-tools { };
+
+  zenity = callPackage ./core/zenity { };
+
+
+#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
+
+  bijiben = callPackage ./apps/bijiben {
+    webkitgtk = webkitgtk24x;
+  };
+
+  evolution = callPackage ./apps/evolution {
+    webkitgtk = webkitgtk24x;
+  };
+
+  file-roller = callPackage ./apps/file-roller { };
+
+  gedit = callPackage ./apps/gedit { };
+
+  glade = callPackage ./apps/glade { };
+
+  gnome-boxes = callPackage ./apps/gnome-boxes {
+    gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
+    spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
+  };
+
+  gnome-clocks = callPackage ./apps/gnome-clocks { };
+
+  gnome-documents = callPackage ./apps/gnome-documents { };
+
+  gnome-music = callPackage ./apps/gnome-music { };
+
+  gnome-photos = callPackage ./apps/gnome-photos {
+    gegl = gegl_0_3;
+  };
+
+  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
+
+  # scrollkeeper replacement
+  rarian = callPackage ./desktop/rarian { };
+
+  seahorse = callPackage ./apps/seahorse { };
+
+  pomodoro = callPackage ./apps/pomodoro { };
+
+#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
+
+  anjuta = callPackage ./devtools/anjuta { };
+
+  gdl = callPackage ./devtools/gdl { };
+
+#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
+
+  geary = callPackage ./misc/geary { 
+    webkitgtk = webkitgtk24x;
+  };
+
+  gfbgraph = callPackage ./misc/gfbgraph { };
+
+  goffice = callPackage ./misc/goffice { };
+
+  gitg = callPackage ./misc/gitg { 
+    webkitgtk = webkitgtk24x;
+  };
+
+  libgda = callPackage ./misc/libgda { };
+
+  libgit2-glib = callPackage ./misc/libgit2-glib {
+    libgit2 = pkgs.libgit2.override { libssh2 = null; };
+  };
+
+  libmediaart = callPackage ./misc/libmediaart { };
+
+  gexiv2 = callPackage ./misc/gexiv2 { };
+
+  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
+
+  gpaste = callPackage ./misc/gpaste { };
+
+  gtkhtml = callPackage ./misc/gtkhtml { };
+
+}
diff --git a/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
new file mode 100644
index 00000000000..a1b38b21869
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
@@ -0,0 +1,16 @@
+{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
+
+stdenv.mkDerivation rec {
+  name = "rarian-0.8.1";
+  src = fetchurl {
+    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
+    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
+  };
+
+  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
+  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
new file mode 100644
index 00000000000..a55adf6d975
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
+  itstool, python }:
+
+let
+  major = gnome3.version;
+  minor = "0";
+
+in stdenv.mkDerivation rec {
+  version = "${major}.${minor}";
+  name = "anjuta-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
+    sha256 = "b1aac2d4c35891b23c9bc3f168bf2845e02d0a438742478c98e450950d82b5e5";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
+    gnome3.libgda gnome3.gtksourceview intltool itstool python ];
+
+  meta = with stdenv.lib; {
+    description = "Software development studio";
+    homepage = http://anjuta.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
new file mode 100644
index 00000000000..9cad72de8f9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
+
+let
+  major = gnome3.version;
+  minor = "0";
+
+in stdenv.mkDerivation rec {
+  version = "${major}.${minor}";
+  name = "gdl-${version}";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
+    sha256 = "4b903c28a8894a82b997a1732a443c8b1d6a510304b3c3b511023339ff5d01db";
+  };
+
+  buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
+
+  meta = with stdenv.lib; {
+    description = "Gnome docking library";
+    homepage = https://developer.gnome.org/gdl/;
+    license = [ licenses.gpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
new file mode 100644
index 00000000000..21f55a6d81e
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
+, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
+, libnotify, libcanberra, libsecret, gmime
+, libpthreadstubs, hicolor_icon_theme
+, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
+
+let
+  majorVersion = "0.8";
+in
+stdenv.mkDerivation rec {
+  name = "geary-${majorVersion}.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
+    sha256 = "3cfa626168935acf49c9415fad54c7849f17fd833026cfd3c224ba0fb892d641";
+  };
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
+                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime
+                  libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme
+                  gdk_pixbuf librsvg gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ];
+
+  preConfigure = ''
+    substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/gsettings-schemas/${name}/
+    mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
+  '';
+
+  preFixup = ''
+    wrapProgram "$out/bin/geary" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  enableParallelBuilding = true;
+
+  patches = [ ./disable_valadoc.patch ];
+  patchFlags = "-p0";
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Geary;
+    description = "Mail client for GNOME 3";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
new file mode 100644
index 00000000000..e65c0dea747
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
@@ -0,0 +1,24 @@
+--- src/CMakeLists.txt.orig	2014-05-23 14:41:20.809160364 +0200
++++ src/CMakeLists.txt	2014-05-23 14:41:29.240261581 +0200
+@@ -696,21 +696,6 @@
+         ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
+ )
+ 
+-# Valadoc
+-#################################################
+-foreach(pkg ${ENGINE_PACKAGES})
+-    list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
+-endforeach(pkg ${ENGINE_PACKAGES})
+-
+-include(FindValadoc)
+-add_custom_target(
+-    valadoc
+-    WORKING_DIRECTORY
+-        ${CMAKE_SOURCE_DIR}/src
+-    COMMAND
+-        ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
+-)
+-
+ ## Make clean: remove copied files
+ ##################################################
+ set_property(
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
new file mode 100644
index 00000000000..7d2c8cf0eb3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }:
+
+let
+  majorVersion = "0.10";
+in
+stdenv.mkDerivation rec {
+  name = "gexiv2-${version}";
+  version = "${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
+    sha256 = "2fd21f0ed5125e51d02226e7f41be751cfa8ae411a8ed1a651e16b06d79047b2";
+  };
+  
+  preConfigure = ''
+    patchShebangs .
+  '';
+  
+  buildInputs = [ pkgconfig glib libtool m4 ];
+  propagatedBuildInputs = [ exiv2 ];
+  
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Projects/gexiv2;
+    description = "GObject wrapper around the Exiv2 photo metadata library";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
new file mode 100644
index 00000000000..d36534f0d32
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, intltool, fetchurl, pkgconfig, glib
+, gnome3, libsoup, json_glib }:
+
+stdenv.mkDerivation rec {
+  name = "gfbgraph-0.2.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
+    sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4";
+  };
+
+  buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
+  propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "GLib/GObject wrapper for the Facebook Graph API";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
new file mode 100644
index 00000000000..998f1f5f735
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
+, json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection
+, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.adwaita-icon-theme 
+
+let
+  majorVersion = "3.14";
+in
+stdenv.mkDerivation rec {
+  name = "gitg-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gitg/${majorVersion}/${name}.tar.xz";
+    sha256 = "8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b";
+  };
+
+  preCheck = ''
+    substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
+  '';
+  doCheck = true;
+
+  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
+
+  propagatedUserEnvPkgs = [ shared_mime_info
+                            gnome3.gnome_themes_standard ];
+
+  buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
+                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
+                  gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gitg" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
+    description = "GNOME GUI client to view git repositories";
+    maintainers = with maintainers; [ iElectric ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
new file mode 100644
index 00000000000..2af75a7ffac
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, intltool, fetchurl, python, pygobject3, atk
+, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup
+, bash, makeWrapper, itstool, libxml2, python3Packages
+, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-tweak-tool-${gnome3.version}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0pc62qwxgjrgxdhn3qqdzxpx0prrn6c948hqj66w2dy8r0yrdiqw";
+  };
+
+  doCheck = true;
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  makeFlags = [ "DESTDIR=/" ];
+
+  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  hicolor_icon_theme gnome3.adwaita-icon-theme
+                  python pygobject3 libnotify gnome3.gnome_shell
+                  libsoup gnome3.gnome_settings_daemon gnome3.nautilus
+                  gnome3.gnome_desktop ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/gnome-tweak-tool" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
+  '';
+
+  patches = [ ./find_gsettings.patch ];
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
+    description = "A tool to customize advanced GNOME 3 options";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
new file mode 100644
index 00000000000..3e68c04cb3a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
@@ -0,0 +1,22 @@
+diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
+index a00fe19..dce74b2 100644
+--- a/gtweak/gsettings.py
++++ b/gtweak/gsettings.py
+@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
+ 
+ class _GSettingsSchema:
+     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
+-        if not schema_dir:
+-            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
+         if not schema_filename:
+             schema_filename = schema_name + ".gschema.xml"
++        if not schema_dir:
++            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
++            for xdg_dir in GLib.get_system_data_dirs():
++                dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
++                if os.path.exists(os.path.join(dir, schema_filename)):
++                    schema_dir = dir
++                    break
+ 
+         schema_path = os.path.join(schema_dir, schema_filename)
+         if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix b/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
new file mode 100644
index 00000000000..02520a9f121
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/0.8.nix
@@ -0,0 +1,37 @@
+{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2
+, pango, libgsf, libxml2, libart, intltool, gettext
+, cairo, gconf, libgnomeui, pcre, gnome3/*just meta*/ }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.8.17";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
+    sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
+  };
+
+  # fix linking error: undefined reference to pcre_info
+  patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
+
+  buildInputs = [
+    pkgconfig libglade bzip2 libart intltool gettext
+    gconf libgnomeui pcre
+  ];
+
+  propagatedBuildInputs = [
+    # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
+    glib libgsf libxml2 gtk libglade libart cairo pango
+  ];
+
+  postInstall =
+    ''
+      # Get GnuCash to build.  Might be unnecessary if we upgrade pkgconfig.
+      substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
+    '';
+
+  doCheck = true;
+
+  meta = gnome3.goffice.meta // {
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
new file mode 100644
index 00000000000..fd16d2d4985
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, pkgconfig, intltool, glib, gtk3
+, libgsf, libxml2, libxslt, cairo, pango, librsvg, libspectre }:
+
+stdenv.mkDerivation rec {
+  name = "goffice-0.10.12";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/goffice/0.10/${name}.tar.xz";
+    sha256 = "0vh0sdig5n8sxzh4xx82lm8y8d0jcdhc2ipb1kq02qs142zs74ff";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+
+  propagatedBuildInputs = [ # ToDo lasem library for MathML, opt. introspection?
+    glib gtk3 libxml2 cairo pango libgsf
+  ];
+
+  buildInputs = [ libxslt librsvg ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = {
+    description = "A Glib/GTK+ set of document centric objects and utilities";
+
+    longDescription = ''
+      There are common operations for document centric applications that are
+      conceptually simple, but complex to implement fully: plugins, load/save
+      documents, undo/redo.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch b/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch
new file mode 100644
index 00000000000..cd4ef3c9fed
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/goffice/pcre_info.patch
@@ -0,0 +1,13 @@
+diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
+index bc4aae4..3adb696 100644
+--- a/goffice/utils/regutf8.c
++++ b/goffice/utils/regutf8.c
+@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ 		default: return GO_REG_BADPAT;
+ 		}
+ 	} else {
+-		gor->re_nsub = pcre_info (r, NULL, NULL);
++		gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
+ 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ 		return 0;
+ 	}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
new file mode 100644
index 00000000000..3975b84a05a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
+, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  version = "${gnome3.version}";
+  name = "gpaste-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
+    sha256 = "1dj5pv87j9s32f778i5bdlmrg60i9cyh4411a66kxbqyfdrq7ys0";
+  };
+
+  buildInputs = [ intltool autoreconfHook pkgconfig vala glib
+                  gtk3 gnome3.gnome_control_center dbus.libs
+                  clutter pango appstream-glib makeWrapper ];
+
+  preConfigure = "intltoolize -f";
+
+  configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
+                     "--with-dbusservicesdir=$(out)/share/dbus-1/services" ];
+
+  enableParallelBuilding = true;
+
+  preFixup = 
+    let
+      libPath = stdenv.lib.makeLibraryPath
+        [ glib gtk3 clutter pango ];
+    in
+    ''
+      for i in $out/libexec/gpaste/*; do
+        wrapProgram $i \
+          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+      done
+    '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Keruspe/GPaste;
+    description = "Clipboard management system with GNOME3 integration";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
new file mode 100644
index 00000000000..49d888a866b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, intltool
+, gnome3, enchant, isocodes }:
+
+let
+  majorVersion = "4.8";
+in
+stdenv.mkDerivation rec {
+  name = "gtkhtml-${majorVersion}.5";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkhtml/${majorVersion}/${name}.tar.xz";
+    sha256 = "2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d";
+  };
+
+  buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme
+                  gnome3.gsettings_desktop_schemas ];
+
+  propagatedBuildInputs = [ enchant isocodes ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
new file mode 100644
index 00000000000..3944644a453
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3 }:
+
+let
+  major = "5.2";
+  minor = "2";
+
+in stdenv.mkDerivation rec {
+  version = "${major}.${minor}";
+  name = "libgda-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz";
+    sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4";
+  };
+
+  configureFlags = [
+    "--enable-gi-system-install=no"
+  ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 ];
+
+  meta = with stdenv.lib; {
+    description = "Database access library";
+    homepage = http://www.gnome-db.org/;
+    license = [ licenses.lgpl2 licenses.gpl2 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
new file mode 100644
index 00000000000..0bcf85e1d42
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
+, gtk_doc, gobjectIntrospection, libgit2, glib }:
+
+let
+  majorVersion = "0.0";
+in
+stdenv.mkDerivation rec {
+  name = "libgit2-glib-${majorVersion}.24";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgit2-glib/0.0/${name}.tar.xz";
+    sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8";
+  };
+
+  configureScript = "sh ./autogen.sh";
+
+  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
+                  gtk_doc gobjectIntrospection libgit2 glib ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
new file mode 100644
index 00000000000..5ac6b50198b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection }:
+
+let
+  majorVersion = "1.9";
+in
+stdenv.mkDerivation rec {
+  name = "libmediaart-${majorVersion}.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
+    sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
+  };
+
+  buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
+
+  meta = with stdenv.lib; {
+    description = "Library tasked with managing, extracting and handling media art caches";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix
deleted file mode 100644
index 4a0161770c8..00000000000
--- a/pkgs/desktops/plasma-5.2/manifest.nix
+++ /dev/null
@@ -1,319 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kdecoration-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/cppfn3gd3ff2x6llz9gmnbg2plyhxkgb-kdecoration-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kdecoration-5.2.2.tar.xz";
-      sha256 = "1a4vaflzr1vz0v9pp4w1nxs1qpc1yixl0llj8mjx7f2aw03yjdil";
-      name = "kdecoration-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/k0i9hbdiqchd6c4802mgsj6ys0i20cq7-kdeplasma-addons-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kdeplasma-addons-5.2.2.tar.xz";
-      sha256 = "0zzzbpgllaj9kqfca9lqqgjmlybhfga5gazfwh4gmfd6vrvsv4zq";
-      name = "kdeplasma-addons-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "powerdevil-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/q64lvc2svj9ab9ghr7vxgs5y6ghnhv26-powerdevil-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/powerdevil-5.2.2.tar.xz";
-      sha256 = "07p7rxmfykf03m12mpmxi5whgnizvhxbks888zd4hzy42ln8byvd";
-      name = "powerdevil-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/vg1jxzylncp5nz0pp41mxc1a6djv9gx5-polkit-kde-agent-1-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/polkit-kde-agent-1-5.2.2.tar.xz";
-      sha256 = "18krrgcmgmw5ivmhn1i83gl2b90k1pimk91z6sqimcfabsm2207q";
-      name = "polkit-kde-agent-1-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "baloo-5.6.2.tar.xz" ".tar";
-    store = "/nix/store/ghvcq3c2q539avg2n1cm94zs0r4wkkc3-baloo-5.6.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/baloo-5.6.2.tar.xz";
-      sha256 = "14sq0fyy1792m8dqasr52syls2i8rbl2h333z6q9vjfp8zg1bgra";
-      name = "baloo-5.6.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libbluedevil-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/f4awl52gqj3w1lsy73v6pfazzb1rjmca-libbluedevil-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/libbluedevil-5.2.2.tar.xz";
-      sha256 = "1m0g8i6a40jxjfsf24g2x29xik0qwja80az8i6v42jqjigdxqgsz";
-      name = "libbluedevil-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksysguard-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/n78bf9pd2cxf0a8jh0snfl8dfqn59lv7-ksysguard-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/ksysguard-5.2.2.tar.xz";
-      sha256 = "0sz2zjbh9zm0v16n7nfskrx5q5g0p4szqxh3fxkwvjysafvbbm2j";
-      name = "ksysguard-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwin-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/pdjszd0xl49ak7g2sxs9gy0yxfkqyl7w-kwin-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kwin-5.2.2.tar.xz";
-      sha256 = "1h78nb9g7ynmsx9w9gi54xzn2v3pn88fc1s9hf7w6bjbj55nmxnc";
-      name = "kwin-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/5sjd1yal83dsp0sc5yb118w846ypqs3l-oxygen-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/oxygen-5.2.2.tar.xz";
-      sha256 = "1hkm02plbsmbypywr4f84j8bb4fy9pv91rh8j8g99pahyxqjjkzm";
-      name = "oxygen-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libksysguard-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/qfim9g5jafl8c0pzd764i4y9mh2aziji-libksysguard-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/libksysguard-5.2.2.tar.xz";
-      sha256 = "0pa1lqccih6d0axv4k6dbm79jlqcy6alx6zp9npbms04w004fmav";
-      name = "libksysguard-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khotkeys-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/1acfqi39blv2phqn5ypsbjfwb4yy6ac9-khotkeys-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/khotkeys-5.2.2.tar.xz";
-      sha256 = "16g51xs0l2fzqd9vf7qy2kda8hlnknxmxbb30wl8fc566pss4xcj";
-      name = "khotkeys-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-nm-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/h2imh1yn683vahz76y2cxvc53c3zg61m-plasma-nm-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/plasma-nm-5.2.2.tar.xz";
-      sha256 = "1031l97b652v2rhzwkwrl1zjm2z0lgg12p88r4sfyp8xzbr5vvsd";
-      name = "plasma-nm-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libmm-qt-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/mpnx11ji4qfgfylm3fy18y0gfcfiyccs-libmm-qt-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/libmm-qt-5.2.2.tar.xz";
-      sha256 = "0z71fn5f5ch4g4bc2nvqx8lj63bw5lxf3axrb6zn4wqviy9345fd";
-      name = "libmm-qt-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "libkscreen-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/dshgq9mha8j254d0x1w0k6cp2xh12y0y-libkscreen-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/libkscreen-5.2.2.tar.xz";
-      sha256 = "0ymck8yb7kphp7nd7l2kfas420qjkqay4wwxav80ga8zb5m4v9ky";
-      name = "libkscreen-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/g72bj559sk724zyv63mwv97bdkybphwq-plasma-workspace-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/plasma-workspace-5.2.2.tar.xz";
-      sha256 = "0wh5m525f5bdcr9mygm9q9cjwnr46irjx1xdsn873v75nxm16x5i";
-      name = "plasma-workspace-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "muon-5.2.2-1.tar.xz" ".tar";
-    store = "/nix/store/kxgn4px54mw23g6zjafxx091vpx5vvw7-muon-5.2.2-1.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/muon-5.2.2-1.tar.xz";
-      sha256 = "0nq0wi0fx69mrvc6aah8xvakjwsvx87ykfrarb0pd1cidjz7k698";
-      name = "muon-5.2.2-1.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-extras-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/301jm0fc13y1fnaliifrczpb6i3vnq0q-kio-extras-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kio-extras-5.2.2.tar.xz";
-      sha256 = "18ypgzn7zib0z6gs32l1yzwcgkk7jzwrc66j7yl19nl3j8ijflab";
-      name = "kio-extras-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kscreen-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/dr2k13fzyclv2zfq09s0mhi36mxp1byq-kscreen-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kscreen-5.2.2.tar.xz";
-      sha256 = "0mg34046p12102kc1kkvv7famxrx3m3zvgvhllbq29pzqrhgyq7c";
-      name = "kscreen-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "milou-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/whdyjzwz2f2ps9250w0w85rfc2nwakk8-milou-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/milou-5.2.2.tar.xz";
-      sha256 = "0j70v090i6qx1y92mhnasrwx6zlwj81nly6csk4zxbrqlk1mpzfr";
-      name = "milou-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kfilemetadata-5.6.2.tar.xz" ".tar";
-    store = "/nix/store/giyrg1kmry1p29l2j39lqqahfrsnnx93-kfilemetadata-5.6.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kfilemetadata-5.6.2.tar.xz";
-      sha256 = "0nkb4nzpjhpy3b2ma9ikdl29lypqrn0qj1cjn4qvrrgviqd1lj89";
-      name = "kfilemetadata-5.6.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/xwld1167hfar6ndwyfpv4iykxkk4fx3l-oxygen-fonts-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/oxygen-fonts-5.2.2.tar.xz";
-      sha256 = "1xrzhg2255zz1hva210wnzsz537dxc2xlzbiqbzwknh3mpp7hb90";
-      name = "oxygen-fonts-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "breeze-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/0k4ljr8hp0xibwhykrqgf6md92f9p172-breeze-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/breeze-5.2.2.tar.xz";
-      sha256 = "0q44bq1j3ap0wj1v582sks87ji2w4m7armb7g9p7jxzjv07hsj2v";
-      name = "breeze-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sddm-kcm-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/znayhrzlj9j5pspb7364yql46g0yrkqp-sddm-kcm-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/sddm-kcm-5.2.2.tar.xz";
-      sha256 = "1wpafks11017m5hqprbr0qbv9wn2516nm9m5bxcs93c572f6dnkr";
-      name = "sddm-kcm-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmenuedit-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/29jgl4ygjk8770iqpdxnyfh7f4xaiv2w-kmenuedit-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kmenuedit-5.2.2.tar.xz";
-      sha256 = "0hwqjj247yjvxp923bqx3q78q6bav962crhrfs5phf3a22v1s5vw";
-      name = "kmenuedit-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/rdgh3m2w5bl5smc0hwcrhi04yh8x7g43-plasma-workspace-wallpapers-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/plasma-workspace-wallpapers-5.2.2.tar.xz";
-      sha256 = "15jw1cb4mgk5fqsmyq8wyl7xc36zyjpr1k585nxg8kqi9376rmlp";
-      name = "plasma-workspace-wallpapers-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinfocenter-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/a49lq7sggqarnbwcmgx82dvkb6z96zmi-kinfocenter-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kinfocenter-5.2.2.tar.xz";
-      sha256 = "0axh3glf25110ixqgiswlv4x4gj73j61spg4pb9gfvvsi53rcqkl";
-      name = "kinfocenter-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ksshaskpass-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/zhpxalhlqyz0cwsx2s1b0bzrg7rs2y8m-ksshaskpass-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/ksshaskpass-5.2.2.tar.xz";
-      sha256 = "052apq5l34fa6ibwr9b67jkwj6d4calyv3b20n1556zmfy8skfpj";
-      name = "ksshaskpass-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwrited-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/aaa6yzg06wf0nrnbkhsfrlj1lln6jqsd-kwrited-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kwrited-5.2.2.tar.xz";
-      sha256 = "1fx162rsydmsqhfvg6mypb6xrnl3xvsgrzss25bi2w51w1wylg6h";
-      name = "kwrited-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "systemsettings-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/5qb2ifxfz5dp4xl6a0kdxf3yp7rc2bh5-systemsettings-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/systemsettings-5.2.2.tar.xz";
-      sha256 = "09217sradvh5ygf0k4sx4j73c7bs4svljmswpsag3b27mhmcr4cz";
-      name = "systemsettings-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwayland-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/w5w35h0d8bcilmyi246ilfkn3wlzbvh7-kwayland-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kwayland-5.2.2.tar.xz";
-      sha256 = "1ywp5b7v5x1lvnz330fgv8ss6ba6jcc59r75x96g15cpxj4np997";
-      name = "kwayland-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khelpcenter-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/wlzijg52dxs70i3a3ah95jwxp3c3ir82-khelpcenter-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/khelpcenter-5.2.2.tar.xz";
-      sha256 = "0r1jwf3zyqhg3ixg64ankb9k8pb2cm9k2ykjxs6zkdxrmzqczd87";
-      name = "khelpcenter-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "bluedevil-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/b010icvzwl4m7pxcam4g75l5l68gni0r-bluedevil-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/bluedevil-5.2.2.tar.xz";
-      sha256 = "193jrrcqkz1v8dh6wmjipnnpcs17fawciy6q285ipxhas1ma93hs";
-      name = "bluedevil-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/5yc85mx30w54d25a8zivbw77s2vhlng8-kde-cli-tools-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kde-cli-tools-5.2.2.tar.xz";
-      sha256 = "0rx7xi5f4cx4y9kry56mjcqkk8sllw1rwv74hq81nyz6wlcq20zm";
-      name = "kde-cli-tools-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-desktop-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/k5fzvwdsv7s9na2a3rr2cxysh194rbmq-plasma-desktop-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/plasma-desktop-5.2.2.tar.xz";
-      sha256 = "04zid1d4qmw56210hricn2mf04pv28p2063lhax2z3wxynq0wjyl";
-      name = "plasma-desktop-5.2.2.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.2.tar.xz" ".tar";
-    store = "/nix/store/fimbgb9rhzcqmbzhspvdfkl818frpklf-kde-gtk-config-5.2.2.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.2.2/kde-gtk-config-5.2.2.tar.xz";
-      sha256 = "0hyhxm6crzrcdnf06aav4pg6dfvhag5lcxprhhm83cfcrxqi05qb";
-      name = "kde-gtk-config-5.2.2.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/desktops/plasma-5.2/manifest.sh b/pkgs/desktops/plasma-5.2/manifest.sh
deleted file mode 100755
index ec5e9f5ac3e..00000000000
--- a/pkgs/desktops/plasma-5.2/manifest.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../.. -A autonix.manifest) \
-      http://download.kde.org/stable/plasma/5.2.2/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/desktops/plasma-5.2/setup-hook.sh b/pkgs/desktops/plasma-5.2/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36..00000000000
--- a/pkgs/desktops/plasma-5.2/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index ed89384e26a..20818a5c846 100644
--- a/pkgs/desktops/plasma-5.2/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -72,6 +72,13 @@ let
   postResolve = super:
     (builtins.removeAttrs super ["breeze"]) // {
 
+      bluez-qt = super.bluez-qt // {
+        preConfigure = ''
+          substituteInPlace CMakeLists.txt \
+            --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+        '';
+      };
+
       breeze-qt4 = with pkgs; super.breeze // {
         name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
         buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
@@ -103,6 +110,10 @@ let
           + " -I${pango}/include/pango-1.0";
       };
 
+      kfilemetadata = super.kfilemetadata // {
+        buildInputs = with pkgs; super.kfilemetadata.buildInputs ++ [ attr ];
+      };
+
       kwin = with pkgs; super.kwin // {
         buildInputs = with xlibs;
           super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
@@ -148,6 +159,12 @@ let
         buildInputs = with xlibs; super.sddm-kcm.buildInputs ++ [libXcursor];
       };
 
+      /*
+      user-manager = super.user-manager // {
+        buildInputs = with pkgs; super.user-manager.buildInputs ++ [ libpwquality ];
+      };
+      */
+
     };
 
   plasma5 = generateCollection ./. {
diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.3/dependencies.nix
index cb23102aa1f..3a813402f2c 100644
--- a/pkgs/desktops/plasma-5.2/dependencies.nix
+++ b/pkgs/desktops/plasma-5.3/dependencies.nix
@@ -2,7 +2,7 @@
 { }:
 {
   baloo = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" "Xapian" ];
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5DBusAddons" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" "Xapian" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
     propagatedNativeBuildInputs = [  ];
@@ -10,15 +10,23 @@
   };
 
   bluedevil = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5WidgetsAddons" "LibBlueDevil" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "SharedMimeInfo" ];
+    buildInputs = [ "ECM" "KDED" "KF5" "KF5BluezQt" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5Plasma" "KF5WidgetsAddons" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Qml" "Qt5Widgets" "SharedMimeInfo" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
   };
 
+  bluez-qt = {
+    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickTest" "Qt5Test" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   breeze = {
-    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
+    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5KCMUtils" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -34,7 +42,7 @@
   };
 
   kde-gtk-config = {
-    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -50,7 +58,7 @@
   };
 
   kdeplasma-addons = {
-    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Widgets" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
+    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5NewStuff" "KF5Plasma" "KF5Purpose" "KF5QUIET" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Qml" "Qt5Quick" "Qt5Widgets" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -82,7 +90,7 @@
   };
 
   kinfocenter = {
-    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Widgets" "RAW1394" "X11" ];
+    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Package" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Widgets" "RAW1394" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -130,7 +138,7 @@
   };
 
   kwayland = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Gui" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Wayland" "WaylandScanner" ];
+    buildInputs = [ "ECM" "EGL" "Qt5" "Qt5COMPONENT" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Private" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5_check_private" "Wayland" "WaylandScanner" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Gui" ];
     propagatedNativeBuildInputs = [  ];
@@ -138,7 +146,7 @@
   };
 
   kwin = {
-    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
+    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "Threads" "UDev" "Wayland" "X11" "X11_XCB" "XCB" "XKB" "epoxy" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -153,16 +161,8 @@
     propagatedUserEnvPkgs = [  ];
   };
 
-  libbluedevil = {
-    buildInputs = [ "Doxygen" "Qt5" "Qt5Core" "Qt5DBus" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
   libkscreen = {
-    buildInputs = [ "Doxygen" "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5X11Extras" "X11" "XCB" ];
+    buildInputs = [ "Doxygen" "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5X11Extras" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -177,14 +177,6 @@
     propagatedUserEnvPkgs = [  ];
   };
 
-  libmm-qt = {
-    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
   milou = {
     buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KF5Service" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
@@ -202,7 +194,7 @@
   };
 
   oxygen = {
-    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
+    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KDecoration2" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -218,7 +210,15 @@
   };
 
   plasma-desktop = {
-    buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5GlobalAccel" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
+    buildInputs = [ "Boost" "Canberra" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5Emoticons" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5NotifyConfig" "KF5People" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "Synaptics" "USB" "X11" "XCB" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [ "Qt5Core" ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
+  plasma-mediacenter = {
+    buildInputs = [ "ECM" "KF5" "KF5Baloo" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5FileMetaData" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5PlasmaQuick" "KF5Service" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Xml" "Taglib" "mockcpp" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -233,10 +233,18 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  plasma-sdk = {
+    buildInputs = [ "ActiveApp" "ECM" "KDevPlatform" "KF5" "KF5Archive" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Plasma" "KF5PlasmaQuick" "KF5Service" "KF5TextEditor" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "QGpgme" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKit" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5Xml" ];
+    nativeBuildInputs = [ "GIT_EXECUTABLE_FOUND" "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
   plasma-workspace = {
-    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
+    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NO_MODULE" "KF5NetworkManagerQt" "KF5NewStuff" "KF5NotifyConfig" "KF5Package" "KF5Plasma" "KF5PlasmaQuick" "KF5Prison" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KF5XmlRpcClient" "KWinDBusInterface" "Phonon4Qt5" "Qalculate" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
     nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ];
+    propagatedBuildInputs = [ "KF5SysGuard" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
@@ -258,7 +266,7 @@
   };
 
   powerdevil = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ];
+    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Auth" "KF5Config" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Screen" "KF5Solid" "LibKWorkspace" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "UDev" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -281,4 +289,12 @@
     propagatedUserEnvPkgs = [  ];
   };
 
+  user-manager = {
+    buildInputs = [ "ECM" "KF5" "KF5I18n" "KF5KDELibs4Support" "PWQuality" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Widgets" ];
+    nativeBuildInputs = [ "cmake" ];
+    propagatedBuildInputs = [  ];
+    propagatedNativeBuildInputs = [  ];
+    propagatedUserEnvPkgs = [  ];
+  };
+
 }
diff --git a/pkgs/desktops/plasma-5.2/dependencies.sh b/pkgs/desktops/plasma-5.3/dependencies.sh
index e614efc5475..e614efc5475 100755
--- a/pkgs/desktops/plasma-5.2/dependencies.sh
+++ b/pkgs/desktops/plasma-5.3/dependencies.sh
diff --git a/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch b/pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch
index fd1f35d717e..fd1f35d717e 100644
--- a/pkgs/desktops/plasma-5.2/kwin/kwin-import-plugin-follow-symlinks.patch
+++ b/pkgs/desktops/plasma-5.3/kwin/kwin-import-plugin-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch b/pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch
index d0b9658b3bf..d0b9658b3bf 100644
--- a/pkgs/desktops/plasma-5.2/kwin/libinput-0.8.patch
+++ b/pkgs/desktops/plasma-5.3/kwin/libinput-0.8.patch
diff --git a/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch
index d5797924d23..d5797924d23 100644
--- a/pkgs/desktops/plasma-5.2/libkscreen/libkscreen-backend-path.patch
+++ b/pkgs/desktops/plasma-5.3/libkscreen/libkscreen-backend-path.patch
diff --git a/pkgs/desktops/plasma-5.3/manifest.nix b/pkgs/desktops/plasma-5.3/manifest.nix
new file mode 100644
index 00000000000..22649b7581e
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/manifest.nix
@@ -0,0 +1,328 @@
+# This file is generated automatically. DO NOT EDIT!
+{ stdenv, fetchurl, mirror }:
+[
+  {
+    name = stdenv.lib.nameFromURL "kscreen-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/hjhbxv0vrv64r22z5zr15av8c6kpa2q3-kscreen-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kscreen-5.3.0.tar.xz";
+      sha256 = "1d9qlqszrkz8ia1k20xy645mngg3jwyc9mjvc27z5yx3l2bjdisq";
+      name = "kscreen-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-cli-tools-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/di83lwabjyf21g6bbww68xf3k89zdih5-kde-cli-tools-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kde-cli-tools-5.3.0.tar.xz";
+      sha256 = "12i74cq9kghcj7sfhxqdlqjd5n4lpxr8nvlzkh4n8pjrz1w3g9n7";
+      name = "kde-cli-tools-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bluez-qt-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/7lpwpw24aahx81dq78vbk203w6xpapar-bluez-qt-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/bluez-qt-5.3.0.tar.xz";
+      sha256 = "0zcqb8fiawprl2qz1lnf875dnkg7nlb6hghqqzp4l5hby20kxnq5";
+      name = "bluez-qt-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-nm-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/hbvm05kcmpc7fncx4padzqx2gqvra88p-plasma-nm-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/plasma-nm-5.3.0.tar.xz";
+      sha256 = "1zldjrdr331shl4xk4yypr22lkav47bjsw4nzdia16x6nsh32yra";
+      name = "plasma-nm-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libkscreen-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/cr0gg8a4asd3yyy5p0rx6r1m9ngww2f7-libkscreen-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/libkscreen-5.3.0.tar.xz";
+      sha256 = "1hdgj3l51i277ar9af02sz27bb811amr6b6n4fmcym7ss1r3vljd";
+      name = "libkscreen-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "powerdevil-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/zjanbhr6ynx98sra3ibg86ajf2mxpw4v-powerdevil-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/powerdevil-5.3.0.tar.xz";
+      sha256 = "1pr53yzmra17h7vhp7h9ywsbgk7cm7f2srbdg3ikp2i8a1gzkchm";
+      name = "powerdevil-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "libksysguard-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/k4ccrcbd33iknvamm1v56n2kz86hmcca-libksysguard-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/libksysguard-5.3.0.tar.xz";
+      sha256 = "16b8xrkm1b53nwhcr91hiz0nc1bj9yjz3k4ccfmc6nhyjma3n24v";
+      name = "libksysguard-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/yws33kggkdqd5xpq065cbp0lzvgnn749-plasma-workspace-wallpapers-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-wallpapers-5.3.0.tar.xz";
+      sha256 = "0kci4f445624x93k521zva08kggffxqwcg5safzhxxrwyfw65nja";
+      name = "plasma-workspace-wallpapers-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-sdk-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/p02z3bzwd2zh62n9hj2mypvvsb0z0396-plasma-sdk-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/plasma-sdk-5.3.0.tar.xz";
+      sha256 = "1vbi45f8clpzx2hqpnzw4wamwzm4016mzh4q6yhwgappqsgn3x9f";
+      name = "plasma-sdk-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-desktop-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/livypzdcyjjiqs50varb9m2fbky6gwhm-plasma-desktop-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/plasma-desktop-5.3.0.tar.xz";
+      sha256 = "0f8rs3p1cbvryg6z386kb9pb0ygbw7jqf63hnpcjkbg33rq14q9p";
+      name = "plasma-desktop-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kinfocenter-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/w3dl539dn5jczrc50dmsywv79m3iyqxx-kinfocenter-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kinfocenter-5.3.0.tar.xz";
+      sha256 = "02znnw11j37f084bcjp160sm5fs7kc251w07rxly49jdjyy6ddiw";
+      name = "kinfocenter-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/v6wgn4l8brv3v4mdjgy0hfqxynwncy2p-polkit-kde-agent-1-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/polkit-kde-agent-1-5.3.0.tar.xz";
+      sha256 = "0z1c354sjm218w30x2whiij43jamfh4lclwcr14bqk2s8i9njhir";
+      name = "polkit-kde-agent-1-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdecoration-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/8zx7y39rrcnmfdjkp7g5xrb7xkwn6mp7-kdecoration-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kdecoration-5.3.0.tar.xz";
+      sha256 = "1abwqd8cxf6gabc74pvhnqhwqkn8a7zszwf031ndicl3n3f93x3d";
+      name = "kdecoration-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kde-gtk-config-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/6hivcczg1gp31ayfz802dxdr89zpaqym-kde-gtk-config-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kde-gtk-config-5.3.0.tar.xz";
+      sha256 = "1s7jkrb3750aw0cn5v0g7pdsbkb5ncxfhfclw8lr1nqgi03lphcf";
+      name = "kde-gtk-config-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "systemsettings-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/vzxxqpvapq8fnbf88ljhhnrpzl7vl6wf-systemsettings-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/systemsettings-5.3.0.tar.xz";
+      sha256 = "0ryhm9d46r5691alnrrg88qxbdwm10y1k7jdk7czrnjm5jkg86vh";
+      name = "systemsettings-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "muon-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/46mqwn6l763jq9qgvp9d6lg184760ff8-muon-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/muon-5.3.0.tar.xz";
+      sha256 = "0f9bnp2pf0npil189a0g3pn6bnb9nwqdclrk7scrk4xck7c66v0r";
+      name = "muon-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "milou-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/zdx8hxf5w0yqypjk08w5hfhkzngdy6pm-milou-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/milou-5.3.0.tar.xz";
+      sha256 = "089dvxpwiwa3sasah27n4yk8l3jbmi71p4080q8pslx6j4dhhmsq";
+      name = "milou-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmenuedit-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/1hjwhla1d23gbmmigxmm4w2ahkayyfr8-kmenuedit-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kmenuedit-5.3.0.tar.xz";
+      sha256 = "0jzzl043jq9afknj1pc75ywmbs5ff4rjnbqgim5xgrbr08bsam9j";
+      name = "kmenuedit-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-workspace-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/sji2iki8crvy81q6mrc1dd3gibv88mrn-plasma-workspace-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/plasma-workspace-5.3.0.tar.xz";
+      sha256 = "05kk8vnhsny3k8pn27pjawdfxcjf4c6pcl2k7s43zim0khqv5xcm";
+      name = "plasma-workspace-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-fonts-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/70mkx8jw7dhs1lvqgdjhcvr6y5y4bfck-oxygen-fonts-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/oxygen-fonts-5.3.0.tar.xz";
+      sha256 = "0wiqn91m5b421c46fbicmzhkp7lgzck0mrqn7ng0daw8aj6am94y";
+      name = "oxygen-fonts-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kio-extras-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/g889cng2b9pwz2yhp3qyjyqzhs6h5jvx-kio-extras-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kio-extras-5.3.0.tar.xz";
+      sha256 = "0n6fb4cadp16m1ck11d2zp6lrsjmj1q4iav5gydg3i7bds9kwlhf";
+      name = "kio-extras-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "oxygen-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/3hdjzpgy699qpfxj17dq913nf8qw2wgg-oxygen-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/oxygen-5.3.0.tar.xz";
+      sha256 = "0a55zncpa156rlkpg26j2gwl8ibc1fjb014sm4j07c3q85zd7n73";
+      name = "oxygen-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/qrhvjbik2vzxrln457kyl80yhpsk2byx-kdeplasma-addons-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kdeplasma-addons-5.3.0.tar.xz";
+      sha256 = "10h68sqm536j972mqn216b0304r2gpy76klgdr2d2pzqs0vwywll";
+      name = "kdeplasma-addons-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksshaskpass-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/23bkyxca8ydz1g1zj8rlyd14xn073jlw-ksshaskpass-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/ksshaskpass-5.3.0.tar.xz";
+      sha256 = "1f7kn163hnxh47q6h73lqhzkzpjhlbhq670lkr89s5i7kxjnla54";
+      name = "ksshaskpass-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-mediacenter-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/f3bwrgk52fj27b3bpgix8zy1vmwryh5f-plasma-mediacenter-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/plasma-mediacenter-5.3.0.tar.xz";
+      sha256 = "1iw6v35mg6p8g7pxnqqm1sqs75kmk04jzaakmfs6xjn8h34s0kmp";
+      name = "plasma-mediacenter-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "breeze-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/3d28b0pqh4qjgbff556q475fgkhx0f5r-breeze-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/breeze-5.3.0.tar.xz";
+      sha256 = "12drbw4j7bk0yd7g45j1w70v3jnm4z323zsad3lnnzw448lm9vck";
+      name = "breeze-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "bluedevil-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/9wq45x6vk9kf9c01ba2xhsdibhaqq7hc-bluedevil-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/bluedevil-5.3.0.tar.xz";
+      sha256 = "0bw03kkfzpcq6s2kx8zi66f308zc153m4ddknlvf5cnm7wvykx4q";
+      name = "bluedevil-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kfilemetadata-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/whv1mw43461l69j1qa2dp95953si4mcy-kfilemetadata-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kfilemetadata-5.9.0.tar.xz";
+      sha256 = "0rgcdpys13qpv11sqrfjxxp75dlchnffvvz7bi7vps1xypnvk4jw";
+      name = "kfilemetadata-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khelpcenter-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/7x373jrlqhj9jq6j3qcz9vimzzr3za5z-khelpcenter-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/khelpcenter-5.3.0.tar.xz";
+      sha256 = "1zk70bc2zmnh37qp2w7rh6lzid5hmavm7amyzllsksakj6ba40ki";
+      name = "khelpcenter-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khotkeys-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/ml95kbmiczriikch5jgk6iwljinsb28b-khotkeys-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/khotkeys-5.3.0.tar.xz";
+      sha256 = "19dy7v67l2xb1x1fqjwljg940gcc9jrvywx2xxvv2lfxgc1i0da4";
+      name = "khotkeys-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwrited-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/rfhx33pghmghr0kxlwijc6lfwpzs8a91-kwrited-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kwrited-5.3.0.tar.xz";
+      sha256 = "0mv7nrlgwrb10dcf91mrnpjmrzwgdsylnd4b4grccc13c2f55lad";
+      name = "kwrited-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwayland-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/0bnhdabiq55i43gwcvpj52ysi2w0zvw0-kwayland-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kwayland-5.3.0.tar.xz";
+      sha256 = "1ghxwhnk68nadj48r9cxl250ryylwqrarw26jvv7k7kxs6gqlncr";
+      name = "kwayland-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sddm-kcm-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/wfp80cwqkxifmdgqv8p6mgc1k6gf5shd-sddm-kcm-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/sddm-kcm-5.3.0.tar.xz";
+      sha256 = "15x0ad6zlpdnc4z398ydpr5w0bfla3r5x6mkgakis0mx6vpyzwcc";
+      name = "sddm-kcm-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwin-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/3mzgg28m89a0g0wlysil39g8lzzip46p-kwin-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/kwin-5.3.0.tar.xz";
+      sha256 = "1mvgmjmxjmv0vl0xfxyqa43rh5n65p3z5zz1ban7lbp16sn6qkqn";
+      name = "kwin-5.3.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "baloo-5.9.0.tar.xz" ".tar";
+    store = "/nix/store/kz17030nf6rifv84p2y08wrygbsl66xg-baloo-5.9.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/baloo-5.9.0.tar.xz";
+      sha256 = "1n6k6mznnjccqirr8371z0n0h2cpg6lk50n6dcx0cbqc5mfsckyn";
+      name = "baloo-5.9.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksysguard-5.3.0.tar.xz" ".tar";
+    store = "/nix/store/ixm26iv7hhgkss8carpln178df1p56xv-ksysguard-5.3.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.3.0/ksysguard-5.3.0.tar.xz";
+      sha256 = "0pz2v2lxcgn2jp0nzci1yrnxlcs3sf3a2bipaz31w5bhz128k7wi";
+      name = "ksysguard-5.3.0.tar.xz";
+    };
+  }
+]
diff --git a/pkgs/desktops/plasma-5.3/manifest.sh b/pkgs/desktops/plasma-5.3/manifest.sh
new file mode 100755
index 00000000000..befd14f0b12
--- /dev/null
+++ b/pkgs/desktops/plasma-5.3/manifest.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
+KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
+
+# The extra slash at the end of the URL is necessary to stop wget
+# from recursing over the whole server! (No, it's not a bug.)
+$(nix-build ../../.. -A autonix.manifest) \
+    "${KDE_MIRROR}/stable/plasma/5.3.0/" \
+    $MANIFEST_EXTRA_ARGS -A '*.tar.xz'
diff --git a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch
index 53bd43d38e2..53bd43d38e2 100644
--- a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-hwclock.patch
+++ b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-hwclock.patch
diff --git a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch
index e924207054d..e924207054d 100644
--- a/pkgs/desktops/plasma-5.2/plasma-desktop/plasma-desktop-zoneinfo.patch
+++ b/pkgs/desktops/plasma-5.3/plasma-desktop/plasma-desktop-zoneinfo.patch
diff --git a/pkgs/desktops/plasma-5.2/renames.nix b/pkgs/desktops/plasma-5.3/renames.nix
index 5778a2bc819..e099edd8d83 100644
--- a/pkgs/desktops/plasma-5.2/renames.nix
+++ b/pkgs/desktops/plasma-5.3/renames.nix
@@ -5,13 +5,13 @@
 "CTest" = "kdeplasma-addons";
 "ECM" = "extra-cmake-modules";
 "KDecoration2" = "kdecoration";
+"KF5ActivitiesExperimentalStats" = "plasma-desktop";
 "KF5Baloo" = "baloo";
+"KF5BluezQt" = "bluez-qt";
 "KF5FileMetaData" = "kfilemetadata";
-"KF5ModemManagerQt" = "libmm-qt";
 "KF5Screen" = "libkscreen";
 "KF5SysGuard" = "libksysguard";
 "KF5Wayland" = "kwayland";
-"KF5XmlRpcClientPrivate" = "plasma-workspace";
 "KHotKeysDBusInterface" = "khotkeys";
 "KRunnerAppDBusInterface" = "plasma-workspace";
 "KSMServerDBusInterface" = "plasma-workspace";
diff --git a/pkgs/applications/kde-apps-14.12/setup-hook.sh b/pkgs/desktops/plasma-5.3/setup-hook.sh
index a8d9b7e0e36..a8d9b7e0e36 100644
--- a/pkgs/applications/kde-apps-14.12/setup-hook.sh
+++ b/pkgs/desktops/plasma-5.3/setup-hook.sh
diff --git a/pkgs/desktops/plasma-5.2/startkde/default.nix b/pkgs/desktops/plasma-5.3/startkde/default.nix
index 624c5d239d5..624c5d239d5 100644
--- a/pkgs/desktops/plasma-5.2/startkde/default.nix
+++ b/pkgs/desktops/plasma-5.3/startkde/default.nix
diff --git a/pkgs/desktops/plasma-5.2/startkde/kdeglobals b/pkgs/desktops/plasma-5.3/startkde/kdeglobals
index bfa610712ed..bfa610712ed 100644
--- a/pkgs/desktops/plasma-5.2/startkde/kdeglobals
+++ b/pkgs/desktops/plasma-5.3/startkde/kdeglobals
diff --git a/pkgs/desktops/plasma-5.2/startkde/startkde.in b/pkgs/desktops/plasma-5.3/startkde/startkde.in
index 0825a0733f4..0825a0733f4 100644
--- a/pkgs/desktops/plasma-5.2/startkde/startkde.in
+++ b/pkgs/desktops/plasma-5.3/startkde/startkde.in
diff --git a/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys b/pkgs/desktops/plasma-5.3/startkde/startupconfigkeys
index 0fc92cff8a5..0fc92cff8a5 100644
--- a/pkgs/desktops/plasma-5.2/startkde/startupconfigkeys
+++ b/pkgs/desktops/plasma-5.3/startkde/startupconfigkeys
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 43ac75271be..304d5c284ae 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "ats2-${version}";
-  version = "0.1.9";
+  version = "0.1.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "0zcki97zj9r1dvlfriwfckp9b9z7iavw09q21v6i5ld90hw9588q";
+    sha256 = "1dy2f7lxfwcmrk753midr75cy8xs6pqnmqmj9xj0ch479q4pkpsv";
   };
 
   buildInputs = [ gmp ];
diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index c48d74249e1..068b29d47ce 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, unzip, curl }:
 
 stdenv.mkDerivation {
-  name = "dmd-2.066.1";
+  name = "dmd-2.067.0";
 
   src = fetchurl {
-    url = http://downloads.dlang.org/releases/2014/dmd.2.066.1.zip;
-    sha256 = "1qifwgrl6h232zsnvcx3kmb5d0fsy7j9zv17r3b4vln7x5rvzc66";
+    url = http://downloads.dlang.org/releases/2015/dmd.2.067.0.zip;
+    sha256 = "0b1b65694846ef3430de1de341c8cf353151a1a39656e6a1065fe56bc90fb60b";
   };
 
   buildInputs = [ unzip curl ];
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index d04bd842bf6..8206bb19e4f 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -39,11 +39,14 @@
 }:
 let
   version = "0.1.0";
-  libDir = "share/ghcjs/${pkgs.stdenv.system}-${version}-${ghc.version}/ghcjs";
+  ghcArch = if pkgs.stdenv.system == "i686-linux"
+    then "i386-linux"
+    else pkgs.stdenv.system;
+  libDir = "share/ghcjs/${ghcArch}-${version}-${ghc.version}/ghcjs";
   ghcjsBoot = fetchgit {
     url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "8cd6144870470258fb037b3e04a0a2a98c2b6551"; # 7.10 branch
-    sha256 = "16cbncx179n5khf8hkj9r221wf73rc8isffk8rv3n9psshv1jiji";
+    rev = "ab8765edcb507b8b810e3c324fd5bd5af2b69d8f"; # 7.10 branch
+    sha256 = "63b69a1d131cf3c7088e0f28d14750c81361dcc276fa113ad80dcccf73df5343";
     fetchSubmodules = true;
   };
   shims = fetchgit {
@@ -56,8 +59,8 @@ in mkDerivation (rec {
   inherit version;
   src = fetchgit {
     url = git://github.com/ghcjs/ghcjs.git;
-    rev = "35a59743c4027f26a227635cb24a6246bd851f8d"; # master branch
-    sha256 = "107sh36ji3psdl3py84vxgqbywjyzglj3p0akzpvcmbarxwfr1mw";
+    rev = "64c3768186d73d8c185b42d4d14dfb943919ee56"; # master branch
+    sha256 = "1w7rwcqzihg6h2j0khar7kjn8vdjg9ngjk6bndpiqcgf3kwfmvhf";
   };
   isLibrary = true;
   isExecutable = true;
@@ -122,7 +125,5 @@ in mkDerivation (rec {
   description = "GHCJS is a Haskell to JavaScript compiler that uses the GHC API";
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
-  maintainers = with stdenv.lib.maintainers; [
-    jwiegley cstrahan
-  ];
+  maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
 })
diff --git a/pkgs/development/compilers/icedtea/currency-date-range.patch b/pkgs/development/compilers/icedtea/currency-date-range.patch
deleted file mode 100644
index b7a2486b12c..00000000000
--- a/pkgs/development/compilers/icedtea/currency-date-range.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
---- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java
-+++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java	2014-12-30 10:15:50.327905933 -0430
-@@ -281,8 +281,8 @@
-             checkCurrencyCode(newCurrency);
-             String timeString = currencyInfo.substring(4, length - 4);
-             long time = format.parse(timeString).getTime();
--            if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) {
--                throw new RuntimeException("time is more than 10 years from present: " + time);
-+            if (Math.abs(time - System.currentTimeMillis()) > ((long) 20) * 365 * 24 * 60 * 60 * 1000) {
-+                throw new RuntimeException("time is more than 20 years from present: " + time);
-             }
-             specialCaseCutOverTimes[specialCaseCount] = time;
-             specialCaseOldCurrencies[specialCaseCount] = oldCurrency;
diff --git a/pkgs/development/compilers/icedtea/default.nix b/pkgs/development/compilers/icedtea/default.nix
index 87f42c9aa31..5e008821d95 100644
--- a/pkgs/development/compilers/icedtea/default.nix
+++ b/pkgs/development/compilers/icedtea/default.nix
@@ -78,7 +78,6 @@ let
 
       patch -p0 < ${./cppflags-include-fix.patch}
       patch -p0 < ${./fix-java-home.patch}
-      patch -p0 < ${./currency-date-range.patch}
     '';
 
     NIX_NO_SELF_RPATH = true;
diff --git a/pkgs/development/compilers/icedtea/sources.nix b/pkgs/development/compilers/icedtea/sources.nix
index 12cd498042c..80d96b4660a 100644
--- a/pkgs/development/compilers/icedtea/sources.nix
+++ b/pkgs/development/compilers/icedtea/sources.nix
@@ -1,47 +1,47 @@
 # This file is autogenerated from update.py in the same directory.
 {
   icedtea7 = rec {
-    version = "2.5.4";
+    version = "2.5.5";
 
     url = "http://icedtea.wildebeest.org/download/source/icedtea-${version}.tar.xz";
-    sha256 = "1npz2p11i4xy4732rxs8wv209iap0m3m24w3vkh9kj0p4k2gal0v";
+    sha256 = "1irxk2ndwsfk4c1zbzb5h3rpwv2bc9bhfjvz6p4dws5476vsxrq9";
 
     common_url = "http://icedtea.classpath.org/download/drops/icedtea7/${version}";
 
     bundles = {
       openjdk = rec {
         url = "${common_url}/openjdk.tar.bz2";
-        sha256 = "88c92a3cab37446352086876771733229b1602d4f79ef68629a151180652e1f1";
+        sha256 = "5301baacfb6b4ee28a3469b8429a0017898615532f727bb50d94777682c5fd0d";
       };
 
       corba = rec {
         url = "${common_url}/corba.tar.bz2";
-        sha256 = "7411fe2df795981124ae2e4da0ddb7d98db0a94c9399a12876be03e7177eaa0b";
+        sha256 = "f0576599b474f56e58068071242cedbbf2f181b58c9010b614c9096be764ac51";
       };
 
       jaxp = rec {
         url = "${common_url}/jaxp.tar.bz2";
-        sha256 = "84623e50b69710d12209fc761a49953c78f1a664ff54e022a77e35e25489f2f3";
+        sha256 = "293218d595763f7e02a91ea88860e5314e42330cbc21b73dc5de32e7e26fd256";
       };
 
       jaxws = rec {
         url = "${common_url}/jaxws.tar.bz2";
-        sha256 = "4bd38a8121d85c422b425177ce648afdee9da18812c91c5b74939c58db33ab4b";
+        sha256 = "76d6d0670ede806b01d39e07c644e423a50984f1cf0ec560afa23f0fedf575be";
       };
 
       jdk = rec {
         url = "${common_url}/jdk.tar.bz2";
-        sha256 = "e99b65baf66d8818e3c8fd31d71fbad4ad0ceb0b7fa4c2e0607eca3a40f2ba09";
+        sha256 = "c1bc0d25457ccf40fcaeb5311052f6d2fbab8ef316b0381995835827711da483";
       };
 
       langtools = rec {
         url = "${common_url}/langtools.tar.bz2";
-        sha256 = "4fd76cbdf18174128863514b4d3997cb623368697bf4f5af6d079dbbcd7b378a";
+        sha256 = "71b269ea930da36d751c6183816ef53a65c0587b7cf0195f87759b4c02c3b660";
       };
 
       hotspot = rec {
         url = "${common_url}/hotspot.tar.bz2";
-        sha256 = "4825f8543aa0c065530b05b0a95915a44eea153bbb696d2ffc4b50a398813e34";
+        sha256 = "d724a9749f51a3c66351ad8a27bc4570640720eace33cd03f1a52e2e45731dfb";
       };
     };
   };
diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix
index 8ba2b3a379f..ec095bb4efa 100644
--- a/pkgs/development/compilers/openjdk/default.nix
+++ b/pkgs/development/compilers/openjdk/default.nix
@@ -65,6 +65,7 @@ let
       ./paxctl.patch
       ./read-truststore-from-env.patch
       ./currency-date-range.patch
+      ./linux-4.0.patch
     ];
 
     NIX_NO_SELF_RPATH = true;
diff --git a/pkgs/development/compilers/openjdk/linux-4.0.patch b/pkgs/development/compilers/openjdk/linux-4.0.patch
new file mode 100644
index 00000000000..c3d7cf8b6ca
--- /dev/null
+++ b/pkgs/development/compilers/openjdk/linux-4.0.patch
@@ -0,0 +1,12 @@
+diff -Naur openjdk-7u65-b32/hotspot/make/linux/Makefile openjdk-7u65-b32-patch/hotspot/make/linux/Makefile
+--- openjdk-7u65-b32/hotspot/make/linux/Makefile	2014-07-17 03:08:38.000000000 -0700
++++ openjdk-7u65-b32-patch/hotspot/make/linux/Makefile	2015-04-21 05:33:12.170190385 -0700
+@@ -231,7 +231,7 @@
+ # Solaris 2.5.1, 2.6).
+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
+ 
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
+ OS_VERSION := $(shell uname -r)
+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
+ 
diff --git a/pkgs/development/compilers/openjdk/openjdk8.nix b/pkgs/development/compilers/openjdk/openjdk8.nix
index d7bcabd0a78..44e93474163 100644
--- a/pkgs/development/compilers/openjdk/openjdk8.nix
+++ b/pkgs/development/compilers/openjdk/openjdk8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl } :
+{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype, alsaLib, openjdk, cacert, perl, liberation_ttf, fontconfig } :
 let
   update = "40";
   build = "25";
@@ -39,12 +39,12 @@ let
           };
   openjdk8 = stdenv.mkDerivation {
   name = "openjdk-8u${update}b${build}";
-  srcs = [jdk8 langtools hotspot corba jdk jaxws jaxp nashorn];
+  srcs = [ jdk8 langtools hotspot corba jdk jaxws jaxp nashorn ];
   outputs = [ "out" "jre" ];
   buildInputs = [ cpio file which unzip zip
                   xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
                   xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir
-                  cups freetype alsaLib openjdk perl ];
+                  cups freetype alsaLib openjdk perl liberation_ttf fontconfig ];
   setSourceRoot = ''
     sourceRoot="jdk8u${update}-jdk8u${update}-b${build}";
   '';
@@ -77,18 +77,19 @@ let
     "--with-build-number=b${build}"
     "--with-milestone=fcs"
   ];
+  NIX_LDFLAGS= "-lfontconfig";
   buildFlags = "DEBUG_BINARIES=true all";
   installPhase = ''
     mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
 
-    cp -av build/*/images/j2sdk-image/* $out/lib/openjdk
+    cp -av build"/"*/images/j2sdk-image"/"* $out/lib/openjdk
 
     # Move some stuff to top-level.
     mv $out/lib/openjdk/include $out/include
     mv $out/lib/openjdk/man $out/share/man
 
     # jni.h expects jni_md.h to be in the header search path.
-    ln -s $out/include/linux/*_md.h $out/include/
+    ln -s $out/include/linux"/"*_md.h $out/include/
 
     # Remove some broken manpages.
     rm -rf $out/share/man/ja*
@@ -96,16 +97,18 @@ let
     # Remove crap from the installation.
     rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample
 
-    # Move the JRE to a separate output.
+    # Move the JRE to a separate output and setup fallback fonts
     mv $out/lib/openjdk/jre $jre/lib/openjdk/
     mkdir $out/lib/openjdk/jre
+    mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback
+    lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback
     lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre
 
     rm -rf $out/lib/openjdk/jre/bina
     ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
 
     # Set PaX markings
-    exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
+    exes=$(file $out/lib/openjdk/bin"/"* $jre/lib/openjdk/jre/bin"/"* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
     echo "to mark: *$exes*"
     for file in $exes; do
       echo "marking *$file*"
@@ -128,15 +131,16 @@ let
 
     ln -s $out/lib/openjdk/bin $out/bin
     ln -s $jre/lib/openjdk/jre/bin $jre/bin
+
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://openjdk.java.net/;
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     description = "The open-source Java Development Kit";
-    maintainers = [ stdenv.lib.maintainers.cocreature ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ edwtjo ];
+    platforms = platforms.linux;
   };
-  
+
   passthru.home = "${openjdk8}/lib/openjdk";
 }; in openjdk8
diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
index eb40cff689a..730b3b569c6 100644
--- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "7";
-  patchVersion = "75";
+  patchVersion = "79";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-  sha256_i686 = "173ppi5d90hllqgys90wlv596bpj2iw8gsbsr6pk7xvd4l1wdhrw";
-  sha256_x86_64 = "040n50nglr6rcli2pz5rd503c2qqdqqbqynp6hzc4kakkchmj2a6";
+  sha256_i686 = "1hv9bmj08y8gavhhkip5w5dg96b1dy4sc2cidpjcbwpb2mzh5lhs";
+  sha256_x86_64 = "140xl5kfdrlmh8wh2x3j23x53dbil8qxsvc7gf3138mz4805vmr9";
   jceName = "UnlimitedJCEPolicyJDK7.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
   sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
diff --git a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
index 929ff59717d..311f07e8e45 100644
--- a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "7";
-  patchVersion = "76";
+  patchVersion = "80";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html;
-  sha256_i686 = "0558p5garc4b5g7h11dkzn161kpk84az5ad1q5hhsblbx02aqff3";
-  sha256_x86_64 = "130ckrv846amyfzbnnd6skljkznc457yky7d6ajaw5ndsbzg93yf";
+  sha256_i686 = "1fjpm8pa74c4vgv93lnky6pd3igln56yxdn4kbhgcg12lwc17vcx";
+  sha256_x86_64 = "08wn62sammvsvlqac0n8grrikl0ykh9ikqdy823i2mcnccqsgnds";
   jceName = "UnlimitedJCEPolicyJDK7.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html;
   sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index ea1c01ec5e5..014ed0db7c2 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,10 +1,10 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "40";
+  patchVersion = "45";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "1bfabnmbar0kfx3i37wnxh97j7whkib8m6wqxrb1d9zf6k13bw50";
-  sha256_x86_64 = "0nfm4xqd57s8dmkgd0jsrhys8dhfw0fx5d57mq70ramq9dl2jq66";
+  sha256_i686 = "1y1zymydd1azv14r0hh12zjr8k64wa8wfdbz8sn1css84aqwl87d";
+  sha256_x86_64 = "0v9ilahx03isxdzh4ryv1bqmmzppckickz22hvgzs785769cm67j";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
-  sha256JCE = "f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59";
+  sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
 }
diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix
index f70b8f448b4..38473897698 100644
--- a/pkgs/development/compilers/rdmd/default.nix
+++ b/pkgs/development/compilers/rdmd/default.nix
@@ -1,14 +1,13 @@
-{stdenv, lib, fetchgit, dmd}:
+{stdenv, lib, fetchurl, dmd}:
 
 stdenv.mkDerivation {
-  name = "rdmd-20141113";
+  name = "rdmd-2.067.0";
 
   buildInputs = [ dmd ];
 
-  src = fetchgit {
-    url = git://github.com/D-Programming-Language/tools.git;
-    rev = "f496c68ee4e776597bd7382aa47f05da698a69e";
-    sha256 = "0vbhmz8nbh8ayml4vad0239kfg982vqfyqqrjv6wrlnjah97n5ms";
+  src = fetchurl {
+    url = "https://github.com/D-Programming-Language/tools/archive/v2.067.0.tar.gz";
+    sha256 = "2702ecda0427c675084d9b688449bc8c8392fd73e30257d79e2488640d5a9982";
   };
 
   buildPhase = ''
diff --git a/pkgs/development/compilers/rustc/1.0.0-alpha.nix b/pkgs/development/compilers/rustc/1.0.0-alpha.nix
deleted file mode 100644
index 7a2e485c9c6..00000000000
--- a/pkgs/development/compilers/rustc/1.0.0-alpha.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ 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
deleted file mode 100644
index 94bdd995592..00000000000
--- a/pkgs/development/compilers/rustc/1.0.0-alpha2.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ 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/1.0.0-beta.nix b/pkgs/development/compilers/rustc/1.0.0-beta.nix
new file mode 100644
index 00000000000..93359fba9f7
--- /dev/null
+++ b/pkgs/development/compilers/rustc/1.0.0-beta.nix
@@ -0,0 +1,16 @@
+{ stdenv, callPackage }:
+callPackage ./makeRustcDerivation.nix {
+  shortVersion = "1.0.0-beta.2";
+  isRelease = true;
+  srcSha = "0wcpp6fg7cc75bj5b6dcz5dhgps6xw09n75qiapmd12qxjzj17wn";
+  snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
+  snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
+  snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
+  snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa";
+  snapshotDate = "2015-03-27";
+  snapshotRev = "5520801";
+  patches = [
+    ./patches/beta.patch
+    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
+  configureFlags = [ "--release-channel=beta" ];
+}
diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 2d450388669..99012ba6d94 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,15 +2,15 @@
 callPackage ./makeRustcDerivation.nix {
   shortVersion = "1.0.0-dev";
   isRelease = false;
-  # src rev for master on 2015/03/09
-  srcRev = "91bdf23f504f79ed59617cde3dfebd3d5e39a476";
-  srcSha = "1s1v1q630d88idz331n4m0c3ninzipmvfzmkvdaqqm28wsn69xx7";
-  snapshotHashLinux686 = "50a47ef247610fb089d2c4f24e4b641eb0ba4afb";
-  snapshotHashLinux64 = "ccb20709b3c984f960ddde996451be8ce2268d7c";
-  snapshotHashDarwin686 = "ad263bdeadcf9bf1889426e0c1391a7cf277364e";
-  snapshotHashDarwin64 = "01c8275828042264206b7acd8e86dc719a2f27aa";
-  snapshotDate = "2015-03-07";
-  snapshotRev = "270a677";
+  # src rev for master on 2015/04/13
+  srcRev = "0cf99c3e06e84d20d68da649c888d63c72f33971";
+  srcSha = "0brnzsbxmidjnmvi36sz582k3kw6wk813y2y837zpmyxg9fjah0l";
+  snapshotHashLinux686 = "1ef82402ed16f5a6d2f87a9a62eaa83170e249ec";
+  snapshotHashLinux64 = "ef2154372e97a3cb687897d027fd51c8f2c5f349";
+  snapshotHashDarwin686 = "0310b1a970f2da7e61770fd14dbbbdca3b518234";
+  snapshotHashDarwin64 = "5f35d9c920b8083a7420ef8cf5b00d5ef3085dfa";
+  snapshotDate = "2015-03-27";
+  snapshotRev = "5520801";
   patches = [
     ./patches/head.patch
   ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
index 913e65de59a..ae3981f1add 100644
--- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix
+++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
@@ -6,6 +6,7 @@
 , snapshotHashLinux686, snapshotHashLinux64
 , snapshotHashDarwin686, snapshotHashDarwin64
 , snapshotDate, snapshotRev
+, configureFlags ? []
 
 , patches
 }:
@@ -113,7 +114,8 @@ stdenv.mkDerivation {
     '' else "");
   };
 
-  configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
+  configureFlags = configureFlags
+                ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" ]
                 ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang";
 
   inherit patches;
diff --git a/pkgs/development/compilers/rustc/patches/alpha2.patch b/pkgs/development/compilers/rustc/patches/beta.patch
index 8165a42cf85..cffc773dd3e 100644
--- a/pkgs/development/compilers/rustc/patches/alpha2.patch
+++ b/pkgs/development/compilers/rustc/patches/beta.patch
@@ -1,5 +1,5 @@
 diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
-index b506aff..b4b346b 100755
+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
@@ -15,11 +15,11 @@ index b506aff..b4b346b 100755
  # 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
+index ed44bf8..2b84627 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 {
+@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
+           paths: &[&Path]) -> Output {
      let ar = match *maybe_ar_prog {
          Some(ref ar) => &ar[..],
 -        None => "ar"
@@ -28,10 +28,10 @@ index c45ee25..0f91672 100644
      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
+index 3087a8e..578448f 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
+@@ -352,7 +352,7 @@ 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 {
@@ -41,15 +41,3 @@ index ef849bb..e090b99 100644
 +        None => "@ccPath@".to_string(),
      }
  }
- 
-diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
-index 049e08d..30b9d2a 100644
---- a/src/test/run-pass/issue-20797.rs
-+++ b/src/test/run-pass/issue-20797.rs
-@@ -90,5 +90,5 @@ impl<S: Strategy> Iterator for Subpaths<S> {
- }
- 
- fn main() {
--  let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/home")).unwrap();
-+  let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/tmp")).unwrap();
- }
diff --git a/pkgs/development/compilers/rustc/patches/hardcode_paths.alpha.patch b/pkgs/development/compilers/rustc/patches/hardcode_paths.alpha.patch
deleted file mode 100644
index 2a9cb09dcbd..00000000000
--- a/pkgs/development/compilers/rustc/patches/hardcode_paths.alpha.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/patches/head.patch b/pkgs/development/compilers/rustc/patches/head.patch
index f82f85fb162..3cbf8717cd1 100644
--- a/pkgs/development/compilers/rustc/patches/head.patch
+++ b/pkgs/development/compilers/rustc/patches/head.patch
@@ -41,15 +41,3 @@ index 3087a8e..578448f 100644
 +        None => "@ccPath@".to_string(),
      }
  }
- 
-diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
-index 049e08d..30b9d2a 100644
---- a/src/test/run-pass/issue-20797.rs
-+++ b/src/test/run-pass/issue-20797.rs
-@@ -90,5 +90,5 @@ impl<S: Strategy> Iterator for Subpaths<S> {
- }
- 
- fn main() {
--  let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/home")).unwrap();
-+  let mut walker: Subpaths<Recursive> = Subpaths::walk(&Path::new("/tmp")).unwrap();
- }
diff --git a/pkgs/development/compilers/rustc/patches/local_stage0.alpha.patch b/pkgs/development/compilers/rustc/patches/local_stage0.alpha.patch
deleted file mode 100644
index 2f38d7c1757..00000000000
--- a/pkgs/development/compilers/rustc/patches/local_stage0.alpha.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/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
new file mode 100644
index 00000000000..4a6408d66d1
--- /dev/null
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
+, libpthreadstubs, pango, pkgconfig, pulseaudio, which }:
+
+let version = "4.10.2.2614"; in
+stdenv.mkDerivation rec {
+  name = "squeak-${version}";
+
+  src = fetchurl {
+    sha256 = "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix";
+    url = "http://squeakvm.org/unix/release/Squeak-${version}-src.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Smalltalk programming language and environment";
+    longDescription = ''
+      Squeak is a full-featured implementation of the Smalltalk programming
+      language and environment based on (and largely compatible with) the
+      original Smalltalk-80 system. Squeak has very powerful 2- and 3-D
+      graphics, sound, video, MIDI, animation and other multimedia
+      capabilities. It also includes a customisable framework for creating
+      dynamic HTTP servers and interactively extensible Web sites.
+    '';
+    homepage = http://squeakvm.org/;
+    downloadPage = http://squeakvm.org/unix/index.html;
+    license = with licenses; [ asl20 mit ];
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ cmake coreutils dbus freetype glib gnused libpthreadstubs
+    pango pkgconfig pulseaudio which ];
+
+  postPatch = ''
+    for i in squeak.in squeak.sh.in; do
+      substituteInPlace unix/cmake/$i --replace "PATH=" \
+        "PATH=${coreutils}/bin:${gnused}/bin:${which}/bin #"
+    done
+  '';
+
+  configurePhase = ''
+    unix/cmake/configure --prefix=$out --enable-mpg-{mmx,pthreads}
+  '';
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/coq-modules/bedrock/default.nix b/pkgs/development/coq-modules/bedrock/default.nix
index 7aadead5428..478f74058bd 100644
--- a/pkgs/development/coq-modules/bedrock/default.nix
+++ b/pkgs/development/coq-modules/bedrock/default.nix
@@ -15,12 +15,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildFlags = "cito";
+  buildPhase = ''
+    make -j$NIX_BUILD_CORES -C src/reification
+    make -j$NIX_BUILD_CORES -C src
+  '';
 
   installPhase = ''
     COQLIB=$out/lib/coq/${coq.coq-version}/
     mkdir -p $COQLIB/user-contrib/Bedrock
-    cp -pR src $COQLIB/user-contrib/Bedrock
+    cp -pR src/* $COQLIB/user-contrib/Bedrock
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/coq-modules/mathcomp/1.5.nix b/pkgs/development/coq-modules/mathcomp/1.5.nix
new file mode 100644
index 00000000000..c984bab4917
--- /dev/null
+++ b/pkgs/development/coq-modules/mathcomp/1.5.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, coq, ssreflect}:
+
+stdenv.mkDerivation {
+
+  name = "coq-mathcomp-1.5-8.5b2";
+
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.5.coq85beta2.tar.gz;
+    sha256 = "03bnq44ym43x8shi7whc02l0g5vy6rx8f1imjw478chlgwcxazqy";
+  };
+
+  propagatedBuildInputs = [ coq ssreflect ];
+
+  enableParallelBuilding = true;
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = [ maintainers.vbgl maintainers.jwiegley ];
+    platforms = coq.meta.platforms;
+    hydraPlatforms = [];
+  };
+
+}
diff --git a/pkgs/development/coq-modules/ssreflect/1.5.nix b/pkgs/development/coq-modules/ssreflect/1.5.nix
new file mode 100644
index 00000000000..7c16b43ba8c
--- /dev/null
+++ b/pkgs/development/coq-modules/ssreflect/1.5.nix
@@ -0,0 +1,42 @@
+{stdenv, fetchurl, coq}:
+
+assert coq.coq-version == "8.5";
+
+stdenv.mkDerivation {
+
+  name = "coq-ssreflect-1.5-8.5b2";
+
+  src = fetchurl {
+    url = http://ssr.msr-inria.inria.fr/FTP/ssreflect-1.5.coq85beta2.tar.gz;
+    sha256 = "084l9xd5vgb8jml0dkm66g8cil5rsf04w821pjhn2qk9mdbwaagf";
+  };
+
+  buildInputs = [ coq.ocaml coq.camlp5 ];
+  propagatedBuildInputs = [ coq ];
+
+  enableParallelBuilding = true;
+
+  patches = [ ./threads.patch ];
+
+  postPatch = ''
+    # Permit building of the ssrcoq statically-bound executable
+    sed -i 's/^#-custom/-custom/' Make
+    sed -i 's/^#SSRCOQ/SSRCOQ/' Make
+  '';
+
+  installFlags = "COQLIB=$(out)/lib/coq/${coq.coq-version}/";
+
+  postInstall = ''
+    mkdir -p $out/bin
+    cp -p bin/ssrcoq $out/bin
+    cp -p bin/ssrcoq.byte $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://ssr.msr-inria.inria.fr/;
+    license = licenses.cecill-b;
+    maintainers = with maintainers; [ vbgl jwiegley ];
+    platforms = coq.meta.platforms;
+  };
+
+}
diff --git a/pkgs/development/coq-modules/ssreflect/threads.patch b/pkgs/development/coq-modules/ssreflect/threads.patch
new file mode 100644
index 00000000000..d60a645f6ee
--- /dev/null
+++ b/pkgs/development/coq-modules/ssreflect/threads.patch
@@ -0,0 +1,16 @@
+--- a/Make  2015-04-20 13:37:06.000000000 +0200
++++ b/Make  2015-04-25 11:32:53.885194600 +0200
+@@ -1,9 +1,9 @@
+ ### Uncomment for static linking
+ ##
+-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq
+-#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte
+-#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
+-#SSRCOQ = bin/ssrcoq
++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq -I +threads src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq
++-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte -I +threads src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte
++-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
++SSRCOQ = bin/ssrcoq
+ ##
+
+ ## What follows should be left untouched by the final user of ssreflect
diff --git a/pkgs/development/coq-modules/unimath/default.nix b/pkgs/development/coq-modules/unimath/default.nix
index e16156dec53..e6f32d60c4f 100644
--- a/pkgs/development/coq-modules/unimath/default.nix
+++ b/pkgs/development/coq-modules/unimath/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://github.com/UniMath/UniMath;
-    description = "UniMath aims to formalize a substantial body of mathematics using the univalent point of view.";
+    description = "A formalization of a substantial body of mathematics using the univalent point of view";
     maintainers = with maintainers; [ jwiegley ];
     platforms = coq.meta.platforms;
   };
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 8fed5a55be0..76828784a9d 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,4 +1,4 @@
-{ go }:
+{ go, govers, lib }:
 
 { name, buildInputs ? []
 
@@ -9,7 +9,7 @@
 
 go.stdenv.mkDerivation ( args // {
   name = "go${go.meta.branch}-${name}";
-  buildInputs = [ go ] ++ buildInputs;
+  buildInputs = [ go ] ++ buildInputs ++ (lib.optional (args ? renameImports) govers) ;
 
   configurePhase = args.configurePhase or ''
     runHook preConfigure
@@ -23,9 +23,16 @@ go.stdenv.mkDerivation ( args // {
     runHook postConfigure
   '';
 
+  renameImports = lib.optionalString (args ? renameImports)
+                    (lib.concatMapStringsSep "\n"
+                      (cmdargs: "govers -m ${cmdargs}")
+                      args.renameImports);
+
   buildPhase = args.buildPhase or ''
     runHook preBuild
 
+    runHook renameImports
+
     if [ -n "$subPackages" ] ; then
 	for p in $subPackages ; do
             go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p
@@ -83,6 +90,7 @@ go.stdenv.mkDerivation ( args // {
 
   meta = meta // {
     # add an extra maintainer to every package
-    maintainers = (meta.maintainers or []) ++ [ go.stdenv.lib.maintainers.emery ];
+    maintainers = (meta.maintainers or []) ++
+                  [ lib.maintainers.emery lib.maintainers.lethalman ];
   };
 })
diff --git a/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch b/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch
new file mode 100644
index 00000000000..ae3397fa573
--- /dev/null
+++ b/pkgs/development/haskell-modules/brainfuck-fix-ghc710.patch
@@ -0,0 +1,19 @@
+diff -ru3 brainfuck-0.1-old/Language/Brainfuck.hs brainfuck-0.1/Language/Brainfuck.hs
+--- brainfuck-0.1-old/Language/Brainfuck.hs	2015-04-17 21:17:34.568721144 +0300
++++ brainfuck-0.1/Language/Brainfuck.hs	2015-04-17 21:19:17.065872395 +0300
+@@ -19,6 +19,8 @@
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA -}
+ 
++{-# LANGUAGE FlexibleContexts #-}
++
+ module Language.Brainfuck where
+ 
+ import Data.Array.IO
+@@ -287,4 +289,4 @@
+ 
+ halt = if debug
+          then putStrLn "Machine Halted.\n"
+-         else putStrLn "\n"
+\ No newline at end of file
++         else putStrLn "\n"
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d850e5870f8..27079cea869 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -7,8 +7,8 @@ self: super: {
   # Some packages need a non-core version of Cabal.
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
   Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
-  Cabal_1_22_2_0 = dontCheck super.Cabal_1_22_2_0;
-  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_2_0; });
+  Cabal_1_22_3_0 = dontCheck super.Cabal_1_22_3_0;
+  cabal-install = dontCheck (super.cabal-install.override { Cabal = self.Cabal_1_22_3_0; });
 
   # Break infinite recursions.
   digest = super.digest.override { inherit (pkgs) zlib; };
@@ -22,6 +22,9 @@ self: super: {
   statistics = dontCheck super.statistics;
   text = dontCheck super.text;
 
+  # The package doesn't compile with ruby 1.9, which is our default at the moment.
+  hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
+
   # Doesn't compile with lua 5.2.
   hslua = super.hslua.override { lua = pkgs.lua5_1; };
 
@@ -118,6 +121,7 @@ self: super: {
   # The Haddock phase fails for one reason or another.
   attoparsec-conduit = dontHaddock super.attoparsec-conduit;
   blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;
+  BNFC-meta = dontHaddock super.BNFC-meta;
   bytestring-progress = dontHaddock super.bytestring-progress;
   comonads-fd = dontHaddock super.comonads-fd;
   comonad-transformers = dontHaddock super.comonad-transformers;
@@ -151,9 +155,11 @@ self: super: {
     patchPhase = "sed -i -e 's|random.*==.*|random|' -e 's|text.*>=.*,|text,|' -e s'|terminfo == .*|terminfo|' darcs.cabal";
   });
 
-  # The test suite imposes too narrow restrictions on the version of
-  # Cabal that can be used to build this package.
-  cabal-test-quickcheck = dontCheck super.cabal-test-quickcheck;
+  # Needs the latest version of QuickCheck to compile.
+  cabal-test-quickcheck = super.cabal-test-quickcheck.override { QuickCheck = self.QuickCheck_2_8_1; };
+
+  # https://github.com/massysett/rainbox/issues/1
+  rainbox = dontCheck super.rainbox;
 
   # https://github.com/techtangents/ablist/issues/1
   ABList = dontCheck super.ABList;
@@ -211,6 +217,15 @@ self: super: {
   # https://github.com/liamoc/wizards/issues/5
   wizards = doJailbreak super.wizards;
 
+  # https://github.com/tibbe/ekg-core/commit/c986d9750d026a0c049cf6e6610d69fc1f23121f, not yet in hackage
+  ekg-core = doJailbreak super.ekg-core;
+
+  # https://github.com/tibbe/ekg/commit/95018646f48f60d9ccf6209cc86747e0f132e737, not yet in hackage
+  ekg = doJailbreak super.ekg;
+
+  # https://github.com/diagrams/diagrams-rasterific/commit/2758e5760c64f8ca2528628bd11de502f354ab15, not yet in hackage
+  diagrams-rasterific = doJailbreak super.diagrams-rasterific;
+
   # https://github.com/NixOS/cabal2nix/issues/136
   glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
   gtk3 = super.gtk3.override { inherit (pkgs) gtk3; };
@@ -280,7 +295,6 @@ self: super: {
   amqp-conduit = dontCheck super.amqp-conduit;
   concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
   dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
-  directory_1_2_2_0 = dontCheck super.directory_1_2_2_0; # https://github.com/haskell/directory/issues/24
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
   hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
@@ -298,6 +312,7 @@ self: super: {
   stackage = dontCheck super.stackage;                  # http://hydra.cryp.to/build/501867/nixlog/1/raw
   warp = dontCheck super.warp;                          # http://hydra.cryp.to/build/501073/nixlog/5/raw
   wreq = dontCheck super.wreq;                          # http://hydra.cryp.to/build/501895/nixlog/1/raw
+  wreq-sb = dontCheck super.wreq-sb;                    # http://hydra.cryp.to/build/783948/log/raw
 
   # https://github.com/NICTA/digit/issues/3
   digit = dontCheck super.digit;
@@ -418,6 +433,7 @@ self: super: {
   Rlang-QQ = dontCheck super.Rlang-QQ;
   sai-shape-syb = dontCheck super.sai-shape-syb;
   scp-streams = dontCheck super.scp-streams;
+  sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention
   separated = dontCheck super.separated;
   shadowsocks = dontCheck super.shadowsocks;
   shake-language-c = dontCheck super.shake-language-c;
@@ -532,6 +548,18 @@ self: super: {
   # Upstream notified by e-mail.
   MonadCompose = markBrokenVersion "0.2.0.0" super.MonadCompose;
 
+  # no haddock since this is an umbrella package.
+  cloud-haskell = dontHaddock super.cloud-haskell;
+
+  # Disable tests which couldn't be built.
+  distributed-process-async = dontCheck super.distributed-process-async;
+
+  # Disable tests which couldn't be built.
+  distributed-process-client-server = dontCheck super.distributed-process-client-server;
+
+  # Disable tests which couldn't be built.
+  distributed-process-extras = dontCheck super.distributed-process-extras;
+
   # Make distributed-process-platform compile until next version
   distributed-process-platform = overrideCabal super.distributed-process-platform (drv: {
     patchPhase = "mv Setup.hs Setup.lhs";
@@ -539,6 +567,15 @@ self: super: {
     doHaddock = false;
   });
 
+  # Disable tests due to a failure (Sequential Shutdown Ordering test.)
+  distributed-process-supervisor = dontCheck super.distributed-process-supervisor;
+
+  # Disable network test and errorneous haddock.
+  distributed-process-tests = overrideCabal super.distributed-process-tests (drv: {
+    doCheck = false;
+    doHaddock = false;
+  });
+
   # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
   CHXHtml = dontDistribute super.CHXHtml;
 
@@ -722,36 +759,32 @@ self: super: {
   # Tries to run GUI in tests
   leksah = dontCheck super.leksah;
 
-} // {
-
-  # Not on Hackage.
-  cabal2nix = self.mkDerivation {
-    pname = "cabal2nix";
-    version = "20150318";
-    src = pkgs.fetchgit {
-      url = "http://github.com/NixOS/cabal2nix.git";
-      rev = "b56cc6de2c4900fb0d1dc3617591a2f536aca60d";
-      sha256 = "0pza9j3x1mfjqrzcqq6ndg0jiqx85mg0sw8n9fmq18fk5g4hzhis";
-      deepClone = true;
-    };
-    isLibrary = false;
-    isExecutable = true;
-    buildDepends = with self; [
-      aeson base bytestring Cabal containers deepseq-generics directory
-      filepath hackage-db lens monad-par monad-par-extras mtl pretty
-      prettyclass process regex-posix SHA split transformers utf8-string cartel
-    ];
-    testDepends = with self; [
-      aeson base bytestring Cabal containers deepseq deepseq-generics
-      directory doctest filepath hackage-db hspec lens monad-par
-      monad-par-extras mtl pretty prettyclass process QuickCheck
-      regex-posix SHA split transformers utf8-string
-    ];
-    buildTools = [ pkgs.gitMinimal ];
-    preConfigure = "runhaskell $setupCompileFlags generate-cabal-file >cabal2nix.cabal";
-    homepage = "http://github.com/NixOS/cabal2nix";
-    description = "Convert Cabal files into Nix build instructions";
-    license = pkgs.stdenv.lib.licenses.bsd3;
-  };
+  # Patch to consider NIX_GHC just like xmonad does
+  dyre = appendPatch super.dyre ./dyre-nix.patch;
+
+  # Fix problems with GHC >=7.8 (in compatible way)
+  mueval = let pkg = appendPatch super.mueval (pkgs.fetchpatch {
+                       url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/4.patch";
+                       sha256 = "1l0jn2lbzbhx9ifbpb5g617qa0fc8fwa6kyr87pjqfxpqminsgp5";
+                     });
+           # Nix-specific workaround
+           in appendPatch pkg ./mueval-nix.patch;
+
+  # Test suite won't compile against tasty-hunit 0.9.x.
+  zlib_0_6_1_0 = dontCheck super.zlib_0_6_1_0;
+
+  # Jailbreaking breaks the build.
+  QuickCheck_2_8_1 = dontJailbreak super.QuickCheck_2_8_1;
+
+  # Override the obsolete version from Hackage with our more up-to-date copy.
+  cabal2nix = pkgs.cabal2nix;
+
+  # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
+  HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
+  HGamer3D-Common = dontDistribute super.HGamer3D-Common;
+  HGamer3D-Data = markBroken super.HGamer3D-Data;
+
+  # https://github.com/ndmitchell/shake/issues/206
+  shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin; });
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 2a5213d4e12..9329a2c2318 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -49,14 +49,12 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -81,4 +79,7 @@ self: super: {
   stm = addBuildTool super.stm self.Cabal_1_18_1_6;
   split = super.split_0_1_4_3;
 
+  # Needs hashable on pre 7.10.x compilers.
+  nats = addBuildDepend super.nats self.hashable;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 27c4b642c4b..caef6c4b754 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -42,14 +42,12 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -63,4 +61,7 @@ self: super: {
   # Setup: Can't find transitive deps for haddock
   doctest = dontHaddock super.doctest;
 
+  # Needs hashable on pre 7.10.x compilers.
+  nats = addBuildDepend super.nats self.hashable;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 36062652b1f..0e4fd3cc5d1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -33,116 +33,9 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # should be fixed in versions > 0.6
-  pandoc-citeproc = overrideCabal super.pandoc-citeproc (drv: {
-    patches = [
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/4e4f9c2.patch";
-         sha256 = "18b08k56g5q4zz6jxczkrddblyn52vmd0811n1icfdpzqhgykn4p";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/34cc147.patch";
-         sha256 = "09vrdvg5w14qckn154zlxvk6i2ikmmhpsl9mxycxkql3rl4dqam3";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/8242c70.patch";
-         sha256 = "1lqpwxzz2www81w4mym75z36bsavqfj67hyvzn20ffvxq42yw7ry";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/e59f88d.patch";
-         sha256 = "05699hj3qa2vrfdnikj7rzmc2ajrkd7p8yd4cjlhmqq9asq90xzb";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/ae6ca86.patch";
-         sha256 = "19cag39k5s7iqagpvss9c2ny5g0lwnrawaqcc0labihc1a181k8l";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/f5a9fc7.patch";
-         sha256 = "08lsinh3mkjpz3cqj5i1vcnzkyl07jp38qcjcwcw7m2b7gsjbpvm";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc-citeproc/commit/780a554.patch";
-         sha256 = "1kfn0mcp3vp32c9w8gyz0p0jv0xn90as9mxm8a2lmjng52jlzvy4";
-      })
-   ];
-  });
-
-  # should be fixed in versions > 1.13.2
-  pandoc = overrideCabal super.pandoc (drv: {
-    patches = [
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/693f9ab.patch";
-         sha256 = "1niyrigs47ia1bhk6yrnzf0sq7hz5b7xisc8ph42wkp5sl8x9h1y";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/9c68017.patch";
-         sha256 = "0zccb6l5vmfyq7p8ii88fgggfhrff32hj43f5pp3w88l479f1qlh";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/dbe1b38.patch";
-         sha256 = "0d80692liyjx2y56w07k23adjcxb57w6vzcylmc4cfswzy8agrgy";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/5ea3856.patch";
-         sha256 = "1z15lc0ix9fv278v1xmfw3a6gl85ydahgs8kz61sfvh4jdiacabw";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/c80c9ac.patch";
-         sha256 = "0fk3j53zx0x88jmh0ism0aghs2w5qf87zcp9cwbfcgg5izh3b344";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/8b9bded.patch";
-         sha256 = "0f1dh1jmhq55mlv4dawvx3ck330y82qmys06bfkqcpl0jsyd9x1a";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/e4c7894.patch";
-         sha256 = "1rfdaq6swrl3m9bmbf6yhqq57kv3l3f4927xya3zq29dpvkmmi4z";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/2a6f68f.patch";
-         sha256 = "0sbh2x9jqvis9ln8r2dr6ihkjdn480mjskm4ny91870vg852228c";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/4e3281c.patch";
-         sha256 = "0zafhxxijli2mf1h0j7shp7kd7fxqbvlswm1m8ikax3aknvjxymi";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/cd5b1fe.patch";
-         sha256 = "0nxq7c0gpdiycgdrcj3llbfwxdni6k7hqqniwsbn2ha3h03i8hg1";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/ed7606d.patch";
-         sha256 = "0gchm46ziyj7vw6ibn3kk49cjzsc78z2lm8k7892g79q2livlc1f";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/b748833.patch";
-         sha256 = "03gj4qn9c5zyqrxyrw4xh21xlvbx9rbvw6gh8msgf5xk53ibs68b";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/10d5398.patch";
-         sha256 = "1nhp5b07vywk917bfap6pzahhqnwvvlbbfg5336a2nvb0c8iq6ih";
-      })
-      (pkgs.fetchpatch {
-         url = "https://github.com/jgm/pandoc/commit/f18ceb1.patch";
-         sha256 = "1vxsy5fn4nscvim9wcx1n78q7yh05x0z8p812csi3v3z79lbabhq";
-      })
-    ];
-    # jailbreak-cabal omits part of the file
-    # https://github.com/peti/jailbreak-cabal/issues/9
-    postPatch = ''
-      sed -i '420i\ \ \ \ \ \ \ \ \ \ \ \ buildable: False' pandoc.cabal
-    '';
-  });
-
-  # see: https://github.com/jaspervdj/hakyll/issues/343
-  hakyll = overrideCabal super.hakyll (drv: {
-    buildDepends = drv.buildDepends ++ [ self.time-locale-compat ];
-    patches = [
-      (pkgs.fetchpatch {
-         url = "https://github.com/jaspervdj/hakyll/pull/344.patch";
-         sha256 = "130c0icw3cj209p219siaq0n8avmm0fpmph0iyjgx67w62sffrli";
-      })
-    ];
+  # ekmett/linear#74
+  linear = overrideCabal super.linear (drv: {
+    prePatch = "sed -i 's/-Werror//g' linear.cabal";
   });
 
   # Cabal_1_22_1_1 requires filepath >=1 && <1.4
@@ -157,18 +50,15 @@ self: super: {
   # https://ghc.haskell.org/trac/ghc/ticket/9921
   mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; });
 
+  Extra = appendPatch super.Extra (pkgs.fetchpatch {
+    url = "https://github.com/seereason/sr-extra/commit/29787ad4c20c962924b823d02a7335da98143603.patch";
+    sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f";
+  });
+
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
   bytestring-builder = dontHaddock super.bytestring-builder;
 
-  # These used to be core packages in GHC 7.8.x.
-  old-locale = self.old-locale_1_0_0_7;
-  old-time = self.old-time_1_1_0_3;
-
-  # We have transformers 4.x
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
-
   # We have time 1.5
   aeson = disableCabalFlag super.aeson "old-locale";
 
@@ -185,6 +75,13 @@ self: super: {
   esqueleto = doJailbreak super.esqueleto;
   pointfree = doJailbreak super.pointfree;
 
+  # acid-state/safecopy#25 acid-state/safecopy#26
+  safecopy = dontCheck (super.safecopy);
+
+  # test suite broken, some instance is declared twice.
+  # https://bitbucket.org/FlorianHartwig/attobencode/issue/1
+  AttoBencode = dontCheck super.AttoBencode;
+
   # bos/attoparsec#92
   attoparsec = dontCheck super.attoparsec;
 
@@ -204,19 +101,9 @@ self: super: {
   # Test suite fails in "/tokens_bytestring_unicode.g.bin".
   alex = dontCheck super.alex;
 
-  # TODO: should eventually update the versions in hackage-packages.nix
-  haddock-library = overrideCabal super.haddock-library (drv: {
-    version = "1.2.0";
-    sha256 = "0kf8qihkxv86phaznb3liq6qhjs53g3iq0zkvz5wkvliqas4ha56";
-  });
-  haddock-api = overrideCabal super.haddock-api (drv: {
-    version = "2.16.0";
-    sha256 = "0hk42w6fbr6xp8xcpjv00bhi9r75iig5kp34vxbxdd7k5fqxr1hj";
-  });
-  haddock = overrideCabal super.haddock (drv: {
-    version = "2.16.0";
-    sha256 = "1afb96w1vv3gmvha2f1h3p8zywpdk8dfk6bgnsa307ydzsmsc3qa";
-  });
+  # https://github.com/haskell/haddock/issues/378
+  haddock-library_1_2_0 = dontCheck super.haddock-library_1_2_0;
+  haddock-library = self.haddock-library_1_2_0;
 
   # Upstream was notified about the over-specified constraint on 'base'
   # but refused to do anything about it because he "doesn't want to
@@ -228,31 +115,29 @@ self: super: {
     sha256 = "1lwwvxyhxcmppdapbgpfhwi7xc2z78qir03xjrpzab79p2qyq7br";
   });
 
-  wl-pprint = overrideCabal super.wl-pprint (drv: {
-    postPatch = "sed -i '113iimport Prelude hiding ((<$>))' Text/PrettyPrint/Leijen.hs";
-    jailbreak = true;
-  });
-
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 
   # Until the changes have been pushed to Hackage
-  mono-traversable = appendPatch super.mono-traversable (pkgs.fetchpatch {
-    url = "https://github.com/snoyberg/mono-traversable/pull/68.patch";
-    sha256 = "11hqf6hi3sc34wl0fn4rpigdf7wfklcjv6jwp8c3129yphg8687h";
-  });
-  conduit-combinators = appendPatch super.conduit-combinators (pkgs.fetchpatch {
-    url = "https://github.com/fpco/conduit-combinators/pull/16.patch";
-    sha256 = "0jpwpi3shdn5rms3lcr4srajbhhfp5dbwy7pl23c9kmlil3d9mk3";
-  });
-  annotated-wl-pprint = appendPatch super.annotated-wl-pprint (pkgs.fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/david-christiansen/annotated-wl-pprint/pull/2.patch";
-    sha256 = "0n0fbq3vd7b9kfmhg089q0dy40vawq4q88il3zc9ybivhi62nwv4";
-  });
   ghc-events = appendPatch super.ghc-events (pkgs.fetchpatch {
     url = "https://patch-diff.githubusercontent.com/raw/haskell/ghc-events/pull/8.patch";
     sha256 = "1k881jrvzfvs761jgfhf5nsbmbc33c9333l4s0f5088p46ff2n1l";
   });
+  dependent-sum-template = appendPatch super.dependent-sum-template (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/mokus0/dependent-sum-template/pull/4.patch";
+    sha256 = "1yb1ny4ckl4d3sf4xnvpbsa9rw2dficzgipijs5s3729dnsc3rb0";
+  });
+  mueval = appendPatch super.mueval (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/gwern/mueval/pull/10.patch";
+    sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74";
+  });
+  present = appendPatch super.present (pkgs.fetchpatch {
+    url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch";
+    sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8";
+  });
+
+  # Already applied in darcs repository.
+  gnuplot = appendPatch super.gnuplot ./gnuplot-fix-new-time.patch;
 
   ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
     pname = "ghcjs-prim";
@@ -265,4 +150,188 @@ self: super: {
     buildDepends = [ primitive ];
     license = pkgs.stdenv.lib.licenses.bsd3;
   }) {};
+
+  # diagrams/monoid-extras#19
+  monoid-extras = overrideCabal super.monoid-extras (drv: {
+    prePatch = "sed -i 's|4\.8|4.9|' monoid-extras.cabal";
+  });
+
+  # diagrams/statestack#5
+  statestack = overrideCabal super.statestack (drv: {
+    prePatch = "sed -i 's|4\.8|4.9|' statestack.cabal";
+  });
+
+  # diagrams/diagrams-core#83
+  diagrams-core = overrideCabal super.diagrams-core (drv: {
+    prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal";
+  });
+
+  # https://github.com/mokus0/misfortune/pull/1
+  misfortune = appendPatch super.misfortune (pkgs.fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/mokus0/misfortune/pull/1.patch";
+    sha256 = "15frwdallm3i6k7mil26bbjd4wl6k9h20ixf3cmyris3q3jhlcfh";
+  });
+
+  timezone-series = doJailbreak super.timezone-series;
+  timezone-olson = doJailbreak super.timezone-olson;
+  libmpd = dontCheck super.libmpd;
+  xmonad-extras = overrideCabal super.xmonad-extras (drv: {
+    postPatch = ''
+      sed -i -e "s,<\*,<¤,g" XMonad/Actions/Volume.hs
+    '';
+  });
+
+  # Workaround for a workaround, see comment for "ghcjs" flag.
+  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
+            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
+                                          self.webkitgtk3-javascriptcore ];
+
+  # Fix evaluation in GHC >=7.8: https://github.com/lambdabot/lambdabot/issues/116
+  lambdabot = appendPatch super.lambdabot ./lambdabot-fix-ghc78.patch;
+
+  # https://github.com/haskell-infra/hackage-trustees/issues/24
+  brainfuck = appendPatch super.brainfuck ./brainfuck-fix-ghc710.patch;
+  unlambda = appendPatch super.unlambda ./unlambda-fix-ghc710.patch;
+
+  # Updated Cabal file from Hackage tightened version bounds for some reason.
+  edit-distance = let pkg = appendPatch super.edit-distance ./edit-distance-fix-boundaries.patch;
+                  in appendPatch pkg (pkgs.fetchpatch {
+                    url = "https://patch-diff.githubusercontent.com/raw/batterseapower/edit-distance/pull/3.patch";
+                    sha256 = "0v47pa5ymh9f23bqpkdv3k7vnb6h3ssccdmjdylhs2ybarqzrcwh";
+                  });
+
+  # https://github.com/BNFC/bnfc/issues/137
+  BNFC = markBrokenVersion "2.7.1" super.BNFC;
+  cubical = dontDistribute super.cubical;
+
+  # contacted maintainer by e-mail
+  HList = markBrokenVersion "0.3.4.1" super.HList;
+  AspectAG = dontDistribute super.AspectAG;
+  Rlang-QQ = dontDistribute super.Rlang-QQ;
+  SyntaxMacros = dontDistribute super.SyntaxMacros;
+  expand = dontDistribute super.expand;
+  functional-arrow = dontDistribute super.functional-arrow;
+  guess-combinator = dontDistribute super.guess-combinator;
+  ihaskell-rlangqq = dontDistribute super.ihaskell-rlangqq;
+  ipopt-hs = dontDistribute super.ipopt-hs;
+  murder = dontDistribute super.murder;
+  netcore = dontDistribute super.netcore;
+  nettle-frp = dontDistribute super.nettle-frp;
+  nettle-netkit = dontDistribute super.nettle-netkit;
+  nettle-openflow = dontDistribute super.nettle-openflow;
+  oberon0 = dontDistribute super.oberon0;
+  poly-arity = dontDistribute super.poly-arity;
+  respond = dontDistribute super.respond;
+  semi-iso = dontDistribute super.semi-iso;
+  syntax = dontDistribute super.syntax;
+  syntax-attoparsec = dontDistribute super.syntax-attoparsec;
+  syntax-example = dontDistribute super.syntax-example;
+  syntax-example-json = dontDistribute super.syntax-example-json;
+  syntax-pretty = dontDistribute super.syntax-pretty;
+  syntax-printer = dontDistribute super.syntax-printer;
+  tuple-hlist = dontDistribute super.tuple-hlist;
+  tuple-morph = dontDistribute super.tuple-morph;
+
+  # contacted maintainer by e-mail
+  cmdlib = markBroken super.cmdlib;
+  darcs-fastconvert = dontDistribute super.darcs-fastconvert;
+  ivory-backend-c = dontDistribute super.ivory-backend-c;
+  ivory-bitdata = dontDistribute super.ivory-bitdata;
+  ivory-examples = dontDistribute super.ivory-examples;
+  ivory-hw = dontDistribute super.ivory-hw;
+  laborantin-hs = dontDistribute super.laborantin-hs;
+
+  # https://github.com/cartazio/arithmoi/issues/1
+  arithmoi = markBroken super.arithmoi;
+  NTRU = dontDistribute super.NTRU;
+  arith-encode = dontDistribute super.arith-encode;
+  barchart = dontDistribute super.barchart;
+  constructible = dontDistribute super.constructible;
+  cyclotomic = dontDistribute super.cyclotomic;
+  diagrams = dontDistribute super.diagrams;
+  diagrams-contrib = dontDistribute super.diagrams-contrib;
+  enumeration = dontDistribute super.enumeration;
+  ghci-diagrams = dontDistribute super.ghci-diagrams;
+  ihaskell-diagrams = dontDistribute super.ihaskell-diagrams;
+  nimber = dontDistribute super.nimber;
+  pell = dontDistribute super.pell;
+  quadratic-irrational = dontDistribute super.quadratic-irrational;
+
+  # https://github.com/kazu-yamamoto/ghc-mod/issues/467
+  ghc-mod = markBroken super.ghc-mod;
+  HaRe = dontDistribute super.HaRe;
+  ghc-imported-from = dontDistribute super.ghc-imported-from;
+  git-vogue = dontDistribute super.git-vogue;
+  haskell-token-utils = dontDistribute super.haskell-token-utils;
+  hbb = dontDistribute super.hbb;
+  hsdev = dontDistribute super.hsdev;
+
+  # http://hub.darcs.net/ivanm/graphviz/issue/5
+  graphviz = markBroken super.graphviz;
+  Graphalyze = dontDistribute super.Graphalyze;
+  HLearn-approximation = dontDistribute super.HLearn-approximation;
+  HLearn-classification = dontDistribute super.HLearn-classification;
+  HLearn-distributions = dontDistribute super.HLearn-distributions;
+  SourceGraph = dontDistribute super.SourceGraph;
+  Zora = dontDistribute super.Zora;
+  ampersand = dontDistribute super.ampersand;
+  caffegraph = dontDistribute super.caffegraph;
+  dot2graphml = dontDistribute super.dot2graphml;
+  dvda = dontDistribute super.dvda;
+  erd = dontDistribute super.erd;
+  filediff = dontDistribute super.filediff;
+  fsmActions = dontDistribute super.fsmActions;
+  gbu = dontDistribute super.gbu;
+  geni-gui = dontDistribute super.geni-gui;
+  ghc-vis = dontDistribute super.ghc-vis;
+  grammar-combinators = dontDistribute super.grammar-combinators;
+  llvm-analysis = dontDistribute super.llvm-analysis;
+  llvm-base-types = dontDistribute super.llvm-base-types;
+  llvm-data-interop = dontDistribute super.llvm-data-interop;
+  llvm-tools = dontDistribute super.llvm-tools;
+  marxup = dontDistribute super.marxup;
+  mathgenealogy = dontDistribute super.mathgenealogy;
+  optimusprime = dontDistribute super.optimusprime;
+  phybin = dontDistribute super.phybin;
+  prolog-graph = dontDistribute super.prolog-graph;
+  prolog-graph-lib = dontDistribute super.prolog-graph-lib;
+  teams = dontDistribute super.teams;
+  vacuum-graphviz = dontDistribute super.vacuum-graphviz;
+  vampire = dontDistribute super.vampire;
+  visual-graphrewrite = dontDistribute super.visual-graphrewrite;
+  xdot = dontDistribute super.xdot;
+
+  # https://github.com/lymar/hastache/issues/47
+  hastache = dontCheck super.hastache;
+
+  # The compat library is empty in the presence of mtl 2.2.x.
+  mtl-compat = dontHaddock super.mtl-compat;
+
+  # https://github.com/bos/bloomfilter/issues/11
+  bloomfilter = dontHaddock (appendConfigureFlag super.bloomfilter "--ghc-option=-XFlexibleContexts");
+
+  # https://github.com/ocharles/tasty-rerun/issues/5
+  tasty-rerun = dontHaddock (appendConfigureFlag super.tasty-rerun "--ghc-option=-XFlexibleContexts");
+
+  # Broken with GHC 7.10.x.
+  aeson_0_7_0_6 = markBroken super.aeson_0_7_0_6;
+  annotated-wl-pprint_0_5_3 = markBroken super.annotated-wl-pprint_0_5_3;
+  c2hs_0_20_1 = markBroken super.c2hs_0_20_1;
+  Cabal_1_20_0_3 = markBroken super.Cabal_1_20_0_3;
+  cabal-install_1_18_0_8 = markBroken super.cabal-install_1_18_0_8;
+  containers_0_4_2_1 = markBroken super.containers_0_4_2_1;
+  control-monad-free_0_5_3 = markBroken super.control-monad-free_0_5_3;
+  equivalence_0_2_5 = markBroken super.equivalence_0_2_5;
+  haddock-api_2_15_0_2 = markBroken super.haddock-api_2_15_0_2;
+  lens_4_7_0_1 = markBroken super.lens_4_7_0_1;
+  optparse-applicative_0_10_0 = markBroken super.optparse-applicative_0_10_0;
+  QuickCheck_1_2_0_1 = markBroken super.QuickCheck_1_2_0_1;
+  seqid-streams_0_1_0 = markBroken super.seqid-streams_0_1_0;
+  vector_0_10_9_3 = markBroken super.vector_0_10_9_3;
+
+  # https://github.com/bos/wreq/issues/61
+  wreq = markBrokenVersion "0.3.0.1" (dontCheck super.wreq);
+  wreq-sb = dontDistribute (dontCheck super.wreq-sb);
+  hipbot = dontDistribute super.hipbot;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 8428af7ca6e..49296fa04df 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -39,17 +39,15 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };
+  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; process = self.process_1_2_3_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -63,4 +61,7 @@ self: super: {
   # Setup: Can't find transitive deps for haddock
   doctest = dontHaddock super.doctest;
 
+  # Needs hashable on pre 7.10.x compilers.
+  nats = addBuildDepend super.nats self.hashable;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index fd4109fad72..a00b89e5b4e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -36,17 +36,15 @@ self: super: {
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; };
+  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -66,4 +64,10 @@ self: super: {
   # Choose appropriate flags for our version of 'bytestring'.
   bytestring-builder = disableCabalFlag super.bytestring-builder "bytestring_has_builder";
 
+  # Newer versions require a more recent compiler.
+  control-monad-free = super.control-monad-free_0_5_3;
+
+  # Needs hashable on pre 7.10.x compilers.
+  nats = addBuildDepend super.nats self.hashable;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 5285484d2ff..50f9585f505 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -33,23 +33,20 @@ self: super: {
   time = null;
   unix = null;
 
-  # transformers is not a core library for this compiler.
-  transformers = self.transformers_0_4_3_0;
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
-
-  # haskeline and terminfo are not core libraries for this compiler.
+  # These packages are core libraries in GHC 7.10.x, but not here.
   haskeline = self.haskeline_0_7_2_1;
   terminfo = self.terminfo_0_4_0_1;
+  transformers = self.transformers_0_4_3_0;
+  xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_2_0 = super.Cabal_1_22_2_0.override { binary = self.binary_0_7_4_0; };
+  Cabal_1_22_3_0 = super.Cabal_1_22_3_0.override { binary = self.binary_0_7_4_0; };
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_18_1_6; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -73,4 +70,10 @@ self: super: {
   # The compat library is empty in the presence of mtl 2.2.x.
   mtl-compat = dontHaddock super.mtl-compat;
 
+  # Newer versions require a more recent compiler.
+  control-monad-free = super.control-monad-free_0_5_3;
+
+  # Needs hashable on pre 7.10.x compilers.
+  nats = addBuildDepend super.nats self.hashable;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index c9d11ce90b3..bba72198e60 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -38,24 +38,22 @@ self: super: {
   xhtml = null;
 
   # mtl 2.2.x needs the latest transformers.
-  mtl_2_2_1 = super.mtl_2_2_1.override { transformers = self.transformers_0_4_3_0; };
+  mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; };
 
-  # Configure build for mtl 2.1.x.
+  # Configure mtl 2.1.x.
+  mtl = self.mtl_2_1_3_1;
+  transformers-compat = addBuildDepend (enableCabalFlag super.transformers-compat "three") self.mtl;
   mtl-compat = addBuildDepend (enableCabalFlag super.mtl-compat "two-point-one") self.transformers-compat;
 
   # haddock-api 2.16 requires ghc>=7.10
   haddock-api = super.haddock-api_2_15_0_2;
 
-  # Idris requires mtl 2.2.x.
-  idris = overrideCabal (super.idris.overrideScope (self: super: {
-    mkDerivation = drv: super.mkDerivation (drv // { doCheck = false; });
-    blaze-markup = self.blaze-markup_0_6_2_0;
+  # Idris needs special version of some libraries
+  idris = let super1 = super; in overrideCabal (super.idris.overrideScope (self: super: {
+    annotated-wl-pprint = self.annotated-wl-pprint_0_5_3;
     blaze-html = self.blaze-html_0_7_0_3;
-    haskeline = self.haskeline_0_7_2_1;
+    blaze-markup = self.blaze-markup_0_6_2_0;
     lens = self.lens_4_7_0_1;
-    mtl = super.mtl_2_2_1;
-    transformers = super.transformers_0_4_3_0;
-    transformers-compat = disableCabalFlag super.transformers-compat "three";
   })) (drv: {
     patchPhase = "find . -name '*.hs' -exec sed -i -s 's|-Werror||' {} +";
   });                           # warning: "Module ‘Control.Monad.Error’ is deprecated"
@@ -120,4 +118,18 @@ self: super: {
   # Newer versions require base > 4.7
   gloss = super.gloss_1_9_2_1;
 
+  # Workaround for a workaround, see comment for "ghcjs" flag.
+  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
+            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
+                                          self.webkitgtk3-javascriptcore ];
+
+  # Fix evaluation in GHC >=7.8: https://github.com/lambdabot/lambdabot/issues/116
+  lambdabot = appendPatch super.lambdabot ./lambdabot-fix-ghc78.patch;
+
+  # Needs hashable on pre 7.10.x compilers.
+  nats = addBuildDepend super.nats self.hashable;
+
+  # needs mtl-compat to build with mtl 2.1.x
+  cgi = addBuildDepend super.cgi self.mtl-compat;
+
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 47b450afc4e..cef72a2b188 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -43,14 +43,6 @@ self: super: {
   # haddock: No input file(s).
   nats = dontHaddock super.nats;
 
-  # These used to be core packages in GHC 7.8.x.
-  old-locale = self.old-locale_1_0_0_7;
-  old-time = self.old-time_1_1_0_3;
-
-  # We have transformers 4.x
-  mtl = self.mtl_2_2_1;
-  transformers-compat = disableCabalFlag super.transformers-compat "three";
-
   # We have time 1.5
   aeson = disableCabalFlag super.aeson "old-locale";
 
@@ -81,8 +73,12 @@ self: super: {
   # Version 1.19.5 fails its test suite.
   happy = dontCheck super.happy;
 
-  # Test suite hangs silently without consuming any CPU.
-  # https://github.com/ndmitchell/extra/issues/4
-  extra = dontCheck super.extra;
+  # Workaround for a workaround, see comment for "ghcjs" flag.
+  jsaddle = let jsaddle' = disableCabalFlag super.jsaddle "ghcjs";
+            in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3
+                                          self.webkitgtk3-javascriptcore ];
+
+  # The compat library is empty in the presence of mtl 2.2.x.
+  mtl-compat = dontHaddock super.mtl-compat;
 
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index aa872a950fc..e880f7e713e 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -71,7 +71,7 @@ self: super: {
       cat >> src/Reactive/Banana/Switch.hs <<EOF
       instance Functor (AnyMoment Identity) where
         fmap = liftM
-        
+
       instance Applicative (AnyMoment Identity) where
         pure = return
         (<*>) = ap
@@ -98,4 +98,5 @@ self: super: {
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
     buildDepends = [ self.base self.mtl self.text self.ghcjs-base ];
   });
+
 }
diff --git a/pkgs/development/haskell-modules/dyre-nix.patch b/pkgs/development/haskell-modules/dyre-nix.patch
new file mode 100644
index 00000000000..458e540e0c4
--- /dev/null
+++ b/pkgs/development/haskell-modules/dyre-nix.patch
@@ -0,0 +1,25 @@
+--- dyre-0.8.12/Config/Dyre/Compile.hs	2015-04-13 11:00:20.794278350 +0100
++++ dyre-0.8.12-patched/Config/Dyre/Compile.hs	2015-04-13 11:07:26.938893502 +0100
+@@ -10,11 +10,13 @@
+ import System.FilePath   ( (</>) )
+ import System.Directory  ( getCurrentDirectory, doesFileExist
+                          , createDirectoryIfMissing )
++import System.Environment ( lookupEnv )
++import Control.Applicative ((<$>))
+ import Control.Exception ( bracket )
+-import GHC.Paths         ( ghc )
+ 
+ import Config.Dyre.Paths  ( getPaths )
+ import Config.Dyre.Params ( Params(..) )
++import Data.Maybe         ( fromMaybe )
+ 
+ -- | Return the path to the error file.
+ getErrorPath :: Params cfgType -> IO FilePath
+@@ -47,6 +49,7 @@
+     errFile <- getErrorPath params
+     result <- bracket (openFile errFile WriteMode) hClose $ \errHandle -> do
+         ghcOpts <- makeFlags params configFile tempBinary cacheDir libsDir
++        ghc <- fromMaybe "ghc" <$> lookupEnv "NIX_GHC"
+         ghcProc <- runProcess ghc ghcOpts (Just cacheDir) Nothing
+                               Nothing Nothing (Just errHandle)
+         waitForProcess ghcProc
diff --git a/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch b/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch
new file mode 100644
index 00000000000..ec88c65f8bc
--- /dev/null
+++ b/pkgs/development/haskell-modules/edit-distance-fix-boundaries.patch
@@ -0,0 +1,30 @@
+diff -ru3 edit-distance-0.2.1.2-old/edit-distance.cabal edit-distance-0.2.1.2/edit-distance.cabal
+--- edit-distance-0.2.1.2-old/edit-distance.cabal	2015-04-17 22:46:50.964116064 +0300
++++ edit-distance-0.2.1.2/edit-distance.cabal	2015-04-17 22:41:31.216027373 +0300
+@@ -36,7 +36,7 @@
+                                 Text.EditDistance.ArrayUtilities

+         

+         if flag(splitBase)

+-                Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0, containers >= 0.1.0.1

++                Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0, containers >= 0.1.0.1

+         else

+                 Build-Depends:  base < 3

+         

+@@ -54,7 +54,7 @@
+         else            

+                 Build-Depends:          test-framework >= 0.1.1, QuickCheck >= 1.1 && < 2.0, test-framework-quickcheck

+                 if flag(splitBase)

+-                        Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0

++                        Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0

+                 else

+                         Build-Depends:  base < 3

+ 

+@@ -65,7 +65,7 @@
+                 Buildable:      False

+         else

+                 if flag(splitBase)

+-                        Build-Depends:  base >= 3 && < 4.8, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0,

++                        Build-Depends:  base >= 3 && < 5, array >= 0.1, random >= 1.0, time >= 1.0, process >= 1.0,

+                                         deepseq >= 1.2, unix >= 2.3, criterion >= 0.6

+                 else

+                         Build-Depends:  base < 3,

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index baefedf5a74..15894034819 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -137,10 +137,12 @@ stdenv.mkDerivation ({
   prePatch = optionalString (editedCabalFile != null) ''
     echo "Replace Cabal file with edited version from ${newCabalFileUrl}."
     cp ${newCabalFile} ${pname}.cabal
-  '' + optionalString jailbreak ''
+  '' + prePatch;
+
+  postPatch = optionalString jailbreak ''
     echo "Run jailbreak-cabal to lift version restrictions on build inputs."
     ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
-  '' + prePatch;
+  '' + postPatch;
 
   setupCompilerEnvironmentPhase = ''
     runHook preSetupCompilerEnvironment
diff --git a/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch b/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch
new file mode 100644
index 00000000000..1b4a60e5941
--- /dev/null
+++ b/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch
@@ -0,0 +1,60 @@
+diff -ru3 gnuplot-0.5.3.1-old/gnuplot.cabal gnuplot-0.5.3.1/gnuplot.cabal
+--- gnuplot-0.5.3.1-old/gnuplot.cabal	2015-04-17 22:25:06.561715968 +0300
++++ gnuplot-0.5.3.1/gnuplot.cabal	2015-04-17 22:27:07.610913755 +0300
+@@ -75,7 +75,7 @@
+ 
+ Library
+   Build-Depends:
+-    filepath >=1.1 && <1.4,
++    filepath >=1.1 && <1.5,
+     temporary >=1.1 && <1.3,
+     array >=0.1 && <0.6,
+     containers >=0.1 && <0.6,
+@@ -83,12 +83,11 @@
+     data-accessor-transformers >=0.2.1 && <0.3,
+     data-accessor >=0.2.2 && <0.3,
+     transformers >=0.3 && <0.5,
+-    deepseq >=1.0 && <1.4
++    deepseq >=1.0 && <1.5
+   If flag(splitBase)
+     Build-Depends:
+-      process >=1.0,
+-      time >=1.1,
+-      old-locale >=1.0,
++      process >=1.0 && <1.3,
++      time >=1.1 && <1.6,
+       base >=2 && <5
+   Else
+     Build-Depends:
+diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs
+--- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs	2015-04-17 22:25:06.560715975 +0300
++++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs	2015-04-17 22:27:49.872542430 +0300
+@@ -1,7 +1,6 @@
+ module Graphics.Gnuplot.Time where
+ 
+-import System.Locale (defaultTimeLocale, )
+-import Data.Time.Format (FormatTime, formatTime, )
++import Data.Time.Format (FormatTime, formatTime, defaultTimeLocale, )
+ import Data.Tuple.HT (mapFst, )
+ 
+ {- |
+diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs
+--- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs	2015-04-17 22:25:06.560715975 +0300
++++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs	2015-04-17 22:28:24.426238829 +0300
+@@ -9,7 +9,6 @@
+    ColumnCount(ColumnCount),
+    ) where
+ 
+-import System.Locale (defaultTimeLocale, )
+ import qualified Data.Time as Time
+ 
+ import Data.Word (Word8, Word16, Word32, Word64, )
+@@ -82,7 +81,7 @@
+ instance C Time.Day where
+    text d = text $ Time.UTCTime d 0
+ instance C Time.UTCTime where
+-   text = singleton . showString . Time.formatTime defaultTimeLocale "%s"
++   text = singleton . showString . Time.formatTime Time.defaultTimeLocale "%s"
+ 
+ 
+ instance (C a, C b) => C (a,b) where
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 90e2c21aec1..04293b81fe7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17,6 +17,7 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples";
        description = "Examples of 3D graphics programming with OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "3dmodels" = callPackage
@@ -144,6 +145,7 @@ self: {
        buildDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-PPM" = callPackage
@@ -227,6 +229,7 @@ self: {
        homepage = "http://alkalisoftware.net";
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ADPfusion" = callPackage
@@ -414,6 +417,7 @@ self: {
        homepage = "http://src.seereason.com/haskell-agi";
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ALUT" = callPackage
@@ -516,6 +520,7 @@ self: {
        version = "1.0";
        sha256 = "17rp4v5ibna9fplm526x31k8df8zwkm1imv71yqzpgcqcn48pps2";
        buildDepends = [ AbortT-transformers base mtl ];
+       jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-mtl";
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -534,6 +539,7 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-transformers";
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -572,6 +578,7 @@ self: {
        buildDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Adaptive-Blaisorblade" = callPackage
@@ -585,6 +592,7 @@ self: {
        buildDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Advgame" = callPackage
@@ -670,6 +678,7 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) emacs;};
 
   "Agda-executable" = callPackage
@@ -685,6 +694,7 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "Command-line program for type-checking and compiling Agda programs";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AhoCorasick" = callPackage
@@ -698,6 +708,7 @@ self: {
        homepage = "http://github.com/lymar/AhoCorasick";
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AlgorithmW" = callPackage
@@ -709,6 +720,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base containers mtl pretty ];
+       jailbreak = true;
        homepage = "http://hackage.haskell.org/package/AlgorithmW";
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
@@ -720,8 +732,8 @@ self: {
      }:
      mkDerivation {
        pname = "Allure";
-       version = "0.4.100.0";
-       sha256 = "15rkj5xab23wqr2d44xbri7hggbb3zmmka41xfiscqq4ifagfj4m";
+       version = "0.4.101.1";
+       sha256 = "1wla31n3jiynjb2fk22shq46g365x6il270jqpy234vjz308sdvw";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -734,7 +746,8 @@ self: {
        ];
        homepage = "http://allureofthestars.com";
        description = "Near-future Sci-Fi roguelike and tactical squad game";
-       license = "AGPL";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -829,6 +842,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ApproxFun-hs" = callPackage
+    ({ mkDerivation, base, vector }:
+     mkDerivation {
+       pname = "ApproxFun-hs";
+       version = "0.1.0.0";
+       sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy";
+       buildDepends = [ base vector ];
+       jailbreak = true;
+       homepage = "https://github.com/idontgetoutmuch/ApproxFun.hs";
+       description = "Function approximation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ArrayRef" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -853,6 +879,7 @@ self: {
        homepage = "https://github.com/frosch03/arrowVHDL";
        description = "A library to generate Netlist code from Arrow descriptions";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AspectAG" = callPackage
@@ -860,12 +887,14 @@ self: {
      mkDerivation {
        pname = "AspectAG";
        version = "0.3.6.1";
+       revision = "1";
        sha256 = "01pglvf38v5ii2w03kdlgngxbb3ih0j5bsilv5qwc9vrh2iwirhf";
+       editedCabalFile = "d5b68030eaf2111998f6d5774a1d26d5afb685fe6b087fe1aed7ef90084a0070";
        buildDepends = [ base containers HList mtl template-haskell ];
+       jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
        description = "Attribute Grammars in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AttoBencode" = callPackage
@@ -921,6 +950,7 @@ self: {
        homepage = "http://patch-tag.com/r/rhz/StrangeAttractors";
        description = "Visualisation of Strange Attractors in 3-Dimensions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Aurochs" = callPackage
@@ -934,6 +964,7 @@ self: {
        buildDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AutoForms" = callPackage
@@ -976,6 +1007,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "BCMtools" = callPackage
+    ({ mkDerivation, base, binary, bytestring, bytestring-lexing
+     , colour, conduit, conduit-extra, data-binary-ieee754
+     , data-default-class, matrices, optparse-applicative, resourcet
+     , split, transformers, unordered-containers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "BCMtools";
+       version = "0.1.0";
+       sha256 = "1rql6xxa6lddb2ngvbnicz6gsd17m5l7yqxfpm242s1crhqmxajg";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base binary bytestring bytestring-lexing colour conduit
+         conduit-extra data-binary-ieee754 data-default-class matrices
+         optparse-applicative resourcet split transformers
+         unordered-containers vector zlib
+       ];
+       description = "Big Contact Map Tools";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "BNFC" = callPackage
     ({ mkDerivation, alex, array, base, containers, deepseq, directory
      , doctest, filepath, happy, hspec, HUnit, mtl, pretty, process
@@ -1012,6 +1065,7 @@ self: {
          alex-meta array base happy-meta haskell-src-meta syb
          template-haskell
        ];
+       jailbreak = true;
        description = "Deriving Parsers and Quasi-Quoters from BNF Grammars";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1030,6 +1084,7 @@ self: {
        homepage = "http://pageperso.lif.univ-mrs.fr/~pierre-etienne.meunier/Baggins";
        description = "Tools for self-assembly";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Bang" = callPackage
@@ -1041,6 +1096,7 @@ self: {
        version = "0.1.1.0";
        sha256 = "1y68k1xsx2fksz70z5b8wdf5brk3vqsc6sih2asp4f97nwlkm5fw";
        buildDepends = [ base bifunctors hmidi mtl stm time transformers ];
+       jailbreak = true;
        homepage = "https://github.com/5outh/Bang/";
        description = "A Drum Machine DSL for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -1412,18 +1468,18 @@ self: {
      }) {};
 
   "BlastHTTP" = callPackage
-    ({ mkDerivation, base, biocore, blastxml, bytestring, conduit, HTTP
-     , http-conduit, hxt, mtl, network, transformers
+    ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring
+     , conduit, HTTP, http-conduit, hxt, mtl, network, transformers
      }:
      mkDerivation {
        pname = "BlastHTTP";
-       version = "1.0.1";
-       revision = "2";
-       sha256 = "1qxf2lqsbwmfqkzabx8qpavf3da4lq3j1v1rdsv42gl27lqhbayi";
-       editedCabalFile = "e182e8cb8b1fdcff3f5cd8ba3e46f371f98ac55a3d2738061a6ab78aba52b308";
+       version = "1.2.0";
+       revision = "1";
+       sha256 = "0vhnwjgamc1zry8w7m6jb7ambz3lqqr00j05xymzwcapgwg8v9b5";
+       editedCabalFile = "7076650ad04d2c5945b96ec1a8d5db8ee680314d4dc4cff54f264316e7f69bba";
        buildDepends = [
-         base biocore blastxml bytestring conduit HTTP http-conduit hxt mtl
-         network transformers
+         base biocore biofasta blastxml bytestring conduit HTTP http-conduit
+         hxt mtl network transformers
        ];
        homepage = "https://github.com/eggzilla/BlastHTTP";
        description = "Libary to interface with the NCBI blast REST interface";
@@ -1474,6 +1530,7 @@ self: {
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately-diagrams" = callPackage
@@ -1492,6 +1549,7 @@ self: {
          base BlogLiterately containers diagrams-builder diagrams-cairo
          diagrams-lib directory filepath pandoc safe
        ];
+       jailbreak = true;
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1539,6 +1597,7 @@ self: {
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Boolean" = callPackage
@@ -1582,6 +1641,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "BufferedSocket" = callPackage
+    ({ mkDerivation, base, bytestring, network, text }:
+     mkDerivation {
+       pname = "BufferedSocket";
+       version = "0.1.1.0";
+       sha256 = "1j0v2g7p8fmjgcdd10wfinakiviv9r1bh3mw897gsk1h5ycbxfjg";
+       buildDepends = [ base bytestring network text ];
+       jailbreak = true;
+       description = "A socker wrapper that makes the IO of sockets much cleaner";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "Buster" = callPackage
     ({ mkDerivation, base, bytestring, conduit, data-default, errors
      , hinotify, hslogger, hspec, hspec-expectations, http-conduit
@@ -1641,6 +1712,7 @@ self: {
        homepage = "http://code.haskell.org/~dolio/CC-delcont";
        description = "Delimited continuations and dynamically scoped variables";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-alt" = callPackage
@@ -1669,6 +1741,7 @@ self: {
        buildDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-exc" = callPackage
@@ -1680,6 +1753,7 @@ self: {
        buildDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-ref" = callPackage
@@ -1691,6 +1765,7 @@ self: {
        buildDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-ref-tf" = callPackage
@@ -1702,6 +1777,7 @@ self: {
        buildDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CCA" = callPackage
@@ -1721,6 +1797,7 @@ self: {
        homepage = "not available";
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CHXHtml" = callPackage
@@ -1750,6 +1827,7 @@ self: {
        homepage = "http://www.zonetora.co.uk/clase/";
        description = "Cursor Library for A Structured Editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CLI" = callPackage
@@ -1760,6 +1838,7 @@ self: {
        sha256 = "1g271n7z6xndqylwxwcaa1xscgd36wzb2apbmrilv42v7ii4aall";
        buildDepends = [ base directory split time ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        description = "CLI tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1838,6 +1917,7 @@ self: {
        buildDepends = [ array base containers mtl parsec readline ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CSPM-CoreLanguage" = callPackage
@@ -1853,7 +1933,7 @@ self: {
 
   "CSPM-FiringRules" = callPackage
     ({ mkDerivation, base, containers, CSPM-CoreLanguage, mtl
-     , parallel-tree-search, tree-monad
+     , parallel-tree-search, QuickCheck, random, tree-monad
      }:
      mkDerivation {
        pname = "CSPM-FiringRules";
@@ -1861,8 +1941,9 @@ self: {
        sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m";
        buildDepends = [
          base containers CSPM-CoreLanguage mtl parallel-tree-search
-         tree-monad
+         QuickCheck random tree-monad
        ];
+       jailbreak = true;
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1881,6 +1962,7 @@ self: {
          syb transformers
        ];
        buildTools = [ alex ];
+       jailbreak = true;
        description = "A CSP-M parser compatible with FDR-2.91";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1914,6 +1996,7 @@ self: {
        buildDepends = [
          array base containers CSPM-Frontend ghc-prim pretty
        ];
+       jailbreak = true;
        description = "some modules specific for the ProB tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2010,6 +2093,7 @@ self: {
          process QuickCheck regex-posix test-framework test-framework-hunit
          test-framework-quickcheck2 unix
        ];
+       jailbreak = true;
        preCheck = "unset GHC_PACKAGE_PATH; export HOME=$NIX_BUILD_TOP";
        homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
@@ -2042,7 +2126,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "Cabal_1_22_2_0" = callPackage
+  "Cabal_1_22_3_0" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
      , old-time, pretty, process, QuickCheck, regex-posix
@@ -2051,8 +2135,8 @@ self: {
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "1.22.2.0";
-       sha256 = "0q46wx1nvpi0cjbs9fw0kwmbyclkkvv5zp7dcssbdl3sqg216k6z";
+       version = "1.22.3.0";
+       sha256 = "15y78hym5yfrchg0lpix80hf41l3c75rda5w1ni8irm593y7il6l";
        buildDepends = [
          array base binary bytestring containers deepseq directory filepath
          pretty process time unix
@@ -2111,6 +2195,7 @@ self: {
        homepage = "http://github.com/brinchj/cabalsearch";
        description = "Search cabal packages by name";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Capabilities" = callPackage
@@ -2188,21 +2273,21 @@ self: {
        buildDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart" = callPackage
     ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
-     , old-locale, operational, time
+     , old-locale, operational, time, vector
      }:
      mkDerivation {
        pname = "Chart";
-       version = "1.3.3";
-       sha256 = "1shq0320mc47kjbfw3vqrmjshb8fd3afd009kqxd8nn9g7m48019";
+       version = "1.4";
+       sha256 = "1pcrbsxv9n9285ihvir62znm2rqfjk913fiv1q5c8ijgjzicfnl2";
        buildDepends = [
          array base colour data-default-class lens mtl old-locale
-         operational time
+         operational time vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
@@ -2214,13 +2299,12 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-cairo";
-       version = "1.3.3";
-       sha256 = "1x1bs5xlzw91qx2rgfak1i5q15l6hij6hhir6qw7bgl57n1046ah";
+       version = "1.4";
+       sha256 = "1s407l8mnczkah708ajpp9mvra3yp2ajyczl0gf8bgd9fq23dp4f";
        buildDepends = [
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Cairo backend for Charts";
        license = stdenv.lib.licenses.bsd3;
@@ -2234,8 +2318,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-diagrams";
-       version = "1.3.3";
-       sha256 = "1bvlfy2gmv0w99jr32srdvrh7g0fzgvwhmzw8sf2iii12a7xwf56";
+       version = "1.4";
+       sha256 = "0qg8kva68394zdd8h0p8zkyjwnl2i6avl2ybr96kqr76iyh3x28k";
        buildDepends = [
          base blaze-svg bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
@@ -2245,6 +2329,7 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -2253,8 +2338,8 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.3.3";
-       sha256 = "0b8c7f2mha45iaw8vpzvhyxsqg3lrfm2cn89an27vsw9k72qric2";
+       version = "1.4";
+       sha256 = "1ig132jv3djwnd7lnizbxkwj3f1ngaj775j10vbb1dbq8x8bi2hy";
        buildDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
@@ -2276,6 +2361,7 @@ self: {
          array base cairo Chart Chart-cairo Chart-gtk colour
          data-default-class gtk mtl old-locale time
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)";
        license = stdenv.lib.licenses.bsd3;
@@ -2351,6 +2437,7 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ClassLaws" = callPackage
@@ -2408,8 +2495,8 @@ self: {
     ({ mkDerivation, base, cmdargs, parsec }:
      mkDerivation {
        pname = "ClustalParser";
-       version = "1.0.2";
-       sha256 = "0y1w2lp5kqxb9rp9rarhnqpspa64z02mbhnnvkpagi534mgnx93k";
+       version = "1.0.3";
+       sha256 = "148ibig9nlv6n4qqwch2hqikbhwhkhi2hw4f0xwkvmj3vd3ag8s2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base cmdargs parsec ];
@@ -2532,6 +2619,7 @@ self: {
          applicative-numbers base comonad containers distributive
          IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/kwf/ComonadSheet";
        description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads";
        license = stdenv.lib.licenses.bsd3;
@@ -2554,15 +2642,17 @@ self: {
        homepage = "http://alkalisoftware.net";
        description = "Concurrent utilities";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Concurrential" = callPackage
-    ({ mkDerivation, async, base }:
+    ({ mkDerivation, async, base, stm }:
      mkDerivation {
        pname = "Concurrential";
-       version = "0.1.0.0";
-       sha256 = "1fsqqc4nrfaq2r9vvvy7rjkahb92vn0bxyygbygqidbp2pbrfshi";
-       buildDepends = [ async base ];
+       version = "0.2.1.0";
+       sha256 = "09p9a1a1z8jp9152bl0cir340cv4g45dprajyrdrxqd96b6libhh";
+       buildDepends = [ async base stm ];
+       jailbreak = true;
        homepage = "http://github.com/avieth/Concurrential";
        description = "Mix concurrent and sequential computation";
        license = stdenv.lib.licenses.bsd3;
@@ -2625,6 +2715,7 @@ self: {
        buildDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Configurable" = callPackage
@@ -2677,6 +2768,7 @@ self: {
        jailbreak = true;
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Consumer" = callPackage
@@ -2689,6 +2781,7 @@ self: {
        homepage = "http://src.seereason.com/ghc6103/haskell-consumer";
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ContArrow" = callPackage
@@ -2764,6 +2857,7 @@ self: {
        homepage = "https://github.com/kevinbackhouse/Control-Monad-ST2";
        description = "A variation on the ST monad with two type parameters";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CoreErlang" = callPackage
@@ -2776,6 +2870,7 @@ self: {
        homepage = "http://github.com/amtal/CoreErlang";
        description = "Manipulating Core Erlang source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CoreFoundation" = callPackage
@@ -2813,19 +2908,20 @@ self: {
 
   "CouchDB" = callPackage
     ({ mkDerivation, base, bytestring, containers, HTTP, HUnit, json
-     , mtl, network, utf8-string
+     , mtl, network, network-uri, utf8-string
      }:
      mkDerivation {
        pname = "CouchDB";
-       version = "1.2";
-       sha256 = "0a9g0iblfyqppcy1ni3ac8f3yv5km95bfblhwqlsk6khydi5ka98";
+       version = "1.2.1";
+       sha256 = "0hj1rml9pf9knwm3grwrkizjricc7bchsi6m7dgjlfh81q247jp4";
        buildDepends = [
-         base bytestring containers HTTP json mtl network utf8-string
+         base bytestring containers HTTP json mtl network network-uri
+         utf8-string
        ];
        testDepends = [
-         base bytestring containers HTTP HUnit json mtl network utf8-string
+         base bytestring containers HTTP HUnit json mtl network network-uri
+         utf8-string
        ];
-       jailbreak = true;
        homepage = "http://github.com/arjunguha/haskell-couchdb/";
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
@@ -2841,6 +2937,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base HUnit mtl old-locale QuickCheck time ];
+       jailbreak = true;
        homepage = "http://www.haskellcraft.com/";
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
@@ -2918,8 +3015,8 @@ self: {
      }:
      mkDerivation {
        pname = "DAV";
-       version = "1.0.3";
-       sha256 = "1wrs3rdk4sarzi4w1pma8h751mjw5x1l8c6w30wv7fg0rmk2cayd";
+       version = "1.0.5";
+       sha256 = "0kfbvrkhj7dfk45q3nhpgif2glnf4ng9s5w3ljf0kijh11m39b21";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -2931,6 +3028,7 @@ self: {
        homepage = "http://floss.scru.org/hDAV";
        description = "RFC 4918 WebDAV support";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DBlimited" = callPackage
@@ -2981,6 +3079,7 @@ self: {
        homepage = "https://bitbucket.com/osu-testing/d-mucheck";
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DOM" = callPackage
@@ -3126,6 +3225,7 @@ self: {
        buildDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dao" = callPackage
@@ -3234,6 +3334,7 @@ self: {
        homepage = "http://github.com/sordina/Deadpan-DDP";
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DebugTraceHelpers" = callPackage
@@ -3345,7 +3446,9 @@ self: {
      mkDerivation {
        pname = "Diff";
        version = "0.3.1";
+       revision = "1";
        sha256 = "10saybbmd3qa4k11g0nqjfja7c87vi540y53j59778y0hhvykfif";
+       editedCabalFile = "d427dd81a963a691e4a683b78d2fd9378a8405b034210ea3423b4982237233dc";
        buildDepends = [ array base pretty ];
        description = "O(ND) diff algorithm in haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -3414,8 +3517,10 @@ self: {
          transformers unordered-containers vector wreq
        ];
        testDepends = [ base hspec lens mtl text ];
+       jailbreak = true;
        description = "A client library for the DigitalOcean API";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DimensionalHash" = callPackage
@@ -3496,6 +3601,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Dist" = callPackage
+    ({ mkDerivation, base, containers, MonadRandom }:
+     mkDerivation {
+       pname = "Dist";
+       version = "0.2.0.0";
+       sha256 = "0w9n123rngl85qsgwm0dgqnc0v8zn9lsi2v0n4hfxdvxlhcjr3ir";
+       buildDepends = [ base containers MonadRandom ];
+       testDepends = [ base containers MonadRandom ];
+       jailbreak = true;
+       homepage = "https://github.com/wyager/Dist";
+       description = "A Haskell library for probability distributions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "DistanceTransform" = callPackage
     ({ mkDerivation, base, HUnit, primitive, test-framework
      , test-framework-hunit, vector
@@ -3612,6 +3731,7 @@ self: {
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DrIFT-cabalized" = callPackage
@@ -3626,6 +3746,7 @@ self: {
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dung" = callPackage
@@ -3752,6 +3873,7 @@ self: {
        homepage = "https://github.com/zombiecalypse/DynamicTimeWarp";
        description = "Dynamic time warping of sequences";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DysFRP" = callPackage
@@ -3809,6 +3931,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Earley" = callPackage
+    ({ mkDerivation, base, containers, ListLike }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.7.0";
+       sha256 = "1jjyrf56crk4zxp7kw148969hjvl5hj248xv3495xb188s610y72";
+       buildDepends = [ base containers ListLike ];
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Ebnf2ps" = callPackage
     ({ mkDerivation, array, base, containers, directory, happy
      , old-time, unix
@@ -3824,6 +3957,7 @@ self: {
        homepage = "https://github.com/FranklinChen/Ebnf2ps";
        description = "Peter's Syntax Diagram Drawing Tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EdisonAPI" = callPackage
@@ -3850,6 +3984,7 @@ self: {
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficent, purely-functional data structures (Core Implementations)";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EditTimeReport" = callPackage
@@ -3954,6 +4089,7 @@ self: {
        homepage = "http://otakar-smrz.users.sf.net/";
        description = "Encoding character data";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EnumContainers" = callPackage
@@ -4070,6 +4206,7 @@ self: {
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -4212,6 +4349,7 @@ self: {
        homepage = "https://github.com/ddssff/haskell-extra";
        description = "A grab bag of modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FComp" = callPackage
@@ -4275,6 +4413,7 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html";
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FTGL" = callPackage
@@ -4351,6 +4490,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "FastxPipe" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring, pipes
+     , pipes-attoparsec, pipes-bytestring
+     }:
+     mkDerivation {
+       pname = "FastxPipe";
+       version = "0.2.0.0";
+       sha256 = "1img1aivadrdljsixzll3qpdzvbjqy18mcwanli6w70ch556jsa9";
+       buildDepends = [
+         attoparsec base blaze-builder bytestring pipes pipes-attoparsec
+         pipes-bytestring
+       ];
+       jailbreak = true;
+       description = "Fasta and Fastq streaming";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "FenwickTree" = callPackage
     ({ mkDerivation, base, QuickCheck, template-haskell }:
      mkDerivation {
@@ -4399,6 +4555,7 @@ self: {
        ];
        description = "Ferry Core Components";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FieldTrip" = callPackage
@@ -4448,6 +4605,7 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FilePather" = callPackage
@@ -4620,8 +4778,8 @@ self: {
      }:
      mkDerivation {
        pname = "FontyFruity";
-       version = "0.5";
-       sha256 = "162frrx0ra1pnvzrv2bmx7xv61pa9m5fbgldx0xasv8i24ccmbai";
+       version = "0.5.1.1";
+       sha256 = "064c9qq82r2kmsabciigyzp04hjqmpnc52xfshgiy77jq7k0jk2y";
        buildDepends = [
          base binary bytestring containers deepseq directory filepath text
          vector
@@ -4699,6 +4857,7 @@ self: {
        jailbreak = true;
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FpMLv53" = callPackage
@@ -4816,6 +4975,7 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
        description = "A graphical viewer for Hood";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLFW" = callPackage
@@ -4829,6 +4989,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
@@ -4885,9 +5046,11 @@ self: {
        version = "0.2.0";
        sha256 = "110iwxp6xs3wj4bva8m6mgz7iq90zrcz2dnjlq3s2x3in2m4818p";
        buildDepends = [ base GLFW monad-task OpenGL transformers ];
+       jailbreak = true;
        homepage = "http://github.com/ninegua/GLFW-task";
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLHUI" = callPackage
@@ -5085,7 +5248,6 @@ self: {
        jailbreak = true;
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ganymede" = callPackage
@@ -5131,6 +5293,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenI" = callPackage
@@ -5382,6 +5545,7 @@ self: {
        buildDepends = [ base dataenc download-curl utf8-string xml ];
        description = "Interface to Google Suggest API";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GoogleTranslate" = callPackage
@@ -5403,6 +5567,7 @@ self: {
        version = "1.0.0.1";
        sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy";
        buildDepends = [ base transformers ];
+       jailbreak = true;
        homepage = "http://github.com/gcross/GotoT-transformers";
        description = "A monad and monadic transformer providing \"goto\" functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -5446,6 +5611,7 @@ self: {
        ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GraphHammer" = callPackage
@@ -5458,6 +5624,7 @@ self: {
        buildDepends = [ array base containers Graph500 mtl stm time ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GraphHammer-examples" = callPackage
@@ -5663,6 +5830,7 @@ self: {
        homepage = "http://www.engr.uconn.edu/~jeffm/Classes/CSE240-Spring-2001/Lectures/index.html";
        description = "A simple ARM emulator in haskell";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-Data" = callPackage
@@ -5796,6 +5964,7 @@ self: {
        homepage = "http://patch-tag.com/publicrepos/HCard";
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HCodecs" = callPackage
@@ -5813,7 +5982,7 @@ self: {
 
   "HDBC" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible, mtl
-     , old-locale, old-time, text, time, utf8-string
+     , old-time, text, time, utf8-string
      }:
      mkDerivation {
        pname = "HDBC";
@@ -5822,8 +5991,8 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring containers convertible mtl old-locale old-time text
-         time utf8-string
+         base bytestring containers convertible mtl old-time text time
+         utf8-string
        ];
        homepage = "https://github.com/hdbc/hdbc";
        description = "Haskell Database Connectivity";
@@ -5861,8 +6030,8 @@ self: {
      }) { inherit (pkgs) unixODBC;};
 
   "HDBC-postgresql" = callPackage
-    ({ mkDerivation, base, bytestring, convertible, HDBC, mtl
-     , old-locale, old-time, parsec, postgresql, time, utf8-string
+    ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time
+     , parsec, postgresql, time, utf8-string
      }:
      mkDerivation {
        pname = "HDBC-postgresql";
@@ -5871,8 +6040,8 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base bytestring convertible HDBC mtl old-locale old-time parsec
-         time utf8-string
+         base bytestring convertible HDBC mtl old-time parsec time
+         utf8-string
        ];
        extraLibraries = [ postgresql ];
        homepage = "http://github.com/hdbc/hdbc-postgresql";
@@ -5910,15 +6079,16 @@ self: {
      }:
      mkDerivation {
        pname = "HDBC-sqlite3";
-       version = "2.3.3.0";
-       sha256 = "11765nsncgyv9j6r5wpziqyhy0lxrmqbhgricbdx0c788ky75y92";
+       version = "2.3.3.1";
+       sha256 = "1spbhvwwyj4q7li33kvw1bsr6m1xbnxipga67s7cdgvyf2mxk0x7";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring HDBC mtl utf8-string ];
        extraLibraries = [ sqlite ];
-       homepage = "http://software.complete.org/hdbc-sqlite3";
+       homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) sqlite;};
 
   "HDRUtils" = callPackage
@@ -5977,6 +6147,7 @@ self: {
        buildDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D" = callPackage
@@ -6335,6 +6506,7 @@ self: {
        homepage = "https://github.com/JPMoresmau/HGraphStorage";
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HHDL" = callPackage
@@ -6432,7 +6604,6 @@ self: {
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-classification" = callPackage
@@ -6455,7 +6626,6 @@ self: {
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/HLearn/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-datastructures" = callPackage
@@ -6494,7 +6664,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/HLearn/";
        description = "Distributions for use with the HLearn library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HList" = callPackage
@@ -6505,12 +6674,15 @@ self: {
      mkDerivation {
        pname = "HList";
        version = "0.3.4.1";
+       revision = "1";
        sha256 = "02hw496qv2p0nnbz7lq7jfqnis19qqjsylyvdksqbwmjprk32rh2";
+       editedCabalFile = "b3eec9db43bda99e47b409bc7f188e89899f0e13854de02674be6d0d24eef4f6";
        buildDepends = [ base ghc-prim mtl tagged template-haskell ];
        testDepends = [
          base cmdargs directory doctest filepath hspec lens mtl process syb
        ];
        buildTools = [ diffutils ];
+       jailbreak = true;
        description = "Heterogeneous lists";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) diffutils;};
@@ -6524,6 +6696,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ applicative-quoters base regex-applicative ];
+       jailbreak = true;
        homepage = "http://code.haskell.org/~aavogt/HListPP";
        description = "A preprocessor for HList labelable labels";
        license = stdenv.lib.licenses.bsd3;
@@ -6568,6 +6741,7 @@ self: {
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HNM" = callPackage
@@ -6631,6 +6805,7 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPath" = callPackage
@@ -6841,6 +7016,7 @@ self: {
        homepage = "http://github.com/mjsottile/hsgep/";
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSH" = callPackage
@@ -6908,7 +7084,6 @@ self: {
          unordered-containers vector
        ];
        testDepends = [ aeson attoparsec base HTF text ];
-       jailbreak = true;
        homepage = "https://github.com/agrafix/HSmarty";
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
@@ -6948,6 +7123,7 @@ self: {
          filepath mtl old-locale old-time parsec pretty syb template-haskell
          text time utf8-string void
        ];
+       jailbreak = true;
        description = "StringTemplate implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6985,6 +7161,7 @@ self: {
        homepage = "http://patch-tag.com/tphyahoo/r/tphyahoo/HStringTemplateHelpers";
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSvm" = callPackage
@@ -7275,7 +7452,6 @@ self: {
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX" = callPackage
@@ -7351,6 +7527,7 @@ self: {
        jailbreak = true;
        description = "An implementation of the Version Space Algebra learning framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaXml" = callPackage
@@ -7407,6 +7584,7 @@ self: {
        homepage = "http://patch-tag.com/publicrepos/Hackmail";
        description = "A Procmail Replacement as Haskell EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Haggressive" = callPackage
@@ -7458,6 +7636,7 @@ self: {
        homepage = "https://github.com/egonSchiele/HandsomeSoup";
        description = "Work with HTML more easily in HXT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HarmTrace" = callPackage
@@ -7541,6 +7720,7 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/misc-projects.html#haschoo";
        description = "Minimalist R5RS Scheme interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hashell" = callPackage
@@ -7567,8 +7747,8 @@ self: {
     ({ mkDerivation, array, base, containers, random }:
      mkDerivation {
        pname = "HaskellForMaths";
-       version = "0.4.5";
-       sha256 = "03j83gvxjjqjwl047j0acsf9j5vs3zpzbap036sw4slq31nza2p9";
+       version = "0.4.8";
+       sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j";
        buildDepends = [ array base containers random ];
        homepage = "http://haskellformaths.blogspot.com/";
        description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
@@ -7604,8 +7784,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaskellNet";
-       version = "0.4.3";
-       sha256 = "1y7i7yi2c025l89hrrj2avzrszgfdjl8a4pii04lnxngq4b3nhmz";
+       version = "0.4.4";
+       sha256 = "0df5q28y1x5irnzm5ma65b6ny6dds0375bzj6xczsw6xrlxaj3br";
        buildDepends = [
          array base base64-string bytestring cryptohash mime-mail mtl
          network old-time pretty text
@@ -7621,8 +7801,8 @@ self: {
      }:
      mkDerivation {
        pname = "HaskellNet-SSL";
-       version = "0.2.5.2";
-       sha256 = "0jhm43zd6jvhbahk4ki29ydg02qnjj4mw823rckqxk6f91q00qlp";
+       version = "0.3.0.0";
+       sha256 = "1n1jlnxp16dmfkw4yh1bsbylsk5c1kyixh3gi81202fjx3q9z2pf";
        buildDepends = [
          base bytestring connection data-default HaskellNet network tls
        ];
@@ -7870,6 +8050,7 @@ self: {
        sha256 = "00f0a3lbpc7s70lzmnf9a7hjzc3yv8nfxcvz5nparr34x585zbxl";
        buildDepends = [ base containers gnuplot ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hmpf" = callPackage
@@ -7908,6 +8089,7 @@ self: {
        homepage = "http://maartenfaddegon.nl";
        description = "Lighweight algorithmic debugging based on observing intermediate values and the cost centre stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -8154,16 +8336,14 @@ self: {
      }) { Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, integer-gmp, network
-     , old-locale, openssl, test-framework, test-framework-hunit, time
+    ({ mkDerivation, base, bytestring, HUnit, network, old-locale
+     , openssl, test-framework, test-framework-hunit, time
      }:
      mkDerivation {
        pname = "HsOpenSSL";
        version = "0.11.1.1";
        sha256 = "1hf4xgc2488hm0y9isrl7mxlacf1iazb6h1l1wz8dab8x5sf0qaa";
-       buildDepends = [
-         base bytestring integer-gmp network old-locale time
-       ];
+       buildDepends = [ base bytestring network old-locale time ];
        testDepends = [
          base bytestring HUnit test-framework test-framework-hunit
        ];
@@ -8216,6 +8396,7 @@ self: {
        version = "0.4.3.3";
        sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7";
        buildDepends = [ base bytestring mtl stm ];
+       jailbreak = true;
        homepage = "https://github.com/phonohawk/HsSVN";
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -8290,18 +8471,19 @@ self: {
 
   "HueAPI" = callPackage
     ({ mkDerivation, aeson, base, containers, lens, lens-aeson, mtl
-     , transformers, wreq
+     , time, transformers, wreq
      }:
      mkDerivation {
        pname = "HueAPI";
-       version = "0.2.3";
-       sha256 = "1c30i551f0lmcpima48dlpmbr4z7dly4d9s4iqn97qq3l9snb1k9";
+       version = "0.2.4";
+       sha256 = "0qpa2cmsqpxb311f2vyy0zm52c6z71yxbzl9ih1f8x2fz4cm5g6n";
        buildDepends = [
-         aeson base containers lens lens-aeson mtl transformers wreq
+         aeson base containers lens lens-aeson mtl time transformers wreq
        ];
        homepage = "https://github.com/sjoerdvisscher/HueAPI";
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hungarian-Munkres" = callPackage
@@ -8343,6 +8525,7 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "INblobs" = callPackage
@@ -8397,8 +8580,8 @@ self: {
     ({ mkDerivation, base, mtl, QuickCheck, Stream }:
      mkDerivation {
        pname = "IOSpec";
-       version = "0.2.5";
-       sha256 = "0r6vqg39h6vzwlb33cvk72k4mh6jd8rpdcnkqsfxdqmsk7h8x84j";
+       version = "0.3";
+       sha256 = "0dwl2nx8fisl1syggwd3060wa50lj5nl9312x4q7pq153cxjppyy";
        buildDepends = [ base mtl QuickCheck Stream ];
        description = "A pure specification of the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -8491,6 +8674,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm";
        buildDepends = [ base PeanoWitnesses ];
+       jailbreak = true;
        homepage = "https://github.com/kwf/IndexedList";
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
        license = stdenv.lib.licenses.bsd3;
@@ -8557,6 +8741,7 @@ self: {
        homepage = "https://github.com/yunxing/Irc";
        description = "DSL for IRC bots";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IrrHaskell" = callPackage
@@ -8586,6 +8771,7 @@ self: {
          quickcheck-instances system-filepath text unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/jcristovao/IsNull";
        description = "A typeclass to determine if a given value is null";
        license = stdenv.lib.licenses.bsd3;
@@ -8659,6 +8845,7 @@ self: {
        jailbreak = true;
        description = "Some utility functions for JYU projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JackMiniMix" = callPackage
@@ -8746,6 +8933,7 @@ self: {
        homepage = "https://github.com/MedeaMelana/JsonGrammar2";
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels" = callPackage
@@ -8754,8 +8942,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.3.1";
-       sha256 = "1lq0v5z0kr2vbhj7xv07vygb6xqvp49sz8m9c20v394d2p5i2ai1";
+       version = "3.2.4";
+       sha256 = "113w66rd6h04x0zbkqh34x33pf15hmrn3l9yy8kirs55kbg266w0";
        buildDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -8772,6 +8960,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm";
        buildDepends = [ base containers JuicyPixels ];
+       jailbreak = true;
        homepage = "http://eax.me/";
        description = "Functions for drawing lines, squares and so on pixel by pixel";
        license = stdenv.lib.licenses.bsd3;
@@ -8786,6 +8975,7 @@ self: {
        buildDepends = [ base bytestring JuicyPixels repa vector ];
        description = "Convenience functions to obtain array representations of images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-util" = callPackage
@@ -8879,6 +9069,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5";
        buildDepends = [ base hmatrix ];
+       jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/Kalman";
        description = "A slightly extended Kalman filter";
        license = stdenv.lib.licenses.bsd3;
@@ -9033,6 +9224,7 @@ self: {
        homepage = "http://www.entropia.de/wiki/L-seed";
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LDAP" = callPackage
@@ -9088,6 +9280,7 @@ self: {
        ];
        description = "A basic lambda calculator with beta reduction and a REPL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaHack" = callPackage
@@ -9100,8 +9293,8 @@ self: {
      }:
      mkDerivation {
        pname = "LambdaHack";
-       version = "0.4.101.0";
-       sha256 = "1ilp54w8659rdbspsz4adw697v06498z9akvylfis3c1am2ja39q";
+       version = "0.4.101.1";
+       sha256 = "065j2zyqi4adh3f01jywxqvsl45i69ky2y0bavkkpzz2klspg6zw";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -9121,6 +9314,7 @@ self: {
        homepage = "http://github.com/LambdaHack/LambdaHack";
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaINet" = callPackage
@@ -9140,6 +9334,7 @@ self: {
        homepage = "not available";
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaNet" = callPackage
@@ -9248,6 +9443,7 @@ self: {
        ];
        description = "A library for lattices";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LazyVault" = callPackage
@@ -9323,6 +9519,7 @@ self: {
        buildDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LinearSplit" = callPackage
@@ -9399,6 +9596,7 @@ self: {
        homepage = "http://github.com/yairchu/generator/tree";
        description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ListZipper" = callPackage
@@ -9419,6 +9617,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "http://gogotanaka.me/";
        description = "Logic";
        license = stdenv.lib.licenses.mit;
@@ -9478,6 +9677,7 @@ self: {
          MonadCatchIO-transformers stm transformers
        ];
        extraLibraries = [ openmpi ];
+       jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9625,6 +9825,7 @@ self: {
        buildTools = [ cpphs ];
        description = "stateful, RESTful web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MHask" = callPackage
@@ -9638,6 +9839,7 @@ self: {
        homepage = "https://github.com/DanBurton/MHask#readme";
        description = "The category of monads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MSQueue" = callPackage
@@ -9647,6 +9849,7 @@ self: {
        version = "0.0.1";
        sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y";
        buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
+       jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Michael-Scott queue";
        license = stdenv.lib.licenses.bsd3;
@@ -9677,10 +9880,14 @@ self: {
      mkDerivation {
        pname = "MaybeT";
        version = "0.1.2";
+       revision = "1";
        sha256 = "0cmnfs22ldai0z172rdsvryzsh33a70yax21v03nhr92a4b62plr";
+       editedCabalFile = "399ec60488680853ace716790b8ebaeee1a74da8a24ced5b5caaea4341b88580";
        buildDepends = [ base mtl ];
+       jailbreak = true;
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MaybeT-monads-tf" = callPackage
@@ -9706,6 +9913,7 @@ self: {
        jailbreak = true;
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MazesOfMonad" = callPackage
@@ -9724,6 +9932,7 @@ self: {
        ];
        description = "Console-based Role Playing Game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MeanShift" = callPackage
@@ -10013,6 +10222,7 @@ self: {
          base data-default ghc-prim MaybeT mmorph monad-products mtl random
          transformers
        ];
+       jailbreak = true;
        homepage = "http://alkalisoftware.net";
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
@@ -10069,6 +10279,7 @@ self: {
        buildDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monadius" = callPackage
@@ -10113,6 +10324,7 @@ self: {
        buildDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monatron-IO" = callPackage
@@ -10122,9 +10334,11 @@ self: {
        version = "1.0";
        sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0";
        buildDepends = [ base Monatron transformers ];
+       jailbreak = true;
        homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO";
        description = "MonadIO instances for the Monatron transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monocle" = callPackage
@@ -10268,6 +10482,7 @@ self: {
        homepage = "http://floss.scru.org/hMusicBrainz";
        description = "interface to MusicBrainz XML2 web service";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MusicBrainz-libdiscid" = callPackage
@@ -10409,6 +10624,7 @@ self: {
        version = "0.2.0.2";
        sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735";
        buildDepends = [ base comonad distributive ];
+       jailbreak = true;
        homepage = "https://github.com/kwf/NestedFunctor";
        description = "Nested composition of functors with a type index tracking nesting";
        license = stdenv.lib.licenses.bsd3;
@@ -10451,15 +10667,14 @@ self: {
      }:
      mkDerivation {
        pname = "Network-NineP";
-       version = "0.2.0";
-       sha256 = "0pa0j9ljq32dikffwi3n1cifilb2586z3q004rqa0sq82zyah949";
+       version = "0.3.0";
+       sha256 = "02igsbmhkpkaxdpdhkl6vb7kzryhg7p5bb59irykz0dkg095wr89";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base binary bytestring containers convertible monad-loops mstate
          mtl network NineP regex-posix stateref transformers
        ];
-       jailbreak = true;
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10577,6 +10792,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Core" = callPackage
@@ -10604,6 +10820,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Language" = callPackage
@@ -10624,6 +10841,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Rules" = callPackage
@@ -10666,6 +10884,7 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NonEmpty" = callPackage
@@ -10730,6 +10949,7 @@ self: {
        homepage = "http://patch-tag.com/r/lpsmith/NumberSieves";
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Numbers" = callPackage
@@ -10830,6 +11050,7 @@ self: {
        homepage = "https://github.com/yokto/object";
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ObjectIO" = callPackage
@@ -10947,6 +11168,7 @@ self: {
        homepage = "https://github.com/audreyt/openafp/";
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -10967,6 +11189,7 @@ self: {
        ];
        description = "Assorted utilities to work with AFP data streams";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAL" = callPackage
@@ -11022,6 +11245,7 @@ self: {
        version = "0.1.0.3";
        sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s";
        buildDepends = [ base bytestring mtl ];
+       jailbreak = true;
        homepage = "https://github.com/jkarlson/OpenCLWrappers";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
@@ -11082,18 +11306,19 @@ self: {
      }) {};
 
   "OpenSCAD" = callPackage
-    ({ mkDerivation, base, Cabal, colour, filepath, HUnit
-     , test-framework, test-framework-hunit
+    ({ mkDerivation, base, Cabal, colour, containers, deepseq, filepath
+     , HUnit, semigroups, tasty, tasty-hunit, testpack
      }:
      mkDerivation {
        pname = "OpenSCAD";
-       version = "0.2.1.0";
-       sha256 = "0b451v2sa9gaslhg03y6nyvjwbhwlg2qxwahcj6qpyx4qlmiywnh";
-       buildDepends = [ base colour filepath ];
+       version = "0.3.0.1";
+       sha256 = "1cczhagc77rfdpwf6x993rdwmmgssph4dlr87dq1mnwh0ixhf33j";
+       buildDepends = [ base colour containers filepath semigroups ];
        testDepends = [
-         base Cabal colour filepath HUnit test-framework
-         test-framework-hunit
+         base Cabal colour containers deepseq filepath HUnit semigroups
+         tasty tasty-hunit testpack
        ];
+       jailbreak = true;
        homepage = "https://chiselapp.com/user/mwm/repository/OpenSCAD/";
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
@@ -11215,6 +11440,7 @@ self: {
        homepage = "http://github.com/Andrey-Sisoyev/PCLT";
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PCLT-DB" = callPackage
@@ -11232,6 +11458,7 @@ self: {
        homepage = "http://github.com/Andrey-Sisoyev/PCLT-DB";
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PDBtools" = callPackage
@@ -11378,6 +11605,7 @@ self: {
        homepage = "http://parry.lif.univ-mrs.fr";
        description = "A proven synchronization server for high performance computing";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ParsecTools" = callPackage
@@ -11431,8 +11659,8 @@ self: {
     ({ mkDerivation, base, cmdargs, HTTP, network, network-uri }:
      mkDerivation {
        pname = "PastePipe";
-       version = "1.7";
-       sha256 = "0had11n44y7zjhhymdbvahwmxcxxrbxy7c9jxijhw3n7xqhdmva0";
+       version = "1.8";
+       sha256 = "10gf9xkys704k89i9lajqcwqsihfxs314vjy35shhwgga5rjnslz";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base cmdargs HTTP network network-uri ];
@@ -11472,6 +11700,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1g83jws23grl84gnq89rnppw6q7vsbhi9hk6lp5dq2n4818kamgg";
        buildDepends = [ base ];
+       jailbreak = true;
        description = "GADT type witnesses for Peano-style natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11488,6 +11717,7 @@ self: {
          array base binary bytestring containers digest time
        ];
        extraLibraries = [ cmph ];
+       jailbreak = true;
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11873,6 +12103,7 @@ self: {
        homepage = "http://www.cs.nott.ac.uk/~asg/QIO/";
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuadEdge" = callPackage
@@ -11939,6 +12170,7 @@ self: {
        sha256 = "1gxpvbc0ab4n35b5zcbzng8qc7y3mzgym8cj42bci984f08y1bld";
        editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9";
        buildDepends = [ base random ];
+       jailbreak = true;
        homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
@@ -12004,6 +12236,7 @@ self: {
        homepage = "https://github.com/ssadler/quickson";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RANSAC" = callPackage
@@ -12460,9 +12693,11 @@ self: {
          base bytestring cassava cmdargs cond containers directory glpk-hs
          matrix MissingH vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/pablocouto/Referees";
        description = "A utility for computing distributions of material to review among reviewers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RepLib" = callPackage
@@ -12472,9 +12707,11 @@ self: {
        version = "0.5.3.3";
        sha256 = "1772r6rfajcn622dxwy9z1bvv53l5xj6acbcv8n9p7h01fs52mpr";
        buildDepends = [ base containers mtl template-haskell ];
+       jailbreak = true;
        homepage = "http://code.google.com/p/replib/";
        description = "Generic programming library with representation types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ReplicateEffects" = callPackage
@@ -12514,6 +12751,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/avieth/RichConditional";
        description = "Tiny library to replace classic if/else";
        license = stdenv.lib.licenses.mit;
@@ -12575,6 +12813,7 @@ self: {
        homepage = "https://github.com/jspahrsummers/RxHaskell";
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SBench" = callPackage
@@ -12849,14 +13088,15 @@ self: {
        ];
        description = "Calculate db-data dependencies of functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "STL" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, text }:
      mkDerivation {
        pname = "STL";
-       version = "0.3";
-       sha256 = "07zf0j9bly6b0q081jgxcpl0b5bl4kckharwwrdwng477gimqmwx";
+       version = "0.3.0.1";
+       sha256 = "0w14kra36ksa8jn72rr9b01f36gff33fi6ffrcws640v4pwisrg5";
        buildDepends = [ attoparsec base bytestring cereal text ];
        homepage = "http://github.com/bergey/STL";
        description = "STL 3D geometry format parsing and pretty-printing";
@@ -12896,20 +13136,21 @@ self: {
 
   "SVGFonts" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
-     , containers, data-default-class, diagrams-lib, directory, parsec
-     , split, text, tuple, vector, vector-space, xml
+     , containers, data-default-class, diagrams-core, diagrams-lib
+     , directory, parsec, split, text, tuple, vector, xml
      }:
      mkDerivation {
        pname = "SVGFonts";
-       version = "1.4.0.3";
-       sha256 = "0jkjcf27xqjzv9lny7j181kcma26wngrq3vzw2sp2hwkdcjryyin";
+       version = "1.5.0.0";
+       sha256 = "0w1675cwd8gx65vh421abnl4z6jw7jaz3a43g04x0a5kgf1sfl76";
        buildDepends = [
          attoparsec base blaze-markup blaze-svg containers
-         data-default-class diagrams-lib directory parsec split text tuple
-         vector vector-space xml
+         data-default-class diagrams-core diagrams-lib directory parsec
+         split text tuple vector xml
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVGPath" = callPackage
@@ -13000,6 +13241,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) glib;  inherit (pkgs) mono;};
 
+  "SciFlow" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, mtl, shelly
+     , template-haskell, text, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "SciFlow";
+       version = "0.1.0";
+       revision = "2";
+       sha256 = "0r87hzdpzbmwmh9dg0pnfrbnr1g3x67mgh9f2l96n8mjq7r0sipd";
+       editedCabalFile = "52e1139eb94d0223f664010e71f334a9c04a3e94c4bfbbd7c66069dc931242da";
+       buildDepends = [
+         base bytestring data-default-class mtl shelly template-haskell text
+         unordered-containers yaml
+       ];
+       description = "Scientific workflow management system";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ScratchFs" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HFuse
      , hsyslog, process, regex-compat, sqlite-simple, unix
@@ -13086,6 +13345,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "SeqAlign" = callPackage
+    ({ mkDerivation, base, bytestring, vector }:
+     mkDerivation {
+       pname = "SeqAlign";
+       version = "0.1.0.0";
+       sha256 = "0vk63ni1a93win8if032nps5y0xi245cmjqq2j4xfsdddg5bdln5";
+       buildDepends = [ base bytestring vector ];
+       description = "Sequence Alignment";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "SessionLogger" = callPackage
     ({ mkDerivation, base, directory, filepath, hslogger, mtl
      , old-locale, random, time
@@ -13105,20 +13375,20 @@ self: {
 
   "ShellCheck" = callPackage
     ({ mkDerivation, base, containers, directory, json, mtl, parsec
-     , QuickCheck, regex-compat, transformers
+     , QuickCheck, regex-tdfa, transformers
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.3.6";
-       sha256 = "0313i6h9m57g1ly5jviczvgbcvv8wdy0fi6hrws879zb745rb7zi";
+       version = "0.3.7";
+       sha256 = "1mwpgg8plkj99hp1gab417w78rkcmdpfajj4dyv6gnl49vmr0z21";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base containers directory json mtl parsec QuickCheck regex-compat
+         base containers directory json mtl parsec QuickCheck regex-tdfa
          transformers
        ];
        testDepends = [
-         base containers directory json mtl parsec QuickCheck regex-compat
+         base containers directory json mtl parsec QuickCheck regex-tdfa
          transformers
        ];
        homepage = "http://www.shellcheck.net/";
@@ -13136,6 +13406,7 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-compatline" = callPackage
@@ -13171,8 +13442,10 @@ self: {
        version = "0.2.0.2";
        sha256 = "0q70d5arw1yg0f8b6p3k0g3i4jbh2d8rp1cchswd3ynhinzhrnqg";
        buildDepends = [ base haskeline mtl Shellac ];
+       jailbreak = true;
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-readline" = callPackage
@@ -13185,6 +13458,7 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ShowF" = callPackage
@@ -13199,6 +13473,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Shrub" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Shrub";
+       version = "0.1.0.0";
+       sha256 = "105rnyrqzagfgbfdxbdx4wqhvdfxkd8d5jaxkyqd1zyvf0chi858";
+       buildDepends = [ base ];
+       description = "4-way trie fuzzy search";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Shu-thing" = callPackage
     ({ mkDerivation, base, GLUT }:
      mkDerivation {
@@ -13286,6 +13571,7 @@ self: {
        homepage = "https://github.com/exFalso/SimpleLog/";
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SizeCompare" = callPackage
@@ -13370,6 +13656,7 @@ self: {
        homepage = "http://www.soos-project.eu/";
        description = "Abstract full system simulator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SoccerFun" = callPackage
@@ -13422,6 +13709,7 @@ self: {
        sha256 = "0fqaw4wh7ml35kl75qsvqsq17g5pndf7x6clcmqxpwayjn2syzda";
        buildDepends = [ base ];
        testDepends = [ base QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/Zigazou/Sonnex";
        description = "Sonnex is an alternative to Soundex for french language";
        license = stdenv.lib.licenses.gpl3;
@@ -13444,7 +13732,6 @@ self: {
        jailbreak = true;
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SpaceInvaders" = callPackage
@@ -13459,6 +13746,7 @@ self: {
        homepage = "http://www.haskell.org/yampa/";
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SpacePrivateers" = callPackage
@@ -13491,6 +13779,7 @@ self: {
        version = "0.0.1";
        sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2";
        buildDepends = [ base monad-loops ref-mtl stm ];
+       jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Lock free Spin Counter";
        license = stdenv.lib.licenses.bsd3;
@@ -13506,8 +13795,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.7.7.0";
-       sha256 = "0jswrqbkqfznbiih603l59rp375nb73kvscjl8jrgw7a5d0qiy8c";
+       version = "0.7.9.0";
+       sha256 = "1dlpirivgiqihj9fxvm8yry7d3yiprjn85fbl1w6dqvq4fdsjv9x";
        buildDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          directory hashable http-types monad-control mtl old-locale
@@ -13515,8 +13804,8 @@ self: {
          transformers transformers-base unordered-containers vault wai
          wai-extra warp
        ];
-       testDepends = [ base hspec hspec-wai http-types text wai ];
-       homepage = "https://github.com/agrafix/Spock";
+       testDepends = [ base hspec hspec-wai http-types reroute text wai ];
+       homepage = "http://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13550,6 +13839,7 @@ self: {
        homepage = "https://github.com/agrafix/Spock-digestive";
        description = "Digestive functors support for Spock";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-worker" = callPackage
@@ -13790,7 +14080,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/SyntaxMacrosForFree";
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Sysmon" = callPackage
@@ -13831,22 +14120,19 @@ self: {
      }) {};
 
   "TBit" = callPackage
-    ({ mkDerivation, base, containers, deepseq, fgl, free, haskeline
-     , hmatrix, integration, list-extras, mtl, numeric-tools, parallel
-     , stream-fusion
+    ({ mkDerivation, base, containers, deepseq, fgl, free, hmatrix
+     , integration, list-extras, mtl, numeric-tools, parallel
      }:
      mkDerivation {
        pname = "TBit";
-       version = "0.4.2.0";
-       sha256 = "0qccd23x1qcng207dl82h7wifh2cc7aaapf9qrg0m5jz3fa5cvkm";
+       version = "0.4.2.3";
+       sha256 = "1by1wy2w3ankg1php7m911kc53q2dv5jfl8v1iwp3mb68s8b6wrs";
        buildDepends = [
-         base containers deepseq fgl free haskeline hmatrix integration
-         list-extras mtl numeric-tools parallel stream-fusion
+         base containers deepseq fgl free hmatrix integration list-extras
+         mtl numeric-tools parallel
        ];
-       jailbreak = true;
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TCache" = callPackage
@@ -13869,8 +14155,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "TTTAS";
-       version = "0.4.2";
-       sha256 = "0wag5mnhn6h3gp92w0amngqfdwwbsmvdwmcpymxq6zjj6zmdzs7k";
+       version = "0.6.0";
+       sha256 = "18p3rxh3g44ky5q4hjq53l4shg4gd8v68wra6bdxv8bjafxld1wp";
        buildDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Typed Transformations of Typed Abstract Syntax";
@@ -13970,6 +14256,7 @@ self: {
        version = "0.4.0.0";
        sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp";
        buildDepends = [ base comonad distributive Stream ];
+       jailbreak = true;
        homepage = "https://github.com/kwf/Tape";
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
        license = stdenv.lib.licenses.bsd3;
@@ -14083,6 +14370,7 @@ self: {
        ];
        description = "A sub-project (exercise) for a functional programming course";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TigerHash" = callPackage
@@ -14124,6 +14412,7 @@ self: {
        buildDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TinyURL" = callPackage
@@ -14147,6 +14436,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base containers matrix random ];
+       jailbreak = true;
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14164,6 +14454,7 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tournament" = callPackage
@@ -14207,6 +14498,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base containers mtl ];
+       jailbreak = true;
        homepage = "http://hackage.haskell.org/package/TransformersStepByStep";
        description = "Tutorial to monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -14230,6 +14522,7 @@ self: {
        version = "0.0.2";
        sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal";
        buildDepends = [ base ref-mtl stm ];
+       jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Wait-free Tree Counter";
        license = stdenv.lib.licenses.bsd3;
@@ -14266,6 +14559,7 @@ self: {
        version = "0.0.4";
        sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd";
        buildDepends = [ base ghc-prim monad-loops ref-mtl stm ];
+       jailbreak = true;
        homepage = "https://github.com/Julek";
        description = "Lock free Treiber stack";
        license = stdenv.lib.licenses.bsd3;
@@ -14341,6 +14635,7 @@ self: {
          base containers filepath random reactive-banana reactive-banana-sdl
          SDL SDL-ttf transformers
        ];
+       jailbreak = true;
        description = "Typing speed game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14380,6 +14675,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1j5v4kmd3hxzzm6xrhxf2vh7rn3b8n4gzb1yppgvxng06p642snb";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
@@ -14405,14 +14701,15 @@ self: {
      }:
      mkDerivation {
        pname = "UISF";
-       version = "0.3.0.1";
-       sha256 = "0qfhcc0ii7nncfsyxvafwbrx8j6jjdc0jrj56g8jm8vmzsa082kp";
+       version = "0.3.0.2";
+       sha256 = "0i5kw450yk44kh25xbqzjwnjipzh81i20vk8il9ic2fh4d79va46";
        buildDepends = [
          arrows base containers deepseq GLFW OpenGL stm transformers
        ];
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for Arrowized Graphical User Interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "UMM" = callPackage
@@ -14472,6 +14769,7 @@ self: {
        version = "0.4";
        sha256 = "0la9gxr7kl0s606kl5szb1sw3xwh9pnd1ak6iwlxi7b0bm9syik1";
        buildDepends = [ base containers hashable unordered-containers ];
+       jailbreak = true;
        description = "It provides the functionality like unix \"uniq\" utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14727,6 +15025,7 @@ self: {
        testDepends = [
          base bytestring cryptohash hspec lens random split vector
        ];
+       jailbreak = true;
        description = "WebMoney authentication module";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -14777,6 +15076,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Weather" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HTTP, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "Weather";
+       version = "0.1.0.4";
+       sha256 = "0g5rpz6gnf8hl7gpjc7nwci8x24yw02ps3jwjsi6js5yf3mlrxnv";
+       buildDepends = [
+         aeson base bytestring HTTP text unordered-containers
+       ];
+       homepage = "https://github.com/bstamour/weather";
+       description = "Library for interacting with the Weather Underground JSON API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "WebBits" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, pretty, syb }:
      mkDerivation {
@@ -14940,8 +15255,8 @@ self: {
     ({ mkDerivation, base, text, Win32, Win32-errors }:
      mkDerivation {
        pname = "Win32-dhcp-server";
-       version = "0.3";
-       sha256 = "03mhf1w8672jknz2v5cijgwqhc6q0bj0k6pxfnqj8wi98fzbibfy";
+       version = "0.3.1";
+       sha256 = "0mkxk822gcg1r61cf5wq9ayya51am4dy8v2xqm3ld30d7hss4dij";
        buildDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/win32-dhcp-server";
        description = "Win32 DHCP Server Management API";
@@ -15040,6 +15355,7 @@ self: {
        version = "0.1.2.0";
        sha256 = "01fvb9sraqw1ar5pvs8s23y8syix50wh6yifsm65fs4vy1nk3xfb";
        buildDepends = [ base directory filepath Win32 Win32-services ];
+       jailbreak = true;
        description = "Wrapper code for making a Win32 service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15070,6 +15386,7 @@ self: {
        buildDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WordNet-ghc74" = callPackage
@@ -15081,6 +15398,7 @@ self: {
        buildDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Wordlint" = callPackage
@@ -15092,9 +15410,11 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base boxes cmdargs ];
+       jailbreak = true;
        homepage = "https://github.com/gbgar/Wordlint";
        description = "Plaintext prose redundancy linter";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Workflow" = callPackage
@@ -15112,6 +15432,7 @@ self: {
        ];
        description = "Workflow patterns over a monad for thread state logging & recovery";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WxGeneric" = callPackage
@@ -15126,6 +15447,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/WxGeneric";
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "X11" = callPackage
@@ -15355,6 +15677,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Xorshift128Plus" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Xorshift128Plus";
+       version = "0.1.0.1";
+       sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx";
+       buildDepends = [ base ];
+       homepage = "https://github.com/kanaihiroki/Xorshift128Plus";
+       description = "Pure haskell implementation of xorshift128plus random number generator";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "YACPong" = callPackage
     ({ mkDerivation, base, data-accessor-transformers, fclabels
      , monads-fd, random, SDL, SDL-image, SDL-mixer, SDL-ttf
@@ -15534,6 +15868,7 @@ self: {
        homepage = "https://github.com/jkarni/ZipperFS";
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ZMachine" = callPackage
@@ -15580,12 +15915,13 @@ self: {
      }:
      mkDerivation {
        pname = "Zora";
-       version = "1.1.22";
-       sha256 = "0m49xfyxk92ddmh222h6drys05vncq7y374gnpgwpi4hrmzd0jbb";
+       version = "1.1.23";
+       sha256 = "0nfvqhrlz8wgvfiqnlfzgsbsk4q3yg7a7s4pyh4v4xw0xnj68vgl";
        buildDepends = [
          base bytestring containers directory fgl graphviz random shelly
          text
        ];
+       testDepends = [ base ];
        homepage = "http://github.com/bgwines/zora";
        description = "Graphing library wrapper + assorted useful functions";
        license = stdenv.lib.licenses.bsd3;
@@ -15774,8 +16110,10 @@ self: {
        buildDepends = [
          base profunctors transformers transformers-compat vinyl
        ];
+       jailbreak = true;
        description = "Abstract binding trees for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ac-machine" = callPackage
@@ -15817,9 +16155,11 @@ self: {
          array base containers fclabels ghc-prim hashable hashtables pretty
          template-haskell unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/AccelerateHS/accelerate/";
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-arithmetic" = callPackage
@@ -15834,9 +16174,11 @@ self: {
          accelerate accelerate-utility base QuickCheck utility-ht
        ];
        testDepends = [ accelerate base QuickCheck ];
+       jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-arithmetic/";
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-cublas" = callPackage
@@ -15899,6 +16241,7 @@ self: {
          accelerate accelerate-cuda accelerate-fourier accelerate-utility
          base cuda cufft
        ];
+       jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-cufft/";
        description = "Accelerate frontend to the CUFFT library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
@@ -15930,6 +16273,7 @@ self: {
        sha256 = "0nxlw8z7bnr29vp24qbbwwmq9rj2q6jqqkmm46pp8dp582y4yk6v";
        editedCabalFile = "c23b93ae20f528782aeb10b528fa2a7847cce5c1aa9db546f3b000d7f05f53ca";
        buildDepends = [ accelerate accelerate-cuda base cuda cufft ];
+       jailbreak = true;
        homepage = "https://github.com/AccelerateHS/accelerate-fft";
        description = "FFT using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
@@ -15946,6 +16290,7 @@ self: {
        buildDepends = [
          accelerate accelerate-io base carray fft storable-complex
        ];
+       jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-fftw/";
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
@@ -15969,9 +16314,11 @@ self: {
          accelerate accelerate-arithmetic accelerate-utility base QuickCheck
          utility-ht
        ];
+       jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-fourier/";
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -16007,9 +16354,11 @@ self: {
        buildDepends = [
          accelerate array base bmp bytestring repa vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/AccelerateHS/accelerate-io";
        description = "Read and write Accelerate arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-utility" = callPackage
@@ -16019,9 +16368,11 @@ self: {
        version = "0.1";
        sha256 = "1n5hyklil2x2x5bc5z7iq0yz4p8lab8xxdnlwzgjpn3lliq0vgpv";
        buildDepends = [ accelerate base utility-ht ];
+       jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/accelerate-utility/";
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accentuateus" = callPackage
@@ -16196,6 +16547,7 @@ self: {
        homepage = "http://github.com/joeyadams/haskell-acme-hq9plus";
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-http" = callPackage
@@ -16228,6 +16580,7 @@ self: {
        buildDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-io" = callPackage
@@ -16237,6 +16590,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "091czdcbydc75ndaw2ns8cncxa6ihlvclhrbcz9vp29kvhf483cb";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "N/A";
        description = "The only true way to do IO in Haskell!";
        license = "unknown";
@@ -16284,6 +16638,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "180fs64vlbxb2700qq8hzzz82kkmpknakkbk66ddkk1pdl7nm0j4";
        buildDepends = [ base random ];
+       jailbreak = true;
        description = "Miscellaneous newtypes for orderings of discutable use";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -16424,6 +16779,17 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "acme-timemachine" = callPackage
+    ({ mkDerivation, base, ghc-prim, mtl, transformers }:
+     mkDerivation {
+       pname = "acme-timemachine";
+       version = "0.0.0.0";
+       sha256 = "0sn20lz4bdrn7jz2ik4dr05h59qdjavnsp1z8656nbymndgi54iz";
+       buildDepends = [ base ghc-prim mtl transformers ];
+       description = "An easy way to perform and unperform IO actions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "acme-year" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -16449,18 +16815,18 @@ self: {
      }) {};
 
   "active" = callPackage
-    ({ mkDerivation, array, base, newtype, QuickCheck, semigroupoids
-     , semigroups, vector-space
+    ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
+     , semigroups, vector
      }:
      mkDerivation {
        pname = "active";
-       version = "0.1.0.19";
-       sha256 = "1zzzrjpfwxzf0zbz8vcnpfqi7djvrfxglhkvw1s6yj5gcblg2rcw";
+       version = "0.2.0.1";
+       sha256 = "1a7vraffac4md7bcxxzl6x9jyy0pz37w3m9drnk4lrjhzirbkn89";
        buildDepends = [
-         array base newtype semigroupoids semigroups vector-space
+         base lens linear semigroupoids semigroups vector
        ];
        testDepends = [
-         array base newtype QuickCheck semigroupoids semigroups vector-space
+         base lens linear QuickCheck semigroupoids semigroups vector
        ];
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
@@ -16512,6 +16878,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "1bprj41552zr1aj0k73c3skdhg8jb60rhcm9p9hjcmy2al9izsag";
        buildDepends = [ aeson base text time unordered-containers ];
+       jailbreak = true;
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16582,6 +16949,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "17dxvdzmg3i8n0gbgbj0jyhm90w0dq7j27id8n24frild2w4c0d0";
        buildDepends = [ base bytestring cereal containers mtl network ];
+       jailbreak = true;
        description = "Android Debug Bridge (ADB) protocol";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16605,6 +16973,7 @@ self: {
        homepage = "https://projects.zubr.me/wiki/adblock2privoxy";
        description = "Convert adblock config files to privoxy format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "addLicenseInfo" = callPackage
@@ -16657,6 +17026,7 @@ self: {
        homepage = "https://github.com/kawu/adict";
        description = "Approximate dictionary searching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adjunctions" = callPackage
@@ -16694,6 +17064,7 @@ self: {
        homepage = "https://github.com/stepcut/ase2css";
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adp-multi" = callPackage
@@ -16764,6 +17135,7 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
@@ -16772,9 +17144,9 @@ self: {
   "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, deepseq, dlist, ghc-prim, hashable, HUnit, mtl
-     , old-locale, QuickCheck, scientific, syb, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, unordered-containers, vector
+     , QuickCheck, scientific, syb, template-haskell, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
@@ -16782,8 +17154,8 @@ self: {
        sha256 = "1mc8cwmswx69r77wv7dfim525jqajnlxbcx5xf3ygpszzf6mh1q7";
        buildDepends = [
          attoparsec base blaze-builder bytestring containers deepseq dlist
-         ghc-prim hashable mtl old-locale scientific syb template-haskell
-         text time unordered-containers vector
+         ghc-prim hashable mtl scientific syb template-haskell text time
+         unordered-containers vector
        ];
        testDepends = [
          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
@@ -16795,6 +17167,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-better-errors" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, dlist, mtl, scientific
+     , text, transformers, transformers-compat, unordered-containers
+     , vector, void
+     }:
+     mkDerivation {
+       pname = "aeson-better-errors";
+       version = "0.6.0.0";
+       sha256 = "188pi0x2hfl1m1s55xb64s6gm6bcfck9b1hs3lmcbpczka84wy20";
+       buildDepends = [
+         aeson base bytestring dlist mtl scientific text transformers
+         transformers-compat unordered-containers vector void
+       ];
+       homepage = "https://github.com/hdgarrood/aeson-better-errors";
+       description = "Better error messages when decoding JSON values";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "aeson-bson" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, bson, bytestring
      , containers, text, unordered-containers, vector
@@ -16986,6 +17376,7 @@ self: {
        homepage = "https://github.com/lassoinc/aeson-smart";
        description = "Smart derivation of Aeson instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-streams" = callPackage
@@ -17003,24 +17394,24 @@ self: {
        homepage = "https://github.com/noteed/aeson-streams";
        description = "An HTTP client library for JSON-based APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-t" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec2, text
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec, text
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson-t";
-       version = "0.0.4";
-       sha256 = "0y4mbn1xb288amgy8j6p5x9ih873qwiwrialfchc8ryg0n8syp8r";
+       version = "0.0.5";
+       sha256 = "1mpqkjxsg4bpmbkj8ys39g53knw851l428x83619bmvnlrj1fkkd";
        buildDepends = [
          aeson base bytestring text unordered-containers vector
        ];
        testDepends = [
-         aeson aeson-qq base bytestring hspec2 text unordered-containers
+         aeson aeson-qq base bytestring hspec text unordered-containers
          vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/begriffs/aeson-t";
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
@@ -17132,17 +17523,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "agentx" = callPackage
+    ({ mkDerivation, base, binary, bitwise, bytestring, containers
+     , data-default, Diff, fclabels, mtl, network, pipes
+     , pipes-concurrency, pipes-network, safe, snmp, time, transformers
+     , unix
+     }:
+     mkDerivation {
+       pname = "agentx";
+       version = "0.1.0.4";
+       sha256 = "0m0kcylamac8fx5yl6zk5gznjyphplgy7gj3mqbq56146087935a";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base binary bitwise bytestring containers data-default Diff
+         fclabels mtl network pipes pipes-concurrency pipes-network safe
+         snmp time transformers unix
+       ];
+       description = "AgentX protocol for write SNMP subagents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "agum" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "agum";
-       version = "2.5";
-       sha256 = "0acirnqsm7mrz6pgy9nabn23bmljdcz08b3ahak4ma5lcm5bql9q";
+       version = "2.6";
+       sha256 = "1j2qlwnvg7rxjx8fk3y5n3wjkikv1d17p8grh4gzp4c5a7pn5kim";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers ];
        description = "Unification and Matching in an Abelian Group";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aig" = callPackage
@@ -17171,6 +17584,7 @@ self: {
        homepage = "https://github.com/nfjinjing/air";
        description = "air";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "air-extra" = callPackage
@@ -17189,6 +17603,7 @@ self: {
        homepage = "https://github.com/nfjinjing/air-extra";
        description = "air-extra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "air-spec" = callPackage
@@ -17213,6 +17628,7 @@ self: {
        homepage = "https://github.com/nfjinjing/air-th";
        description = "air";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "airbrake" = callPackage
@@ -17236,6 +17652,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "airship" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , case-insensitive, either, http-date, http-media, http-types
+     , lifted-base, monad-control, mtl, network, old-locale, random
+     , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
+     , transformers-base, unordered-containers, wai, warp
+     }:
+     mkDerivation {
+       pname = "airship";
+       version = "0.1.0.0";
+       sha256 = "0x99mwyhnhs89hcwi23pjcd6qwihr4ldli68f701ilqp7cxxyk16";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         attoparsec base blaze-builder bytestring case-insensitive either
+         http-date http-media http-types lifted-base monad-control mtl
+         network old-locale random text time transformers transformers-base
+         unordered-containers wai warp
+       ];
+       testDepends = [
+         base bytestring tasty tasty-hunit tasty-quickcheck text
+         transformers wai
+       ];
+       jailbreak = true;
+       description = "A Webmachine-inspired HTTP library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "aivika" = callPackage
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
@@ -17314,6 +17758,7 @@ self: {
        homepage = "http://github.com/dsorokin/aivika-experiment-diagrams";
        description = "Diagrams backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aivika-transformers" = callPackage
@@ -17358,8 +17803,8 @@ self: {
     ({ mkDerivation, base, c2hs, mtl, openal }:
      mkDerivation {
        pname = "al";
-       version = "0.1.2";
-       sha256 = "1vni9rbpngdgn530n5d9rvmj8j0nad54nw7njk1gd8krbnbgfy9k";
+       version = "0.1.3.1";
+       sha256 = "1p6l64p52d0sznzkig1jczwfqs8wfx22ic40kfpai8icqx357v08";
        buildDepends = [ base mtl ];
        buildTools = [ c2hs ];
        extraLibraries = [ openal ];
@@ -17376,6 +17821,7 @@ self: {
        sha256 = "1j0g4xff6i69wx5m45xmx6dsdb5sdl85id967mflnrczgj36d1fd";
        buildDepends = [ base stm time unbounded-delays ];
        testDepends = [ base time ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/davecturner/alarmclock";
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
@@ -17385,8 +17831,8 @@ self: {
     ({ mkDerivation, argparser, base, containers, threefish }:
      mkDerivation {
        pname = "alea";
-       version = "0.3.3.0";
-       sha256 = "1c5bdbazlds419qgpdghrap5y20i59z57qk2dnj35bl2n5mvlapl";
+       version = "0.4.0.0";
+       sha256 = "1j18hqyrfyyhngla4dikdchi659bi7gj1lsl38r08645hf9n5395";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ argparser base containers threefish ];
@@ -17426,8 +17872,10 @@ self: {
          array base containers haskell-src-meta QuickCheck template-haskell
        ];
        buildTools = [ alex happy ];
+       jailbreak = true;
        description = "Quasi-quoter for Alex lexers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alfred" = callPackage
@@ -17477,6 +17925,7 @@ self: {
        ];
        description = "Infrastructure for DAG-shaped relational algebra plans";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebra-sql" = callPackage
@@ -17498,6 +17947,7 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic" = callPackage
@@ -17507,6 +17957,7 @@ self: {
        version = "0.1.0.2";
        sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh";
        buildDepends = [ accelerate base ];
+       jailbreak = true;
        homepage = "https://github.com/wdanilo/algebraic";
        description = "General linear algebra structures";
        license = stdenv.lib.licenses.bsd3;
@@ -17517,8 +17968,8 @@ self: {
     ({ mkDerivation, base, syb, template-haskell }:
      mkDerivation {
        pname = "algebraic-classes";
-       version = "0.5.2";
-       sha256 = "0kk0wafqwqr466qiz3dwagpf03vln922dnrrj90ay7kqp3623jnd";
+       version = "0.6";
+       sha256 = "0i34n1lmnw12xrnaqvmiydnnlm8m8ky12chwb9jmnsf3klv8qm61";
        buildDepends = [ base syb template-haskell ];
        homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
@@ -17604,8 +18055,8 @@ self: {
      }:
      mkDerivation {
        pname = "alms";
-       version = "0.6.5";
-       sha256 = "12hnhz1lz9wb4s95b9via1nkfgmgmr7p1wc9k4bcvsm778j920s8";
+       version = "0.6.7";
+       sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -17613,7 +18064,7 @@ self: {
          incremental-sat-solver mtl network parsec pretty QuickCheck random
          stm syb template-haskell transformers tuple
        ];
-       homepage = "http://www.ccs.neu.edu/~tov/pubs/alms";
+       homepage = "http://www.ccs.neu.edu/~tov/pubs/alms/";
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17711,6 +18162,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alsa-midi" = callPackage
@@ -17823,6 +18275,7 @@ self: {
        version = "0.2.1.0";
        sha256 = "1j1kh4wylndyz0zs70v63x5gdhbwa9gpkn1vm108bhhjy79rgmnh";
        buildDepends = [ base composition ];
+       jailbreak = true;
        homepage = "https://github.com/jcristovao/altcomposition";
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
@@ -17927,6 +18380,7 @@ self: {
        homepage = "https://github.com/AndrewRademacher/hs-amazon-products";
        description = "Connector for Amazon Products API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka" = callPackage
@@ -17937,8 +18391,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "0.3.3.1";
-       sha256 = "13lblmqpnd6anc6d6wv1xiqy0c2b8bnq9gh8df0xpbch756qfa4w";
+       version = "0.3.4";
+       sha256 = "19fzhsrlsqrncngcmdl8wr0rbv8ff0k8y91dn6j1hacz0dv1whhk";
        buildDepends = [
          amazonka-core base bytestring conduit conduit-extra cryptohash
          cryptohash-conduit exceptions http-conduit lens mmorph
@@ -17954,8 +18408,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "0.3.3";
-       sha256 = "1jn5phz20xki1zprszp8y0l3wlbdxs23iq7d8rvgdnlp4wx1q4vj";
+       version = "0.3.4";
+       sha256 = "0kndkj4x7wmmxpsr3a42ck2zq7amm33axxlhwzlgi1gnv8v2v4y4";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
@@ -17966,8 +18420,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "0.3.3";
-       sha256 = "1dbf6aabxss5fnbnwpldg5a87qda4vcrazmbnhhgil30pcgcjbld";
+       version = "0.3.4";
+       sha256 = "0nhy1qn8abhnmr85n1ddshwjwns0gc0l1syznfg6g6cmazwq7809";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
@@ -17978,8 +18432,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "0.3.3";
-       sha256 = "16i1p7j70rxw4b5hmdjzjrk302zqyfgbgvc49dq0ag5hc4351b71";
+       version = "0.3.4";
+       sha256 = "1yp59hdxnnvjsdpaw4c311p30bg9xyj231hn2r1zis3awck8jlkk";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
@@ -17990,8 +18444,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "0.3.3";
-       sha256 = "0sp3z01jwm9jnalq8yy9vxvjwzwvqj0vzb7syms60ii3hclc30ka";
+       version = "0.3.4";
+       sha256 = "1f26vpfxqkkm1yli42xhbhhzya07gvg9kjhq5p51p32500aax4my";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
@@ -18002,8 +18456,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "0.3.3";
-       sha256 = "0z1zvk37kds3wlhvd6036g63lvc37axnam9fv646s183xhfrmns8";
+       version = "0.3.4";
+       sha256 = "0lp09i3h527g8l7xcxqk6n1pjlbdhxncpgdsrd8bv91an39cnj12";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
@@ -18014,8 +18468,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "0.3.3";
-       sha256 = "104qj5cc3ka8ixr1hh4asmfar31rd6k04w4g72c5xzy6l11vzp7j";
+       version = "0.3.4";
+       sha256 = "06sb1zmgvsbshndix9gdx8vq4378p8sgwnnkwhzm1sr92yzfv4is";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
@@ -18026,8 +18480,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "0.3.3";
-       sha256 = "00caawzj1jjbhxrd53hzqnw66a20r31gvlv19xps3jr49bhrjs15";
+       version = "0.3.4";
+       sha256 = "125vn9vk4mk61r4r5c3parhrqdxkmlvqprly1x0chd044nx5ai80";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
@@ -18038,8 +18492,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "0.3.3";
-       sha256 = "10044nfmdj1isf8wq0si5nn44c0ya16s1kir65c4g2cisarj0vr0";
+       version = "0.3.4";
+       sha256 = "1lsdy65cg3wrhpzsaiir0mq510dilia1m0lqwg1fnrcl62xlcsd9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
@@ -18050,8 +18504,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "0.3.3";
-       sha256 = "0fm8zwdsywhgxnpqi9s5jnasfknjiix15wmfx8in1d6kf52sgy5n";
+       version = "0.3.4";
+       sha256 = "1wxrxak7l8drba6hckhx0idqj26fbppnxw5hj4cnmjrg4pvjpnmn";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
@@ -18062,8 +18516,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "0.3.3";
-       sha256 = "1chbakfpiz5ix3z7hi50c25dc71s6dxkxap1b6z28fqyigd8ycn6";
+       version = "0.3.4";
+       sha256 = "1sws6d2a21r7wwd2dyf4k7g2n2f0r5azydj7pg6g5a2sjfazimi0";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
@@ -18074,8 +18528,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "0.3.3";
-       sha256 = "1kfnkh5x5s9smg5f82na4kkvc1ljadnc9041zk4nk4vsch41wg5j";
+       version = "0.3.4";
+       sha256 = "0vp1r171myahkx8n5mndjabggy219mzbzxyfz93mwpnyf1z7cdvm";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
@@ -18086,8 +18540,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "0.3.3";
-       sha256 = "138i4b53x82j9agdlbbq90al6397zns2732igadfa3yydy0m9w0v";
+       version = "0.3.4";
+       sha256 = "04mc8cjn1hdprki0hvbbyb7gzsdxdr7lci41vnmhw6ic3gcy2mhv";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
@@ -18098,8 +18552,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "0.3.3";
-       sha256 = "04gvg50przsxagrj7zvbidyf0xx3iqhh23sbzbpfl6ljczig9qmk";
+       version = "0.3.4";
+       sha256 = "1qxkzqvfid2g7hcc427zhy8llfa25wpimi7cfdzl9dqmmkqlxinm";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
@@ -18110,22 +18564,22 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, bifunctors, bytestring, case-insensitive
      , conduit, conduit-extra, cryptohash, data-default-class, hashable
-     , http-client, http-types, lens, mmorph, mtl, nats, old-locale
-     , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit
-     , template-haskell, text, time, transformers, transformers-compat
-     , unordered-containers, vector, xml-conduit
+     , http-client, http-types, lens, mmorph, mtl, resourcet, scientific
+     , semigroups, tagged, tasty, tasty-hunit, template-haskell, text
+     , time, transformers, transformers-compat, unordered-containers
+     , vector, xml-conduit
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "0.3.3";
-       sha256 = "1mglm6w0pmbhvvgzw5ylv0k97f9cx9nk8yq3akp499bn8nxf70i3";
+       version = "0.3.4";
+       sha256 = "0sih0wvncrz6v4xcn34ckhxc7b15bx87qbr7icwk1w6zs08809jz";
        buildDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bifunctors bytestring case-insensitive conduit conduit-extra
          cryptohash data-default-class hashable http-client http-types lens
-         mmorph mtl nats old-locale resourcet scientific semigroups tagged
-         text time transformers transformers-compat unordered-containers
-         vector xml-conduit
+         mmorph mtl resourcet scientific semigroups tagged text time
+         transformers transformers-compat unordered-containers vector
+         xml-conduit
        ];
        testDepends = [
          aeson base tasty tasty-hunit template-haskell text
@@ -18139,8 +18593,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "0.3.3";
-       sha256 = "1r4k349yy7zi6jas9llxvig6jbqlq2b1nwgy1d40zr4hgjxx9zhk";
+       version = "0.3.4";
+       sha256 = "0f7y3wb9ijd8hjxbzav63zdwrjhzh000xqc4n2cnx0lrcrssvs2i";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
@@ -18151,8 +18605,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "0.3.3";
-       sha256 = "068b60p7gka5azfk181z4n6sdlz5mmnn88x1kcpj3ld290sq264i";
+       version = "0.3.4";
+       sha256 = "1y6nyjf8m2py5wnk3cbypi0ckqv7nyr2la3h8nm1wj8njwh359jn";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
@@ -18163,8 +18617,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "0.3.3";
-       sha256 = "0hiksl517yc07dbkm72ms6rr07hwkr7g3390v8xqgv1bqg33cwls";
+       version = "0.3.4";
+       sha256 = "160nk75112sdnf834gpc0y1fzsbb0lrp98g9zim38rd4v7pz2ax9";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
@@ -18175,8 +18629,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "0.3.3";
-       sha256 = "18gsf2hwa3vii1g80rxw8b6j4cj513sglf6i4jpf6l96ncs1zavy";
+       version = "0.3.4";
+       sha256 = "0chfyyryyk8vd1783021awvwwla5fdm04x3w500157xvazhk286m";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
@@ -18187,8 +18641,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "0.3.3";
-       sha256 = "0ssdhcdsjysxxzfa0r40jpf9s6x5gwds1lyr462zkai1nc63f8f3";
+       version = "0.3.4";
+       sha256 = "1pv79b0865gqpf89abjjk4y24d6nr2lk45xpn0n7ckri0b54dga4";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
@@ -18199,8 +18653,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "0.3.3";
-       sha256 = "19zdxmisp3bh2lfx0a7ivghpciwgdmbmj4iah2fgwxbc01p0srbm";
+       version = "0.3.4";
+       sha256 = "01mg116sqxa4z7ss0fwzvsgkmxrqs52ac9z6mrsfymjspyd9fbli";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
@@ -18211,8 +18665,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "0.3.3";
-       sha256 = "09awjlp1yay1arpw5yavz879v40hxsy5pij8ky4fnvwdclsxx0qs";
+       version = "0.3.4";
+       sha256 = "13lzdnwg9x2jrhk251b0vrg4y2avg77ppq4wdgjzmbb2myp618ll";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
@@ -18223,8 +18677,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "0.3.3";
-       sha256 = "06nq2zz2yc1wsgx8m9cb0filb9wfmcj4xh0ipk4jzlnhnl2izir2";
+       version = "0.3.4";
+       sha256 = "1wi1h07pp8n45ynn9lqvjfz265k0bp7qqxk5qmqlg93yajgjfkcl";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
@@ -18235,8 +18689,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "0.3.3";
-       sha256 = "1rdzcxj6ccpqprmq6jdqyv1frmcwd8n21slx70bvqmls208nydf7";
+       version = "0.3.4";
+       sha256 = "11ky0g8cgnd6lcjdc6a9087ka5f6hc3x08xnvjjfwipmdhps4k9r";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
@@ -18247,8 +18701,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "0.3.3";
-       sha256 = "1fpppmsg4bdabczcbhcar7kjxkv0c2j8nqjckfimj57bbxslxjdx";
+       version = "0.3.4";
+       sha256 = "1dq1xs7simxcag3c2bcr22k1595avl69jz6zv3nrsn1rvzj9milv";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
@@ -18259,8 +18713,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "0.3.3";
-       sha256 = "11dli63wj57yya7yzc8fh06yvcrqhpf9w2wzb08si30xkbzx3jw1";
+       version = "0.3.4";
+       sha256 = "1dd635s0i9imj62dg9rqvfrx2aqw6593z61ckqixlb247jii82i6";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
@@ -18271,8 +18725,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "0.3.3";
-       sha256 = "0hpaj7d9lkfb589qr9nrvf3c7plqml9v1b7kgckx5x7abjva102h";
+       version = "0.3.4";
+       sha256 = "1snh7xs2f2mjr3ln24xj73y5idmb45in1ykaz3v5wbqdb19m4w94";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
@@ -18283,8 +18737,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "0.3.3";
-       sha256 = "1fkgz9w3dkvmkyprvadbhwzc0928zib7k09dfvwdb6h1phhl9w6f";
+       version = "0.3.4";
+       sha256 = "15xgfxlrjhn8inl5a0rfsyyy8sp0rinlwll9snpdl7nrnqvmn00s";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
@@ -18295,8 +18749,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "0.3.3";
-       sha256 = "08x1wyqf6kibvkrg4dcsz638x7fnl4z23nninvcmrcivfqcjy27a";
+       version = "0.3.4";
+       sha256 = "0fag3xr9w2gi038hh9kiqmqgbsn53x48h9jwj49cr1r9qrrs86wa";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
@@ -18307,8 +18761,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "0.3.3";
-       sha256 = "13hllhcvn2annqhq0dxcv1rvlhzj161xjhnz8vwazcsmpv2wb6pk";
+       version = "0.3.4";
+       sha256 = "0ds97lk5ifc529199lmvijs5gif4bzh8lwczpz1xspin37bjiz62";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
@@ -18319,20 +18773,32 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "0.3.3";
-       sha256 = "0a11riyrs6xx0207p4nkmxvc0y11ndrl6k3rgz2jdvv7g1j31fym";
+       version = "0.3.4";
+       sha256 = "1njdwml6mp8phd323cgyfw7v2iv8l4k7r6pi4vq4mygpa2gx0dn1";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = "unknown";
      }) {};
 
+  "amazonka-ml" = callPackage
+    ({ mkDerivation, amazonka-core, base }:
+     mkDerivation {
+       pname = "amazonka-ml";
+       version = "0.3.4";
+       sha256 = "1sv6a74gk30rhsh98j2f6xsad6hfcr3cjyi8ahz1qjh4nqjrrssc";
+       buildDepends = [ amazonka-core base ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Machine Learning SDK";
+       license = "unknown";
+     }) {};
+
   "amazonka-opsworks" = callPackage
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "0.3.3";
-       sha256 = "03hk0s9l93vksifgy5bdb52mn2v38732c047bgmqfzf48iic2i48";
+       version = "0.3.4";
+       sha256 = "07l7a4v7s380vj8348bgv1m1hk1ldc41aphl67f17v2cndys3ml0";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
@@ -18343,8 +18809,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "0.3.3";
-       sha256 = "1h291g4wx2v50whjn4c9h64gvv1j2pn6pyzs7l7765nm3rdmb7cr";
+       version = "0.3.4";
+       sha256 = "1ji80nn9k10l9w5k5dqwhc0i2aaxa4l6bl995im5lrihilmazqgw";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
@@ -18355,8 +18821,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "0.3.3";
-       sha256 = "1wivm4ad6p8f5wip7d9cdwk557vy5dnakg62i5bsvi2l05wxh5zr";
+       version = "0.3.4";
+       sha256 = "18sd3abhpifwb4ylz35bnxzappgslpvzkrv9wh3hxqzs4mvxdj1n";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
@@ -18367,8 +18833,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "0.3.3";
-       sha256 = "0095idbqw6gs6h6pm0amzf6yhqr801pnlad914yac3xk80iywh9i";
+       version = "0.3.4";
+       sha256 = "05a77qcjlkjk0mv2ry25dlci43h5b9hh50f32ngqccjqmg4128ky";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
@@ -18379,8 +18845,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "0.3.3";
-       sha256 = "1np4x5lj9a8qgikiwbq2xchh2ngifmhd01lrbpzy44glda0gpxnc";
+       version = "0.3.4";
+       sha256 = "15qvmw6fgfcqgkqafywpai5i1in9iibl1r8m8pfxfdckmrbzaxz2";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
@@ -18391,8 +18857,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "0.3.3";
-       sha256 = "0qhdxklj2ilsgmk0cy5bdiyvdgmi9npwxfjbb8ngbg9mavdcs0rh";
+       version = "0.3.4";
+       sha256 = "0miyf7nnkxwybps3yg5fyqpxq5hkz4kllks5w4r7c62hd7sjq9dn";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
@@ -18403,8 +18869,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "0.3.3";
-       sha256 = "163aqpaxv2pfbfmz3mjw7dzcsjxjfiy36vqk2hsgavbmsgy7d4wq";
+       version = "0.3.4";
+       sha256 = "0jsg4g911qm3r8saxwax4rhdmg1kgfmagnnyzjv4rb02jkdfr7i1";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
@@ -18415,8 +18881,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "0.3.3";
-       sha256 = "18qjpn29hyc9lqky6d0kwi3i4kanzvii45csw2fvjlmcchb1mfhs";
+       version = "0.3.4";
+       sha256 = "0s0aa3fryvqwmp0zzmlzd0mk591i1c63qds0si3svf85zgl3slr4";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
@@ -18427,8 +18893,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "0.3.3";
-       sha256 = "14321x8chggq5fc12z7v5z8aic4p0r3fb8lrk595nwqybnamqg19";
+       version = "0.3.4";
+       sha256 = "1plrzqlvfn2aa0c4l2dh4nlygnv0biykz414yblcrj53w03yhqs2";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
@@ -18439,8 +18905,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "0.3.3";
-       sha256 = "030a0vx6py0m0gwplzjzkl3z7iq8n8s1f0knpw6da5xa8sy2na6v";
+       version = "0.3.4";
+       sha256 = "0bc0n71vhmcirij5agxy7h0zvqvm4psw5h3kzrnbib9wa2hkq8m4";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
@@ -18451,8 +18917,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "0.3.3";
-       sha256 = "0sk8kbb06v52gq0jxhrz0dzdv4kfhn2g0f5kvcpa3vrpvca0jnyk";
+       version = "0.3.4";
+       sha256 = "03p76rska5gl2ic7vjyhhdb89ikl17n8xkiwcb4184jzsvnscqzi";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Management Service SDK";
@@ -18463,8 +18929,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "0.3.3";
-       sha256 = "1fzr4c81xqblag8gd3sj6nc029b2klblxall2wm29ggv8j70n48b";
+       version = "0.3.4";
+       sha256 = "016wi9cq86z0giv68kzfdg2ia0m4kvlcsl6dj9d3cnvbcsg7s6xy";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
@@ -18475,8 +18941,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "0.3.3";
-       sha256 = "0lzpzvz1k00w1q5ahh76gvhhh7jyk3450ylhbrgjd8gw81k3klnj";
+       version = "0.3.4";
+       sha256 = "1fmjsvcxjrls98jd3vcldjy9wvsdkyi614rzs1d5bi11b6db202z";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
@@ -18487,8 +18953,8 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "0.3.3";
-       sha256 = "05v8m84gvwdqyalvck8lfn7x525kkah6f87bwd0mrci9vqdi55hc";
+       version = "0.3.4";
+       sha256 = "1kzy3nbc17dbbhi2k60da7rl6k2zbahzd9rjshvmn1fdsb61piq5";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
@@ -18499,14 +18965,26 @@ self: {
     ({ mkDerivation, amazonka-core, base }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "0.3.3";
-       sha256 = "1lrxr7dlbkv7x7hcdvf0ly3d4aj0i4j94yksd2x3jp5w33811hjx";
+       version = "0.3.4";
+       sha256 = "1w7ac4d7gj53hjvlk0sldww67gkgsbi8vmqhbcbqrbg2mrqr6l9d";
        buildDepends = [ amazonka-core base ];
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
      }) {};
 
+  "amazonka-workspaces" = callPackage
+    ({ mkDerivation, amazonka-core, base }:
+     mkDerivation {
+       pname = "amazonka-workspaces";
+       version = "0.3.4";
+       sha256 = "00gdahix24cm3qan11a9n2l1n9x0cnnxgid2gf4zhjqmvc3342sa";
+       buildDepends = [ amazonka-core base ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WorkSpaces SDK";
+       license = "unknown";
+     }) {};
+
   "ampersand" = callPackage
     ({ mkDerivation, base, bytestring, ConfigFile, containers
      , directory, filepath, graphviz, hashable, mtl, old-locale, pandoc
@@ -18625,6 +19103,7 @@ self: {
        homepage = "https://john-millikin.com/software/anansi/";
        description = "Simple literate programming preprocessor";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi-hscolour" = callPackage
@@ -18641,6 +19120,7 @@ self: {
        homepage = "https://john-millikin.com/software/anansi/";
        description = "Colorized looms for Anansi";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anansi-pandoc" = callPackage
@@ -18685,25 +19165,27 @@ self: {
 
   "angel" = callPackage
     ({ mkDerivation, base, configurator, containers, hspec, mtl
-     , old-locale, process, stm, text, time, unix, unordered-containers
+     , old-locale, optparse-applicative, process, stm, text, time
+     , transformers, unix, unordered-containers
      }:
      mkDerivation {
        pname = "angel";
-       version = "0.5.1";
-       sha256 = "1ag5bpwfmshcwhycp12ywqvhf4d1fdfs9haawzhawnjpcm5h2hha";
+       version = "0.5.2";
+       sha256 = "0h2nyxv56cshkxlbq5j54220w7x2y0m1aaqzqz6dhipff29pmr39";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base configurator containers mtl old-locale process stm text time
-         unix unordered-containers
+         base configurator containers mtl old-locale optparse-applicative
+         process stm text time transformers unix unordered-containers
        ];
        testDepends = [
          base configurator containers hspec mtl old-locale process stm text
-         time unix unordered-containers
+         time transformers unix unordered-containers
        ];
        homepage = "http://github.com/MichaelXavier/Angel";
        description = "Process management and supervision daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "animalcase" = callPackage
@@ -18718,7 +19200,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "annotated-wl-pprint" = callPackage
+  "annotated-wl-pprint_0_5_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "annotated-wl-pprint";
@@ -18730,6 +19212,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "annotated-wl-pprint" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "annotated-wl-pprint";
+       version = "0.6.0";
+       sha256 = "1rwjfw4fspyi564a847sb6k679sa6psajm2jybzpa1pvjq9z2a9x";
+       buildDepends = [ base ];
+       homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
+       description = "The Wadler/Leijen Pretty Printer, with annotation support";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "anonymous-sums" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -18846,6 +19340,7 @@ self: {
        jailbreak = true;
        description = "This is an IRC bot for Mafia and Resistance";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antigate" = callPackage
@@ -18864,6 +19359,7 @@ self: {
        homepage = "https://github.com/exbb2/antigate";
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antimirov" = callPackage
@@ -18906,6 +19402,7 @@ self: {
        jailbreak = true;
        description = "An engine for text-based dungeons";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antlrc" = callPackage
@@ -19021,20 +19518,20 @@ self: {
 
   "api-builder" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
-     , Cabal, containers, datetime, either, hspec, HTTP, http-client
-     , http-conduit, http-types, text, transformers
+     , Cabal, containers, either, hspec, HTTP, http-client, http-conduit
+     , http-types, text, transformers
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.6.0.0";
-       sha256 = "1ljc81zxh5zi8k7ccp6mh1kr3wmsp6z9df17zpymqjh2mgc6kswb";
+       version = "0.7.0.1";
+       sha256 = "12wkny82bn843zbvq6vcwmd7lxzdg9g978bhyy9r9gc81mgmwf8s";
        buildDepends = [
          aeson attoparsec base bifunctors bytestring either HTTP http-client
          http-conduit http-types text transformers
        ];
        testDepends = [
-         aeson base bytestring Cabal containers datetime hspec http-conduit
-         text transformers
+         aeson base bytestring Cabal containers hspec http-conduit text
+         transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/intolerable/api-builder";
@@ -19074,6 +19571,7 @@ self: {
        homepage = "http://github.com/iconnect/api-tools";
        description = "DSL for generating API boilerplate and docs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apiary" = callPackage
@@ -19422,8 +19920,8 @@ self: {
      }:
      mkDerivation {
        pname = "appc";
-       version = "0.0.5";
-       sha256 = "0xilcg5rbi6bnwbs3xkysnf3v5h07hxn764sxim0s0n75vvlvidy";
+       version = "0.0.6";
+       sha256 = "0qns7kjp9sjrpdx6vfkci9q6xinb0gwkb1a9ssw8xfbqqhf9ljms";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -19456,6 +19954,7 @@ self: {
        version = "0.0.3";
        sha256 = "057ii1519qwjhg64vahbg2z2a4ydb2ndd1bjzz6cb1cx3n7nigr8";
        buildDepends = [ base bifunctors ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/applicative-fail";
        description = "Applicative functor which collects all your fails";
        license = stdenv.lib.licenses.bsd3;
@@ -19473,6 +19972,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "applicative-parsec" = callPackage
+    ({ mkDerivation, base, containers, lens, mtl, QuickCheck
+     , test-framework, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "applicative-parsec";
+       version = "0.1.0.0";
+       sha256 = "12y2j9lpaqpjcr2a9fk4anlvc1cw5rimyx031b6xa5dx500phrrx";
+       buildDepends = [ base containers lens mtl text ];
+       testDepends = [
+         base mtl QuickCheck test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://www.github.com/ktvoelker/AParsec";
+       description = "An applicative parser combinator library";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "applicative-quoters" = callPackage
     ({ mkDerivation, base, haskell-src-meta, template-haskell }:
      mkDerivation {
@@ -19727,6 +20243,7 @@ self: {
        homepage = "http://archhaskell.wordpress.com/";
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arff" = callPackage
@@ -19745,6 +20262,7 @@ self: {
        homepage = "http://code.haskell.org/~StefanKersten/code/arff";
        description = "Generate Attribute-Relation File Format (ARFF) files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "argparser" = callPackage
@@ -19851,7 +20369,6 @@ self: {
        homepage = "https://github.com/emc2/arith-encode";
        description = "A practical arithmetic encoding (aka Godel numbering) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arithmatic" = callPackage
@@ -19877,6 +20394,7 @@ self: {
          array base containers ghc-prim integer-gmp mtl random
        ];
        configureFlags = [ "-f-llvm" ];
+       jailbreak = true;
        homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
@@ -19896,6 +20414,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "arpa" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "arpa";
+       version = "0.0.0.0";
+       sha256 = "13n878vafx1igw3q3v1c676iaidyqa4wk6z727vh7dagkkyl7653";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/sfischer13/haskell-arpa";
+       description = "Library for reading ARPA n-gram models";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "array_0_5_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -19930,6 +20463,7 @@ self: {
        jailbreak = true;
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "array-memoize" = callPackage
@@ -19977,6 +20511,7 @@ self: {
        homepage = "https://github.com/prophile/arrow-improve/";
        description = "Improved arrows";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrow-list" = callPackage
@@ -20000,6 +20535,7 @@ self: {
        buildDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrowp" = callPackage
@@ -20059,6 +20595,7 @@ self: {
        homepage = "http://github.com/solidsnack/arx/";
        description = "Archive execution tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arxiv" = callPackage
@@ -20140,6 +20677,7 @@ self: {
          attoparsec base binary bytestring deepseq deepseq-generics HUnit
          split zlib
        ];
+       jailbreak = true;
        description = "Process Ascii Vectors for Advantest 93k";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -20165,8 +20703,8 @@ self: {
      }:
      mkDerivation {
        pname = "asciidiagram";
-       version = "1.0";
-       sha256 = "1nvjx2pwza26ppp2lpmlm1200kk8l6sgcsk23fskiamc6xh51vqg";
+       version = "1.1";
+       sha256 = "0vd4m3i4997vdd5wzy3jbidaz4rcsncqjdz0pf5ggrm9c5a8jb2y";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -20224,9 +20762,11 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring cereal mtl text ];
+       jailbreak = true;
        homepage = "http://github.com/vincenthz/hs-asn1-data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asn1-encoding" = callPackage
@@ -20466,6 +21006,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ async base stm unordered-containers ];
+       jailbreak = true;
        homepage = "http://github.com/jfischoff/async-manager";
        description = "A thread manager for async";
        license = stdenv.lib.licenses.bsd3;
@@ -20498,6 +21039,7 @@ self: {
        version = "1.1.0.1";
        sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/feuerbach/asynchronous-exceptions";
        description = "Distinguish between synchronous and asynchronous exceptions";
        license = stdenv.lib.licenses.mit;
@@ -20527,6 +21069,7 @@ self: {
        homepage = "https://github.com/GaloisInc/aterm-utils";
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atl" = callPackage
@@ -20550,8 +21093,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-core";
-       version = "0.5.0.0";
-       sha256 = "09v6q0pnl68jv9mq4hlzzz2lqih172zymv9j2f0fpidmq67ayz9b";
+       version = "0.5.1.0";
+       sha256 = "02959rj5sdl28b3kj42ab1x83vcvkn61v5np7plgbqxbmrnnc9pr";
        buildDepends = [
          aeson atlassian-connect-descriptor base base64-bytestring
          bytestring case-insensitive cipher-aes configurator containers
@@ -20559,7 +21102,6 @@ self: {
          network network-api-support network-uri snap snap-core split text
          time time-units transformers
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core";
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
@@ -20573,8 +21115,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.0.0";
-       sha256 = "0m74k68sx2zdyn1wjc344v18cnpbkvzy9r4lvf9cm0h2vsjrlgrq";
+       version = "0.4.0.2";
+       sha256 = "1pss2rkd1s4dmnym5w2sanhqgz2pv1n9zyq4n8jy8ihc4zgrcscp";
        buildDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -20583,7 +21125,6 @@ self: {
          aeson base bytestring Cabal cases HUnit network network-uri
          scientific text time-units unordered-containers vector
        ];
-       jailbreak = true;
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20634,6 +21175,7 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "A DSL for embedded hard realtime applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -20653,10 +21195,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, primitive }:
      mkDerivation {
        pname = "atomic-primops";
-       version = "0.7";
-       revision = "1";
-       sha256 = "1gd2m7qnyww3dv5vcajh9j5chcwlkfsqgpi299q2x4n9xrp0d50g";
-       editedCabalFile = "99594a0f7b2fd268f7f68e460218c22bda9da07c559fb5ead6d3c508f01d9cff";
+       version = "0.8";
+       sha256 = "0wb45yjflpih94i95s88hfl4mcddcjsabspnm6h20wxv0n09xqf0";
        buildDepends = [ base ghc-prim primitive ];
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "A safe approach to CAS and other atomic ops in Haskell";
@@ -20670,7 +21210,9 @@ self: {
      mkDerivation {
        pname = "atomic-primops-foreign";
        version = "0.6.2";
+       revision = "1";
        sha256 = "1pfdbrxx4s6n53lfhxghcalm8dif2r9zj45bipibvyiczz5xkkpm";
+       editedCabalFile = "fd1067adbd96e923226347dccaa9e3e221439702fe7824c86db44eb5b7f6c318";
        buildDepends = [ base bits-atomic ];
        testDepends = [
          base bits-atomic HUnit test-framework test-framework-hunit time
@@ -20708,6 +21250,7 @@ self: {
        testDepends = [
          base bytestring directory filepath hspec temporary text unix-compat
        ];
+       jailbreak = true;
        description = "Atomically write to a file";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -20766,6 +21309,7 @@ self: {
          attoparsec base bytestring HUnit test-framework
          test-framework-hunit text
        ];
+       jailbreak = true;
        homepage = "http://github.com/nominolo/atto-lisp";
        description = "Efficient parsing and serialisation of S-Expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -20837,6 +21381,7 @@ self: {
        homepage = "https://github.com/robinbb/attoparsec-csv";
        description = "A parser for CSV files that uses Attoparsec";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-enumerator" = callPackage
@@ -20951,6 +21496,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "audacity" = callPackage
+    ({ mkDerivation, base, deepseq, utility-ht }:
+     mkDerivation {
+       pname = "audacity";
+       version = "0.0";
+       sha256 = "1vfp5x5b6z7lwjiv8jla5bdwbcbafdm31zs9kr555idzz1n8wmqz";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base deepseq utility-ht ];
+       homepage = "http://code.haskell.org/~thielema/audacity";
+       description = "Interchange with the Audacity sound signal editor";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "audiovisual" = callPackage
     ({ mkDerivation, base, boundingboxes, colors, deepseq, directory
      , filepath, free, freetype2, hashable, JuicyPixels
@@ -21021,9 +21580,11 @@ self: {
          aeson aeson-pretty base filepath lens lens-aeson mtl text vector
          wreq
        ];
+       jailbreak = true;
        homepage = "https://github.com/fosskers/haskell-aur";
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "authenticate" = callPackage
@@ -21137,7 +21698,6 @@ self: {
          base bytestring cereal containers deepseq MonadRandom profunctors
          random semigroups transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/mstksg/auto";
        description = "Denotative, locally stateful programming DSL & platform";
        license = stdenv.lib.licenses.mit;
@@ -21203,6 +21763,7 @@ self: {
        homepage = "http://code.haskell.org/autoproc";
        description = "EDSL for Procmail scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avahi" = callPackage
@@ -21214,6 +21775,7 @@ self: {
        buildDepends = [ base dbus-core text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "average" = callPackage
@@ -21237,8 +21799,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.3";
-       sha256 = "0y58qixd9kjm0wp5spachm581mshp15pcvlyv48nsrabrzssn3ng";
+       version = "0.0.5";
+       sha256 = "17291lzz09d5rpz62395jfqkwc06sp8pwd8wq04wycsk0hizz32i";
        buildDepends = [
          aeson attoparsec base base16-bytestring bytestring containers
          cryptohash inflections influxdb MonadRandom mtl network
@@ -21334,10 +21896,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.11.3";
-       revision = "1";
-       sha256 = "02p3dn380qj8wg6alm7yqw4svwwkw9ln9rjd6shbk4jz8gsaka8l";
-       editedCabalFile = "e4265585066ef7d7cb3473938a62d6c996084ba1a9e05f9efbfa60057760efac";
+       version = "0.11.4";
+       sha256 = "1mjpk17c2grlbxkwskplzqwn0icxpmv5pjc27xgwah5g97cm9hik";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -21395,6 +21955,7 @@ self: {
          http-conduit http-types mtl old-locale parsers profunctors
          resourcet scientific text time
        ];
+       jailbreak = true;
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -21423,6 +21984,7 @@ self: {
        homepage = "https://github.com/zalora/aws-ec2";
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-elastic-transcoder" = callPackage
@@ -21453,8 +22015,8 @@ self: {
     ({ mkDerivation, aeson, attoparsec, aws, base, base16-bytestring
      , blaze-builder, byteable, bytestring, case-insensitive, charset
      , cryptohash, deepseq, directory, either, errors, hashable
-     , http-types, old-locale, parsers, QuickCheck, quickcheck-instances
-     , tagged, tasty, tasty-quickcheck, text, time, transformers
+     , http-types, parsers, QuickCheck, quickcheck-instances, tagged
+     , tasty, tasty-quickcheck, text, time, transformers
      }:
      mkDerivation {
        pname = "aws-general";
@@ -21463,8 +22025,7 @@ self: {
        buildDepends = [
          aeson attoparsec base base16-bytestring blaze-builder byteable
          bytestring case-insensitive cryptohash deepseq hashable http-types
-         old-locale parsers QuickCheck quickcheck-instances text time
-         transformers
+         parsers QuickCheck quickcheck-instances text time transformers
        ];
        testDepends = [
          attoparsec aws base bytestring case-insensitive charset directory
@@ -21505,27 +22066,25 @@ self: {
   "aws-kinesis-client" = callPackage
     ({ mkDerivation, aeson, aws, aws-general, aws-kinesis, base
      , base-unicode-symbols, bytestring, conduit, containers
-     , data-carousel, either, errors, hoist-error, http-conduit
-     , kan-extensions, lens, lens-action, lifted-async, lifted-base
-     , monad-control, mtl, optparse-applicative, random, resourcet, stm
-     , stm-chans, stm-conduit, stm-queue-extras, text, transformers
-     , unordered-containers
+     , data-carousel, enclosed-exceptions, http-conduit, kan-extensions
+     , lens, lens-action, lifted-async, lifted-base, monad-control, mtl
+     , nats, optparse-applicative, random, resourcet, stm, stm-chans
+     , stm-queue-extras, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "aws-kinesis-client";
-       version = "0.3.0.2";
-       sha256 = "0p1544yq9cs9qz9za2gcsdvd8wkq66sa0kzzv3i2c6xjbqy0wpgr";
+       version = "0.4.0.1";
+       sha256 = "1ky05hq0fs500jbf840ap6ji4vq26vn50w5cz8nqfz416jdjgx7r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson aws aws-general aws-kinesis base base-unicode-symbols
-         bytestring conduit containers data-carousel either errors
-         hoist-error http-conduit kan-extensions lens lens-action
-         lifted-async lifted-base monad-control mtl optparse-applicative
-         random resourcet stm stm-chans stm-conduit stm-queue-extras text
-         transformers unordered-containers
+         bytestring conduit containers data-carousel enclosed-exceptions
+         http-conduit kan-extensions lens lens-action lifted-async
+         lifted-base monad-control mtl nats optparse-applicative random
+         resourcet stm stm-chans stm-queue-extras text transformers
+         unordered-containers
        ];
-       jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -21570,9 +22129,11 @@ self: {
          exceptions filepath http-client http-types lens lens-action
          lens-aeson mtl old-locale text time wreq zip-archive
        ];
+       jailbreak = true;
        homepage = "https://github.com/alephcloud/hs-aws-lambda";
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-performance-tests" = callPackage
@@ -21605,14 +22166,15 @@ self: {
      }:
      mkDerivation {
        pname = "aws-route53";
-       version = "0.1.1";
-       sha256 = "1nzxs6ff0nh6ncswfnx2gxxmx2by0xxzfpmlkk1cnd9xkz7c8n0k";
+       version = "0.1.2";
+       sha256 = "0qg0fzw5kb3xvldxc2sx7xgkwgspyscvs83sv3nrw91qjp6ypi18";
        buildDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sdk" = callPackage
@@ -21665,6 +22227,7 @@ self: {
        homepage = "https://github.com/worksap-ate/aws-sdk-text-converter";
        description = "The text converter for aws-sdk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sdk-xml-unordered" = callPackage
@@ -21686,6 +22249,7 @@ self: {
        homepage = "https://github.com/worksap-ate/aws-sdk-xml-unordered";
        description = "The xml parser for aws-sdk package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sign4" = callPackage
@@ -21819,6 +22383,7 @@ self: {
        homepage = "http://arnovanlumig.com/azure";
        description = "A simple library for accessing Azure blob storage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "b-tree" = callPackage
@@ -21865,9 +22430,11 @@ self: {
          aeson base bytestring hspec hspec-expectations QuickCheck
          semigroups text unordered-containers vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "babylon" = callPackage
@@ -21881,6 +22448,7 @@ self: {
        buildDepends = [ array base containers random wx wxcore ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backdropper" = callPackage
@@ -21918,7 +22486,6 @@ self: {
        homepage = "https://github.com/tapuu/backtracking-exceptions";
        description = "A monad transformer for backtracking exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backward-state" = callPackage
@@ -21928,6 +22495,7 @@ self: {
        version = "0.1.0.2";
        sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam";
        buildDepends = [ base transformers ];
+       jailbreak = true;
        homepage = "https://github.com/luqui/backward-state";
        description = "A state monad that runs the state in reverse through the computation";
        license = stdenv.lib.licenses.bsd3;
@@ -21956,6 +22524,7 @@ self: {
        buildDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bake" = callPackage
@@ -22140,6 +22709,7 @@ self: {
        sha256 = "0kjn5f76w9ff73blg8apxkhfsk1clv2i52gr4frgqn7l6f32yp22";
        buildDepends = [ base containers time ];
        testDepends = [ base containers hspec QuickCheck time ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
@@ -22158,7 +22728,6 @@ self: {
        homepage = "http://sebfisch.github.com/haskell-barchart";
        description = "Creating Bar Charts in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barcodes-code128" = callPackage
@@ -22168,8 +22737,10 @@ self: {
        version = "0.1.0";
        sha256 = "14blxjhapn9g7cp7374f5s2nln7wgyb7a6z50gp04lnqf1aw6kmg";
        buildDepends = [ base bytestring HPDF ];
+       jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barecheck" = callPackage
@@ -22179,6 +22750,7 @@ self: {
        version = "0.2.0.8";
        sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7";
        buildDepends = [ base containers QuickCheck text time ];
+       jailbreak = true;
        homepage = "http://github.com/massysett/barecheck";
        description = "QuickCheck implementations for common types";
        license = stdenv.lib.licenses.bsd3;
@@ -22262,18 +22834,17 @@ self: {
        version = "4.8.0.0";
        sha256 = "1mf5s7niw0zmm1db7sr6kdpln8drcy77fn44h6sspima8flwcp44";
        buildDepends = [ ghc-prim rts ];
-       jailbreak = true;
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "base-compat" = callPackage
-    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck, setenv }:
+    ({ mkDerivation, base, hspec, QuickCheck, unix }:
      mkDerivation {
        pname = "base-compat";
-       version = "0.7.1";
-       sha256 = "1kw3s8j8wljbbjx9gyxd2z5yyhcyj87s867gd6r0afz9m08mm6qa";
-       buildDepends = [ base ghc-prim setenv ];
+       version = "0.8.1";
+       sha256 = "0v4vrx5rkhd9r4zca86gr6gh7ggbkg2h9i7vavm41j4y96ipcqvz";
+       buildDepends = [ base unix ];
        testDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
@@ -22286,11 +22857,25 @@ self: {
        version = "0.4.0.0";
        sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/bheklilr/base-io-access";
        description = "The IO functions included in base delimited into small, composable classes";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "base-orphans" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.2.0";
+       sha256 = "12xakv3vkgmdrgv6w5qddwkgyz2vw902fbps3gd334nzhgbxciwn";
+       buildDepends = [ base ghc-prim ];
+       testDepends = [ base hspec ];
+       homepage = "https://github.com/haskell-compat/base-orphans";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "base-prelude" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -22378,6 +22963,19 @@ self: {
        license = "unknown";
      }) {};
 
+  "base58string" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, hspec, text }:
+     mkDerivation {
+       pname = "base58string";
+       version = "0.9.1";
+       sha256 = "1j7vk3par9z2svq8mwwxm73yd5yks25412l3n9mr081ybvywkckd";
+       buildDepends = [ aeson base binary bytestring text ];
+       testDepends = [ base binary bytestring hspec text ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Fast and safe representation of a Base-58 string";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "base64-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, containers, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -22464,8 +23062,8 @@ self: {
      }:
      mkDerivation {
        pname = "basic-prelude";
-       version = "0.3.12";
-       sha256 = "1qmwxd8wfszawhfncqhcnbc2h1a47jcqa4zj4pfwybhy3xnn0yns";
+       version = "0.3.13";
+       sha256 = "0kfqh5jf9lfxmqhfi74i13cgkwchfkyall4glh2inna3ish4qz5l";
        buildDepends = [
          base bytestring containers hashable lifted-base ReadArgs safe
          system-filepath text transformers unordered-containers vector
@@ -22508,6 +23106,7 @@ self: {
        version = "0.2.0.0";
        sha256 = "1nzli8n6lpa9jahwp3awvpafzfkx4j02bwanilh30sxfyp0mlxxa";
        buildDepends = [ aeson base containers http-conduit text ];
+       jailbreak = true;
        homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "API client for Battle.Net";
        license = stdenv.lib.licenses.mit;
@@ -22520,6 +23119,7 @@ self: {
        version = "0.2.0.0";
        sha256 = "056z84rha1nwjij3am16vfp4nwgp7xzqrhkvrx9s8p1vivyb80yz";
        buildDepends = [ base battlenet http-conduit text yesod-core ];
+       jailbreak = true;
        homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "Yesod integration for the battlenet package";
        license = stdenv.lib.licenses.mit;
@@ -22752,6 +23352,7 @@ self: {
        buildDepends = [ base binary bytestring containers parsec ];
        description = "Parser and printer for bencoded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bencoding" = callPackage
@@ -22768,6 +23369,7 @@ self: {
        testDepends = [
          attoparsec base bytestring containers ghc-prim hspec QuickCheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/cobit/bencoding";
        description = "A library for encoding and decoding of BEncode data";
        license = stdenv.lib.licenses.bsd3;
@@ -22831,6 +23433,7 @@ self: {
        homepage = "https://github.com/feuerbach/bert";
        description = "BERT implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "besout" = callPackage
@@ -22840,6 +23443,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "0bv68nn6ijf1wv57kwp4yj6s75g960pds0n9wihxwkr4hh5azls1";
        buildDepends = [ base ];
+       jailbreak = true;
        description = "Extended GCD of polynomials over F_p[x]";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22865,6 +23469,7 @@ self: {
          base lens QuickCheck semigroups test-framework
          test-framework-quickcheck2 test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/Noeda/bet/";
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
@@ -22880,6 +23485,7 @@ self: {
        sha256 = "0ry42sp40234c83iw7di37j3jfjfbszxcv4mzgqc54b1693mjq7b";
        buildDepends = [ attoparsec base errors hashable text text-icu ];
        testDepends = [ base hspec QuickCheck smallcheck ];
+       jailbreak = true;
        description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -22946,11 +23552,27 @@ self: {
        version = "0.1.0.1";
        sha256 = "0wg2dh3i50c4f1bc0csi3ppbz28scjfhcr0hqfd0cpfiaf79fs5s";
        buildDepends = [ attoparsec base bytestring time ];
+       jailbreak = true;
        homepage = "http://github.com/jonpetterbergman/bgmax";
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bgzf" = callPackage
+    ({ mkDerivation, base, bytestring, mtl, parallel, pipes
+     , streaming-commons
+     }:
+     mkDerivation {
+       pname = "bgzf";
+       version = "0.1.0.0";
+       sha256 = "1lmwb65ads6ip5v0h8z03nyzxr9556p13j1y34lhgsyk2lxwdkrv";
+       buildDepends = [
+         base bytestring mtl parallel pipes streaming-commons
+       ];
+       description = "Blocked GZip";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bibtex" = callPackage
     ({ mkDerivation, base, latex, parsec, utility-ht }:
      mkDerivation {
@@ -22994,6 +23616,7 @@ self: {
        buildDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bidispec-extras" = callPackage
@@ -23277,6 +23900,7 @@ self: {
        buildDepends = [ array base ];
        description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-list" = callPackage
@@ -23285,8 +23909,8 @@ self: {
      }:
      mkDerivation {
        pname = "binary-list";
-       version = "1.1.0.2";
-       sha256 = "006a46yw1jcdw2yhpwimbjcpls0vrhzrhiylxh6vc136w2kb6qcd";
+       version = "1.1.1.0";
+       sha256 = "03fh5ipmmjzdyywm28m2kkbxn11yb4ygrs1q2igll1mbmpm2km6x";
        buildDepends = [
          base binary bytestring deepseq phantom-state transformers
        ];
@@ -23405,6 +24029,7 @@ self: {
          base binary bytestring Cabal cabal-test-quickcheck io-streams
          QuickCheck
        ];
+       jailbreak = true;
        homepage = "http://github.com/jonpetterbergman/binary-streams";
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
@@ -23418,9 +24043,11 @@ self: {
        version = "0.4.8.2";
        sha256 = "0cyrr45wpq5h4gg6qms54nmvhqpyj59d5bhlk316g4yjsf3484b7";
        buildDepends = [ array base bytestring containers mtl ];
+       jailbreak = true;
        homepage = "https://github.com/idontgetoutmuch/binary-low-level";
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-typed" = callPackage
@@ -23476,10 +24103,12 @@ self: {
      mkDerivation {
        pname = "binding-core";
        version = "0.2.2";
+       revision = "1";
        sha256 = "0qr7nr9cksy2cx2h8g2d485797hvv67197c654va0xwadkj5iviz";
+       editedCabalFile = "1aeacdf0ebf89a2f515ab0ef767ed86f44b4b22f740ac23d1afd76df391955c6";
        buildDepends = [ base stm ];
        testDepends = [ base HTF HUnit QuickCheck random ];
-       homepage = "http://code.accursoft.com/binding";
+       homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23489,10 +24118,12 @@ self: {
      mkDerivation {
        pname = "binding-gtk";
        version = "0.2.1";
+       revision = "1";
        sha256 = "0l68n13w1khfqkc791l9mcnk3cb0565a9ysfn7b3hh5cjx8zi7vr";
+       editedCabalFile = "9e435774bd5d6a7d9dd1e96dd9293d6a739f7ecde23838571d30866ac4628cb5";
        buildDepends = [ base binding-core gtk mtl ];
        testDepends = [ base binding-core directory gtk ];
-       homepage = "http://code.accursoft.com/binding";
+       homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23503,12 +24134,15 @@ self: {
      mkDerivation {
        pname = "binding-wx";
        version = "0.2.1";
+       revision = "1";
        sha256 = "07nbb6a0fmyhmx2dakkw4msxnv273hfcw3swdk3aczpfqlxd1r4i";
+       editedCabalFile = "0307431866ac8b7f34ece32a684a3c70aa1b36ce74c05d815f249d1effe2efb2";
        buildDepends = [ base binding-core stm wx wxcore ];
        testDepends = [ base binding-core directory wx ];
-       homepage = "http://code.accursoft.com/binding";
+       homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings" = callPackage
@@ -23555,8 +24189,8 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-GLFW";
-       version = "3.1.1.2";
-       sha256 = "1r9nny6873nzk8ij53byqad0hfni8f1ysrajm430867pizvyfj50";
+       version = "3.1.1.3";
+       sha256 = "0pzhlzx8h5g3cs7wr06zydabprlrf5sgdvdqmr2wg10azikxc12z";
        buildDepends = [ base bindings-DSL ];
        testDepends = [ base HUnit test-framework test-framework-hunit ];
        extraLibraries = [
@@ -23748,6 +24382,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { fann = null;};
 
+  "bindings-fluidsynth" = callPackage
+    ({ mkDerivation, base, bindings-DSL, fluidsynth }:
+     mkDerivation {
+       pname = "bindings-fluidsynth";
+       version = "0.1.1";
+       sha256 = "04q5zxv4iyjb7zf7bhx19cfc8nhnqxmxnl1q63qszjysmlpy39g5";
+       buildDepends = [ base bindings-DSL ];
+       pkgconfigDepends = [ fluidsynth ];
+       homepage = "http://github.com/bgamari/bindings-fluidsynth";
+       description = "Haskell FFI bindings for fluidsynth software synthesizer";
+       license = stdenv.lib.licenses.bsd3;
+     }) { inherit (pkgs) fluidsynth;};
+
   "bindings-friso" = callPackage
     ({ mkDerivation, base, bindings-DSL, friso }:
      mkDerivation {
@@ -23994,6 +24641,7 @@ self: {
        sha256 = "0w61xzx8krr1pfa9ys7akpra2r0njziysm3ri08fb98g75hp9942";
        buildDepends = [ base bindings-DSL ];
        extraLibraries = [ lxc ];
+       jailbreak = true;
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
@@ -24040,6 +24688,7 @@ self: {
        homepage = "http://floss.scru.org/bindings-nettle";
        description = "bindings to nettle crypto library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) nettle;};
 
   "bindings-parport" = callPackage
@@ -24093,8 +24742,8 @@ self: {
      }:
      mkDerivation {
        pname = "bindings-saga-cmd";
-       version = "0.1.0.0";
-       sha256 = "14wcw62j6lmlx3dy3k0ssy7mc2q8y8p7r1gr6m9rszxb9r5h1b9r";
+       version = "0.1.1.0";
+       sha256 = "1vv3cx3g3zvrg6xb355b98qxxxf621scqbzaaq45dvfzq9kvclwi";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -24212,15 +24861,14 @@ self: {
      }:
      mkDerivation {
        pname = "binembed";
-       version = "0.1.0.2";
-       sha256 = "0cabiww0iczgpk7rrf4iqy3vamq65w5m1r5y90117llr6w610rks";
+       version = "0.1.0.3";
+       sha256 = "163cs2qfj68dvbsyfg37hzb29jp0ylfpqlnhzjswm4j8mrcfsl3r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring Cabal containers directory dlist filepath
        ];
-       jailbreak = true;
-       homepage = "http://gitorious.org/binembed";
+       homepage = "http://code.mathr.co.uk/binembed";
        description = "Embed data into object files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24230,13 +24878,12 @@ self: {
      }:
      mkDerivation {
        pname = "binembed-example";
-       version = "0.1";
-       sha256 = "069caz3gzpnc9fm553yxj3jwn07svb0i34kfqw4vzlkkpzs5r5g4";
+       version = "0.1.0.3";
+       sha256 = "06lw6jvg382k3wj8ybld05bj3nchb8dqk363a69mak3r5zxg43iy";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base binembed bytestring containers filepath ];
-       jailbreak = true;
-       homepage = "http://gitorious.org/binembed";
+       homepage = "http://code.mathr.co.uk/binembed";
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24260,6 +24907,7 @@ self: {
        homepage = "http://biohaskell.org/Libraries/Bio";
        description = "A bioinformatics library";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bioace" = callPackage
@@ -24372,6 +25020,7 @@ self: {
        homepage = "http://biohaskell.org/";
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biostockholm" = callPackage
@@ -24429,6 +25078,7 @@ self: {
        sha256 = "0v04drr3m3096shp70l4iwqzva45szjhfl1yzaqblvn49hky8kns";
        buildDepends = [ base loch-th numeric-qq placeholders ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/bit-array";
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
        license = stdenv.lib.licenses.mit;
@@ -24489,6 +25139,55 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bitcoin-script" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring, hspec
+     , text
+     }:
+     mkDerivation {
+       pname = "bitcoin-script";
+       version = "0.11.0";
+       sha256 = "010vkqma0nx3msg4hgazi7700a64x51p8zaajayli7px6yffblw1";
+       buildDepends = [ base base16-bytestring binary bytestring text ];
+       testDepends = [ base bytestring hspec ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Compilation, manipulation and decompilation of Bitcoin scripts";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "bitcoin-tx" = callPackage
+    ({ mkDerivation, base, binary, bitcoin-script, bytestring
+     , cryptohash, hexstring, hspec
+     }:
+     mkDerivation {
+       pname = "bitcoin-tx";
+       version = "0.12.0";
+       sha256 = "13n64i73pqw052aw9sqmkdlf1ns6wh7z1ba1v8s9lv2zzphn8cxv";
+       buildDepends = [
+         base binary bitcoin-script bytestring cryptohash hexstring
+       ];
+       testDepends = [ base bitcoin-script bytestring hexstring hspec ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Utility functions for manipulating bitcoin transactions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "bitcoin-types" = callPackage
+    ({ mkDerivation, base, base58string, binary, bytestring, hexstring
+     , hspec, text
+     }:
+     mkDerivation {
+       pname = "bitcoin-types";
+       version = "0.9.0";
+       sha256 = "1y2v4cm00pmysi051z37rsxis0i97bjk5zvybmpxal9g4k8mlbi5";
+       buildDepends = [
+         base base58string binary bytestring hexstring text
+       ];
+       testDepends = [ base base58string bytestring hexstring hspec ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Provides consistent low-level types used commonly among Bitcoin implementations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bitly-cli" = callPackage
     ({ mkDerivation, base, Bitly, directory, filepath, regexpr }:
      mkDerivation {
@@ -24515,6 +25214,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitmap-opengl" = callPackage
@@ -24527,6 +25227,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for Data.Bitmap.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitmaps" = callPackage
@@ -24544,6 +25245,7 @@ self: {
        homepage = "https://github.com/bairyn/bitmaps";
        description = "Bitmap library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bits" = callPackage
@@ -24725,12 +25427,11 @@ self: {
     ({ mkDerivation, array, base, bytestring, QuickCheck }:
      mkDerivation {
        pname = "bitwise";
-       version = "0.1.0.1";
-       sha256 = "0k3xzw6lcrffbv8hqgg4kaanizql8r888ap4bw22sh3l3rq7zasn";
+       version = "0.1.0.2";
+       sha256 = "195g09frdyyn3wsb4jyspdmz8dlmpymqdlbss6zyslkddkrs8hdf";
        buildDepends = [ array base bytestring ];
        testDepends = [ base QuickCheck ];
-       jailbreak = true;
-       homepage = "https://gitorious.org/bitwise";
+       homepage = "http://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24882,6 +25583,7 @@ self: {
          data-default-class http-types kansas-comet scotty stm text
          transformers vector wai wai-extra warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
@@ -25276,6 +25978,7 @@ self: {
        buildDepends = [ base blaze-html blaze-markup ];
        description = "...";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blink1" = callPackage
@@ -25322,6 +26025,7 @@ self: {
        buildDepends = [
          base binary bytestring containers mtl pretty utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/bjpop/blip";
        description = "Support code for Blip";
        license = stdenv.lib.licenses.bsd3;
@@ -25414,6 +26118,7 @@ self: {
        buildDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bluetile" = callPackage
@@ -25435,6 +26140,7 @@ self: {
        homepage = "http://www.bluetile.org/";
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bluetileutils" = callPackage
@@ -25452,25 +26158,25 @@ self: {
      }) {};
 
   "blunt" = callPackage
-    ({ mkDerivation, aeson, array, base, bytestring, clay, containers
-     , flow, haskell-src-exts, http-types, jmacro, lucid, pointful, text
-     , transformers, wai, wai-extra, wai-websockets, warp, websockets
-     , wl-pprint-text
+    ({ mkDerivation, aeson, base, bytestring, clay, flow, http-types
+     , jmacro, lucid, pointfree, pointful, text, wai, wai-extra
+     , wai-websockets, warp, websockets, wl-pprint-text
      }:
      mkDerivation {
        pname = "blunt";
-       version = "0.0.16";
-       sha256 = "03pradwal8ncrpj7gin9ri753hsi78lpfj8zsihf26dli79g5vmk";
+       version = "1.0.2";
+       sha256 = "1p0mwpjvrv9d0b0gp6s55zys9vcbhpjsjbi711f5x4dagdl0xkhc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson array base bytestring clay containers flow haskell-src-exts
-         http-types jmacro lucid pointful text transformers wai wai-extra
-         wai-websockets warp websockets wl-pprint-text
+         aeson base bytestring clay flow http-types jmacro lucid pointfree
+         pointful text wai wai-extra wai-websockets warp websockets
+         wl-pprint-text
        ];
        homepage = "https://blunt.herokuapp.com";
-       description = "Point-free Haskell as a service";
+       description = "Convert between pointfree and pointful expressions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bmp" = callPackage
@@ -25562,6 +26268,7 @@ self: {
        testDepends = [
          base cond containers QuickCheck tasty tasty-quickcheck
        ];
+       jailbreak = true;
        description = "Boolean normal form: NNF, DNF & CNF";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25606,8 +26313,8 @@ self: {
      }:
      mkDerivation {
        pname = "boomange";
-       version = "0.1.2.1";
-       sha256 = "1yjmnbldla5iha6vzslnd1sdaaknsgk4afrj5yjrib3w2v1rp2vx";
+       version = "0.1.3.1";
+       sha256 = "1sg1ldrglhca62xiak33k5023zrpmgg3aa8xpwn8l1323kwlkqm0";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -25676,6 +26383,7 @@ self: {
          transformers unordered-containers vaultaire-common vector
          zeromq4-haskell
        ];
+       jailbreak = true;
        homepage = "https://github.com/anchor/borel-core";
        description = "Metering System for OpenStack metrics provided by Vaultaire";
        license = stdenv.lib.licenses.bsd3;
@@ -25737,7 +26445,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1il4vb497d0195mhvra5djkn3mbdzd8dmcnffpqh1pv1pj8n8hwp";
        buildDepends = [ base bound monad-gen mtl ];
-       jailbreak = true;
        description = "Unwrap Scope's with globally fresh values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -25765,6 +26472,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bower-json" = callPackage
+    ({ mkDerivation, aeson, aeson-better-errors, base, bytestring, mtl
+     , scientific, tasty, tasty-hunit, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "bower-json";
+       version = "0.7.0.0";
+       sha256 = "0vz9xxw2xr27lh70mqxfgvs43sr3sq88xf5vppcn2frsk1hnb7hs";
+       buildDepends = [
+         aeson aeson-better-errors base bytestring mtl scientific text
+         transformers unordered-containers vector
+       ];
+       testDepends = [
+         aeson base bytestring tasty tasty-hunit text unordered-containers
+       ];
+       homepage = "https://github.com/hdgarrood/bower-json";
+       description = "Read bower.json from Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "boxes" = callPackage
     ({ mkDerivation, base, QuickCheck, split }:
      mkDerivation {
@@ -25793,10 +26521,13 @@ self: {
      mkDerivation {
        pname = "brainfuck";
        version = "0.1";
+       revision = "1";
        sha256 = "0lsw62g4ir8idjjadsdf46p8mqd88mysn0b499bk3x5l5js858z3";
+       editedCabalFile = "154e3b46053499fc41f606429c8c4f0500e7ec1e1cbf8c3e89af275e06e9d7fa";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base mtl unix ];
+       jailbreak = true;
        description = "Brainfuck interpreter";
        license = "GPL";
      }) {};
@@ -25810,6 +26541,7 @@ self: {
        buildDepends = [ base ];
        description = "BrainFuck monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brainfuck-tut" = callPackage
@@ -25821,6 +26553,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base ];
+       jailbreak = true;
        homepage = "https://gitlab.com/cpp.cabrera/brainfuck-tut";
        description = "A simple BF interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -25841,6 +26574,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "breve" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, configurator
+     , cryptohash, directory, hashtables, mtl, random, simple
+     , transformers, wai, wai-extra, warp, xdg-basedir
+     }:
+     mkDerivation {
+       pname = "breve";
+       version = "0.2.0.0";
+       sha256 = "0dndy14lxj18l0kr7ay1dclp3c960lmd6vqhnz8lkdz1p6cdq9hd";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base binary bytestring configurator cryptohash directory
+         hashtables mtl random simple transformers wai wai-extra warp
+         xdg-basedir
+       ];
+       homepage = "https://github.com/rnhmjoj/breve";
+       description = "a url shortener";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "brians-brain" = callPackage
     ({ mkDerivation, array, base, parallel, random, SDL }:
      mkDerivation {
@@ -25893,6 +26648,7 @@ self: {
        version = "0.4.1.0";
        sha256 = "084nil9rfs3xpp4rk3qlwf6gsaljm57g7divfzd88dk9np6q5iwh";
        buildDepends = [ base containers stm time ];
+       jailbreak = true;
        description = "Small library for interactive functional programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -26030,7 +26786,9 @@ self: {
      mkDerivation {
        pname = "btrfs";
        version = "0.1.1.1";
+       revision = "1";
        sha256 = "1k1b8x0p0q43872c4x5dma2hs9dzkvr7n2dnb3w29ha7f24k8g8z";
+       editedCabalFile = "1ef2b2d9f4768be3250cf2f971639c1a0e410e6bb9b035e922305c62c5f00887";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring time unix ];
@@ -26079,6 +26837,7 @@ self: {
          QuickCheck scientific tasty tasty-hunit tasty-quickcheck tasty-th
          text unordered-containers vector
        ];
+       jailbreak = true;
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -26103,6 +26862,7 @@ self: {
        homepage = "https://github.com/sethfowler/hsbugzilla";
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buildable" = callPackage
@@ -26112,6 +26872,7 @@ self: {
        version = "0.1.0.3";
        sha256 = "1jrvgm2k6m8k9hj7h727pf357zydmhq1ndl1z39ag6294xd2rgpx";
        buildDepends = [ base bytestring containers dlist text ];
+       jailbreak = true;
        description = "Typeclass for builders of linear data structures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -26128,7 +26889,6 @@ self: {
          base bytestring containers directory mtl old-locale pretty process
          random stm time
        ];
-       jailbreak = true;
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Rehackable components for writing buildbots and test harnesses";
        license = stdenv.lib.licenses.bsd3;
@@ -26180,6 +26940,7 @@ self: {
        homepage = "https://github.com/JPMoresmau/BuildWrapper";
        description = "A library and an executable that provide an easy API for a Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bullet" = callPackage
@@ -26323,6 +27084,7 @@ self: {
        ];
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv" = callPackage
@@ -26439,6 +27201,7 @@ self: {
        sha256 = "1mxxgdak43wz7vzl2hbff9an7krqz4rhld9h173vvq6w2n8jnbi7";
        buildDepends = [ base bytestring cryptohash QuickCheck ];
        testDepends = [ base bytestring cryptohash QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
@@ -26543,6 +27306,7 @@ self: {
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
@@ -26594,9 +27358,11 @@ self: {
        version = "0.1.0.1";
        sha256 = "057f9kyvj7cf2a53f6wqah0bw9cp67s7y3b6l6y78m24ipx8c56a";
        buildDepends = [ base bytestring deepseq ghc-prim hashable ];
+       jailbreak = true;
        homepage = "https://github.com/hvr/bytestring-plain";
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-progress" = callPackage
@@ -26715,6 +27481,7 @@ self: {
        buildDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bzlib" = callPackage
@@ -27014,25 +27781,24 @@ self: {
   "cabal-debian" = callPackage
     ({ mkDerivation, base, Cabal, containers, data-default, debian
      , deepseq, Diff, directory, exceptions, filepath, hsemail, HUnit
-     , lens, memoize, mtl, network-uri, parsec, pretty, prettyclass
-     , process, pureMD5, regex-tdfa, set-extra, syb, text, unix
-     , Unixutils, utf8-string
+     , lens, memoize, mtl, network-uri, parsec, pretty, process, pureMD5
+     , regex-tdfa, set-extra, syb, text, unix, Unixutils, utf8-string
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.26";
-       sha256 = "1imglja5b8q5z1l7na2h4b9cd9kbfjdqclgx12vzasan9gagl0k1";
+       version = "4.27.1";
+       sha256 = "0h9z6lqcx80zk19y080wr3djamvirjrn8in30h9hyb8j81l7hg5d";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base Cabal containers data-default debian deepseq Diff directory
          exceptions filepath hsemail HUnit lens memoize mtl network-uri
-         parsec pretty prettyclass process pureMD5 regex-tdfa set-extra syb
-         text unix Unixutils utf8-string
+         parsec pretty process pureMD5 regex-tdfa set-extra syb text unix
+         Unixutils utf8-string
        ];
        testDepends = [
          base Cabal containers debian Diff filepath hsemail HUnit lens
-         pretty prettyclass process text
+         pretty process text
        ];
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
@@ -27052,6 +27818,7 @@ self: {
        homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dev" = callPackage
@@ -27118,6 +27885,7 @@ self: {
        homepage = "http://github.com/atnnn/cabal-ghci";
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-graphdeps" = callPackage
@@ -27146,8 +27914,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.1.0";
-       sha256 = "1hfprys4q4azfgqcv2xcyn14y8nybmvrl8y3z3ckx0v5r13ss75n";
+       version = "0.3.3.0";
+       sha256 = "0bvd7qf206slg4ckjc7bjjfrgdxsq3kmb9rp8qp7lfc81ccnr09j";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -27181,6 +27949,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 time
          unix zlib
        ];
+       jailbreak = true;
        postInstall = ''
          mkdir $out/etc
          mv bash-completion $out/etc/bash_completion.d
@@ -27199,8 +27968,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-install";
-       version = "1.22.2.0";
-       sha256 = "1nvamsklmxc77mivi02li5rijiliajl4x620pwchzgb0iyl2xg15";
+       version = "1.22.3.0";
+       sha256 = "0k4bz2haba1qk30swkshf3v8prbv5lkw47nxgvi4xxayhyv4wm98";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -27213,7 +27982,6 @@ self: {
          pretty process QuickCheck regex-posix stm test-framework
          test-framework-hunit test-framework-quickcheck2 time unix zlib
        ];
-       jailbreak = true;
        postInstall = ''
          mkdir $out/etc
          mv bash-completion $out/etc/bash_completion.d
@@ -27240,6 +28008,7 @@ self: {
        extraLibraries = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
@@ -27408,8 +28177,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "0.9.4";
-       sha256 = "15h56aqzzxdxkk3rx6j03nkv1503f8ypzq6hbdflilqd0v63asa4";
+       version = "0.9.5";
+       sha256 = "0a2j9py1dafkscs9lz70zxl54vahba62zb8r6rv3rbhnv0d3llf3";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -27418,14 +28187,15 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "cabal-scripts";
-       version = "0.1";
-       sha256 = "17wpmqkgr55wj5qzb7ph3fvifz4bzzhk98ypcmrx5q0caq1crdq8";
+       version = "0.1.1";
+       sha256 = "1ajgx29hvcsdd6lwc78dyhsjm5ikx2zn0kdbwnzn1kggz2l08ls4";
        buildDepends = [ base ];
        description = "Shell scripts for support of Cabal maintenance";
        license = stdenv.lib.licenses.bsd3;
@@ -27488,20 +28258,21 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, classy-prelude-conduit
      , conduit, conduit-extra, containers, directory, filepath
      , http-client, http-client-tls, http-conduit, http-types, network
-     , process, resourcet, shelly, system-fileio, system-filepath, tar
-     , temporary, text, transformers
+     , process, resourcet, shelly, streaming-commons, system-fileio
+     , system-filepath, tar, temporary, text, transformers
      }:
      mkDerivation {
        pname = "cabal-src";
-       version = "0.2.5";
-       sha256 = "07nxnr011i50lpmahvj6q113zd6jmmxv83y4rby2rjnimjvgj3z7";
+       version = "0.2.5.1";
+       sha256 = "0ym5lsgah4aq37mg074ab82kdjxwmcp0qax3jnalk2hvcm531k9z";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base bytestring Cabal classy-prelude-conduit conduit conduit-extra
          containers directory filepath http-client http-client-tls
          http-conduit http-types network process resourcet shelly
-         system-fileio system-filepath tar temporary text transformers
+         streaming-commons system-fileio system-filepath tar temporary text
+         transformers
        ];
        homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
@@ -27667,7 +28438,9 @@ self: {
      mkDerivation {
        pname = "cabal2nix";
        version = "1.73";
+       revision = "4";
        sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv";
+       editedCabalFile = "29ac70f26f4996e06945649693d71c217ed9e5f9b3ec72637c13153961d8f2d9";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -27675,6 +28448,7 @@ self: {
          pretty process regex-posix transformers
        ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        homepage = "http://github.com/NixOS/cabal2nix";
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
@@ -27782,8 +28556,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabin";
-       version = "0.1.0.2";
-       sha256 = "0fdbqfvc4ys14synk5avriwdif88r6pb49v01fd00j1rfrl2jrsy";
+       version = "0.1.0.3";
+       sha256 = "0wj1x6gsr5jlnq0l6xgwy2y64jlxna7bvx7vwk73znf572rswmxk";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -27794,6 +28568,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cabocha" = callPackage
+    ({ mkDerivation, base, bytestring, cabocha, text, text-format }:
+     mkDerivation {
+       pname = "cabocha";
+       version = "0.1.0.0";
+       sha256 = "0siqh3dly69b1kfm5y3q0sccqxx25hflwhizw6ga70icmvscwrwf";
+       buildDepends = [ base bytestring text ];
+       testDepends = [ base text-format ];
+       extraLibraries = [ cabocha ];
+       homepage = "http://github.com/pecorarista/hscabocha";
+       license = stdenv.lib.licenses.bsd3;
+     }) { cabocha = null;};
+
   "cached-traversable" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, mtl
@@ -27848,6 +28635,7 @@ self: {
          mtl optparse-applicative process protocol-buffers
          protocol-buffers-descriptor template-haskell temporary text
        ];
+       jailbreak = true;
        homepage = "https://github.com/ajtulloch/caffegraph/";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27898,6 +28686,7 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake3" = callPackage
@@ -27918,9 +28707,11 @@ self: {
          optparse-applicative parsec process syb system-filepath
          template-haskell text text-format
        ];
+       jailbreak = true;
        homepage = "https://github.com/grwlf/cake3";
        description = "Third cake the Makefile EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cakyrespa" = callPackage
@@ -27937,6 +28728,7 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/myblog/cakyrespa.html";
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cal3d" = callPackage
@@ -27999,8 +28791,8 @@ self: {
     ({ mkDerivation, base, containers, haskeline, parsec, QuickCheck }:
      mkDerivation {
        pname = "calculator";
-       version = "0.3.0.2";
-       sha256 = "14fcb4zfx7pk0ha3hvlpj84mxp82jpn1ywyjnfmczm3ic4mq98m9";
+       version = "0.3.1.1";
+       sha256 = "1k21wf4gnq8h1a8nk5xx41yibc3azscxgkm8ajmjnj1a5w71wm8c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base containers haskeline parsec ];
@@ -28117,11 +28909,27 @@ self: {
        version = "1.0.0.3";
        sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf";
        buildDepends = [ base deepseq directory filepath ];
+       jailbreak = true;
        homepage = "http://github.com/nominolo/canonical-filepath";
        description = "Abstract data type for canonical file paths";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "canteven-config" = callPackage
+    ({ mkDerivation, aeson, base, directory, filepath, hslogger, text
+     , unix, yaml
+     }:
+     mkDerivation {
+       pname = "canteven-config";
+       version = "0.1.0.1";
+       sha256 = "0p7gqn95hkm9m7dbmj8zgghsq89j82m9i8xd9w28rm0060nvj69l";
+       buildDepends = [
+         aeson base directory filepath hslogger text unix yaml
+       ];
+       description = "A pattern for configuring programs";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "cantor" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, hspec, hxt, hxt-xpath, parsec, QuickCheck, split
@@ -28205,6 +29013,7 @@ self: {
        buildDepends = [ base Cabal directory filepath process ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "caramia" = callPackage
@@ -28231,7 +29040,6 @@ self: {
        homepage = "https://github.com/Noeda/caramia/";
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "carboncopy" = callPackage
@@ -28554,7 +29362,6 @@ self: {
          containers mtl
        ];
        testDepends = [ base QuickCheck ];
-       jailbreak = true;
        homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
@@ -28623,26 +29430,19 @@ self: {
      }) {};
 
   "castle" = callPackage
-    ({ mkDerivation, base, configurator, containers, errors, hspec
-     , lens, optparse-applicative, QuickCheck, shelly, system-fileio
-     , system-filepath, tasty, tasty-golden, tasty-hspec
-     , tasty-quickcheck, text
+    ({ mkDerivation, base, containers, optparse-applicative, shelly
+     , system-fileio, system-filepath, text
      }:
      mkDerivation {
        pname = "castle";
-       version = "0.1.0.0";
-       sha256 = "1xsimlz0s0x9hdqvs0mscwj756znhd9mxhq23l8ppm5lavplpycp";
+       version = "0.1.0.1";
+       sha256 = "0h6dvc8lzlxkgkqkj3zwxjdmws29g4fsw7p6ysd7i54xqb8vy5ka";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base configurator containers errors lens optparse-applicative
-         shelly system-fileio system-filepath text
-       ];
-       testDepends = [
-         base hspec QuickCheck tasty tasty-golden tasty-hspec
-         tasty-quickcheck
+         base containers optparse-applicative shelly system-fileio
+         system-filepath text
        ];
-       jailbreak = true;
        homepage = "https://github.com/erochest/castle";
        description = "A tool to manage shared cabal-install sandboxes";
        license = stdenv.lib.licenses.asl20;
@@ -28668,8 +29468,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "catamorphism";
-       version = "0.4.0.0";
-       sha256 = "00gyb84jfb19n4g0igm4sikqk2bl96wj9293g82rjxgrk9m19iq7";
+       version = "0.4.0.1";
+       sha256 = "05mpw0dgn5f9gwnk7jkkm5k6fsfhi70i3fr96b6jca7w1b151hn9";
        buildDepends = [ base template-haskell ];
        homepage = "http://github.com/frerich/catamorphism";
        description = "A package exposing a helper function for generating catamorphisms";
@@ -28683,6 +29483,7 @@ self: {
        version = "0.2.0.2";
        sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx";
        buildDepends = [ base mtl transformers ];
+       jailbreak = true;
        homepage = "http://github.com/sonyandy/catch-fd";
        description = "MonadThrow and MonadCatch, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -28748,6 +29549,7 @@ self: {
        version = "1.0.2";
        sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
        buildDepends = [ base bytestring directory filepath unix ];
+       jailbreak = true;
        description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28779,8 +29581,8 @@ self: {
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.15.0";
-       sha256 = "1a7bhy3yvrmnirh7nmlz6d1nyxs5dng2ap17h8585yhx9k1a5n68";
+       version = "0.15.1";
+       sha256 = "1cwkkszbxx90jykd6b4r6kkjz4dpi86xx99fb8h3aqczyccn6hvw";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -28886,6 +29688,7 @@ self: {
        homepage = "https://github.com/anchor/ceilometer-common";
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cellrenderer-cairo" = callPackage
@@ -28988,6 +29791,7 @@ self: {
          HTF HUnit mmorph mtl QuickCheck quickcheck-instances stm text time
          unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/cereal-plus";
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
@@ -28998,8 +29802,8 @@ self: {
     ({ mkDerivation, base, cereal, text }:
      mkDerivation {
        pname = "cereal-text";
-       version = "0.1.0.0";
-       sha256 = "1rpmhafyk49whs77paxa174904idnk8j242mpnlml2b9jjc4rc3d";
+       version = "0.1.0.1";
+       sha256 = "1wsp4zb6ib8fym4kaq6ixm7l2slljmz6waliab3dyb2zdl400spq";
        buildDepends = [ base cereal text ];
        homepage = "https://github.com/ulikoehler/cereal-text";
        description = "Data.Text instances for the cereal serialization library";
@@ -29037,20 +29841,27 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cf" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, QuickCheck, test-framework
+     , test-framework-quickcheck2, test-framework-th
+     }:
      mkDerivation {
        pname = "cf";
-       version = "0.1";
-       revision = "1";
-       sha256 = "0wwq78b6d6hxaivyxw8rc9dsb0kq4aw0mkp8w0xmnfmz8biymlmg";
-       editedCabalFile = "6bd39af35810e6a40142d87fdd9fc91754fe85098a63a8087626bf9916bd3362";
+       version = "0.2";
+       sha256 = "0lc7q5nm4c1rjsbvw1b794kxspxqfm124351jkpzi7a9l2gvqcka";
        buildDepends = [ base ];
+       testDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+         test-framework-th
+       ];
+       jailbreak = true;
        homepage = "http://github.com/mvr/cf";
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cfipu" = callPackage
@@ -29069,6 +29880,7 @@ self: {
        homepage = "https://github.com/bairyn/cfipu";
        description = "cfipu processor for toy brainfuck-like language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cflp" = callPackage
@@ -29131,21 +29943,20 @@ self: {
 
   "cgi" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, mtl
-     , mtl-compat, multipart, network, network-uri, old-locale, old-time
-     , parsec, xhtml
+     , multipart, network, network-uri, old-locale, old-time, parsec
+     , xhtml
      }:
      mkDerivation {
        pname = "cgi";
        version = "3001.2.2.2";
        sha256 = "0q1pxpa8gi42c0hsidcdkhk5xr5anfrvhqsn3iksr9c0rllhz193";
        buildDepends = [
-         base bytestring containers exceptions mtl mtl-compat multipart
-         network network-uri old-locale old-time parsec xhtml
+         base bytestring containers exceptions mtl multipart network
+         network-uri old-locale old-time parsec xhtml
        ];
        homepage = "https://github.com/cheecheeo/haskell-cgi";
        description = "A library for writing CGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgi-undecidable" = callPackage
@@ -29157,7 +29968,6 @@ self: {
        buildDepends = [ base cgi mtl ];
        description = "Undecidable instances for the cgi package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgi-utils" = callPackage
@@ -29192,6 +30002,7 @@ self: {
          dlist either filepath ghc-prim mtl regex-posix safe split stm
          stringsearch unix unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://awgn.github.io/cgrep/";
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
@@ -29217,6 +30028,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "09apxk27s6j8ciq3d2zxhr70ihm9s79zhc2pyg1xb220h6p55swk";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "http://github.com/joom/chalk";
        description = "Terminal string styling";
        license = stdenv.lib.licenses.mit;
@@ -29260,8 +30072,8 @@ self: {
     ({ mkDerivation, array, base, process, random }:
      mkDerivation {
        pname = "chalmers-lava2000";
-       version = "1.4.1";
-       sha256 = "19n7z5k6ycn6brnh1n8ykni3ix49d53p3rjggfaklw83knqnvxhy";
+       version = "1.5";
+       sha256 = "1xrzh1mqa6d3hwr7lfazfskh6bklbj3kv9vlm40n650l2l42arga";
        buildDepends = [ array base process random ];
        homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf";
        description = "Hardware description EDSL";
@@ -29357,17 +30169,12 @@ self: {
      }) {};
 
   "chart-histogram" = callPackage
-    ({ mkDerivation, base, Chart, colour, data-default-class, lens
-     , vector
-     }:
+    ({ mkDerivation, base, Chart }:
      mkDerivation {
        pname = "chart-histogram";
-       version = "0.4.5";
-       sha256 = "0c1y4jaslzxlcmqhj5bgdcx76jw49asmnfgdvfkprf2siq154zba";
-       buildDepends = [
-         base Chart colour data-default-class lens vector
-       ];
-       jailbreak = true;
+       version = "1.0.0";
+       sha256 = "130jbbbb1spkbqapxys0bqr0spq6c03x1m259alg5wxnl8xnn4w5";
+       buildDepends = [ base Chart ];
        description = "Easily render histograms with Chart";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29444,6 +30251,7 @@ self: {
        jailbreak = true;
        description = "Some monad transformers and typeclasses for abstraction of global dependencies";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chatty-text" = callPackage
@@ -29453,8 +30261,10 @@ self: {
        version = "0.6.0.1";
        sha256 = "1p88yn8c1ckckhxy8k0w50n3mjy8inrwh9zaas5wawaz286chxzh";
        buildDepends = [ base chatty transformers ];
+       jailbreak = true;
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chatty-utils" = callPackage
@@ -29467,6 +30277,7 @@ self: {
        jailbreak = true;
        description = "Some utilities every serious chatty-based application may need";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cheapskate" = callPackage
@@ -29611,8 +30422,10 @@ self: {
          base bifunctors bytestring cereal locators mtl network network-uri
          protobuf text unordered-containers vaultaire-common zeromq4-haskell
        ];
+       jailbreak = true;
        description = "Query interface for Chevalier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp" = callPackage
@@ -29704,6 +30517,7 @@ self: {
        jailbreak = true;
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chu2" = callPackage
@@ -29721,6 +30535,7 @@ self: {
        homepage = "https://github.com/nfjinjing/chu2";
        description = "FFI for Chu2 Agda Web Server Interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chuchu" = callPackage
@@ -29867,8 +30682,8 @@ self: {
     ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }:
      mkDerivation {
        pname = "cipher-aes128";
-       version = "0.6.4";
-       sha256 = "093zpw86wimniwmd73g3nnbfy530q52kynccssqf7jxafbsw75aa";
+       version = "0.7.0.1";
+       sha256 = "0qknpgg7dimx2nm4bzig7vvzcq3kvbxjv5rb0s4f2ina4vwczbhq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring cereal crypto-api tagged ];
@@ -30035,6 +30850,7 @@ self: {
        homepage = "http://istitutocolli.org/repos/citeproc-hs/";
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "citeproc-hs-pandoc-filter" = callPackage
@@ -30055,6 +30871,7 @@ self: {
        homepage = "http://istitutocolli.org/repos/citeproc-hs-pandoc-filter/";
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cityhash" = callPackage
@@ -30090,6 +30907,7 @@ self: {
        homepage = "http://github.com/batterseapower/cjk";
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clac" = callPackage
@@ -30106,8 +30924,10 @@ self: {
          base containers dsp optparse-applicative plailude pretty-tree safe
          split
        ];
+       jailbreak = true;
        description = "Simple CLI RPN calculator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clafer" = callPackage
@@ -30120,10 +30940,8 @@ self: {
      }:
      mkDerivation {
        pname = "clafer";
-       version = "0.3.9";
-       revision = "1";
-       sha256 = "0zc5vjb9iqzqb0nl47mgp51xpi1n156xfc1qkwks7kwqhhc23slr";
-       editedCabalFile = "7a77fc544dc4aab21ecf747c8d95acd0d94cf9d001824862f859682eca953d22";
+       version = "0.3.10";
+       sha256 = "0f780l5nh3r93w4ikxliqjg70ih4k4j00s7f4nj1li0dv6bprc3x";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -30136,7 +30954,6 @@ self: {
          base containers data-stringmap directory filepath ghc HaXml HUnit
          lens lens-aeson mtl QuickCheck tasty tasty-hunit tasty-th
        ];
-       jailbreak = true;
        homepage = "http://clafer.org";
        description = "clafer compiles Clafer models to other formats, such as Alloy, XML, HTML, Dot";
        license = stdenv.lib.licenses.mit;
@@ -30151,8 +30968,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferIG";
-       version = "0.3.9";
-       sha256 = "1nbrdxq7ynwj6ms76ayl84bb9j9yjmy3qdfdd8w810php95jrkgx";
+       version = "0.3.10";
+       sha256 = "17g4jdfla0x90y2jn54yk56h6ih3d1jk4fzdpfvh85xs6dh79n0x";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -30177,8 +30994,8 @@ self: {
      }:
      mkDerivation {
        pname = "claferwiki";
-       version = "0.3.9";
-       sha256 = "05fz0ps2k6g9298jk8y69wjhvfpcidkc3c9g083snylm2cl0dax3";
+       version = "0.3.10";
+       sha256 = "0v0nad7n3m8gs3l7prv2kwqzdp93g309j4l3l3dv1ibfnf5jr2l9";
        buildDepends = [
          base clafer containers directory gitit MissingH mtl network
          network-uri process SHA split time transformers utf8-string
@@ -30198,6 +31015,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base bytestring directory safe strict time ];
+       jailbreak = true;
        description = "Command-line spaced-repetition software";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -30227,24 +31045,27 @@ self: {
   "clash-ghc" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
      , clash-prelude, clash-systemverilog, clash-vhdl, containers
-     , directory, filepath, ghc, hashable, haskeline, lens, mtl, process
-     , text, transformers, unbound-generics, unix, unordered-containers
+     , directory, filepath, ghc, ghc-typelits-natnormalise, hashable
+     , haskeline, lens, mtl, process, text, transformers
+     , unbound-generics, unix, unordered-containers
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.5";
-       sha256 = "0nkk1k96yg4lpwn7axdm8xnsc3b389839c0gxgavvqlhdz7hkkcj";
+       version = "0.5.3";
+       sha256 = "1xi6j5d5qz0ar1mm1prvxk3vqigrnyiyd88a537636vwbvh8ndns";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base bifunctors bytestring clash-lib clash-prelude
          clash-systemverilog clash-vhdl containers directory filepath ghc
-         hashable haskeline lens mtl process text transformers
-         unbound-generics unix unordered-containers
+         ghc-typelits-natnormalise hashable haskeline lens mtl process text
+         transformers unbound-generics unix unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-lib" = callPackage
@@ -30256,8 +31077,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.5";
-       sha256 = "17wpqs99w7mrwxky1jrq3gm012w4y40zb2i8d4qsk25dkhkkw1ng";
+       version = "0.5.1";
+       sha256 = "1arkx9510klyrhihkqhz3dqg3m3lp0zm0hycfwsl3qyc1jdndsby";
        buildDepends = [
          aeson attoparsec base bytestring concurrent-supply containers
          deepseq directory errors fgl filepath hashable lens mtl pretty
@@ -30270,20 +31091,23 @@ self: {
      }) {};
 
   "clash-prelude" = callPackage
-    ({ mkDerivation, base, data-default, ghc-prim, integer-gmp
-     , singletons, template-haskell, th-lift
+    ({ mkDerivation, base, data-default, doctest, ghc-prim
+     , ghc-typelits-natnormalise, Glob, integer-gmp, singletons
+     , template-haskell, th-lift
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.7.1";
-       sha256 = "1hy1bx83faf0n3irp0g2136bmd9gvpd638ap8ifys6gdni25k3zv";
+       version = "0.7.3";
+       sha256 = "04kz71sx36a14rryw219my8k523akfq3ivv1j67x0m85mlqldnk2";
        buildDepends = [
-         base data-default ghc-prim integer-gmp singletons template-haskell
-         th-lift
+         base data-default ghc-prim ghc-typelits-natnormalise integer-gmp
+         singletons template-haskell th-lift
        ];
-       homepage = "http://christiaanb.github.io/clash2/";
+       testDepends = [ base doctest Glob ];
+       homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-prelude-quickcheck" = callPackage
@@ -30294,8 +31118,10 @@ self: {
        version = "0.1.1.0";
        sha256 = "1yccczs5bpg5qc4zdp4qpgfy5mnf6h17s16dv77d54k4c3r90adz";
        buildDepends = [ base clash-prelude containers mtl QuickCheck ];
+       jailbreak = true;
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-systemverilog" = callPackage
@@ -30304,15 +31130,16 @@ self: {
      }:
      mkDerivation {
        pname = "clash-systemverilog";
-       version = "0.5";
-       sha256 = "1vmwrazyipq0ab3dvnbdzv9y7apr7fw8m4zdb4ligair8x3g2fbr";
+       version = "0.5.1";
+       sha256 = "0k24ic9fv72llpa507lxd1xyq7sbczh8ilis9x1axyl8yv132y67";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
        ];
        homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - As a Library";
+       description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-vhdl" = callPackage
@@ -30321,15 +31148,16 @@ self: {
      }:
      mkDerivation {
        pname = "clash-vhdl";
-       version = "0.5";
-       sha256 = "1wh2fwyaxl33a38yxqz7vd23inakmad7zxg18y56ln5fb50hz4r5";
+       version = "0.5.2";
+       sha256 = "0ywcjrg3x0pcx2mj03bzq7hf4vmrivkckpa939ddqzcab114kkgl";
        buildDepends = [
          base clash-lib clash-prelude fgl lens mtl text unordered-containers
          wl-pprint-text
        ];
        homepage = "http://www.clash-lang.org/";
-       description = "CAES Language for Synchronous Hardware - As a Library";
+       description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "classify" = callPackage
@@ -30363,19 +31191,19 @@ self: {
     ({ mkDerivation, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, dlist, enclosed-exceptions, exceptions
      , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl
-     , mutable-containers, old-locale, primitive, QuickCheck, semigroups
-     , stm, system-filepath, text, time, transformers
+     , mutable-containers, primitive, QuickCheck, semigroups, stm
+     , system-filepath, text, time, time-locale-compat, transformers
      , unordered-containers, vector, vector-instances
      }:
      mkDerivation {
        pname = "classy-prelude";
-       version = "0.11.1";
-       sha256 = "001anap27s3h04xkzyl1bnvf9fmrxvhqpjxyjkv1s77sdvaf19ii";
+       version = "0.11.1.1";
+       sha256 = "1aincib2rpxbc7nyk8sbxhcdy0l4wr1005kn0h4bb4m3aa008f7a";
        buildDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
-         mono-traversable mtl mutable-containers old-locale primitive
-         semigroups stm system-filepath text time transformers
+         mono-traversable mtl mutable-containers primitive semigroups stm
+         system-filepath text time time-locale-compat transformers
          unordered-containers vector vector-instances
        ];
        testDepends = [
@@ -30723,6 +31551,7 @@ self: {
          base highlighting-kate optparse-applicative process terminfo
          wl-pprint-extras wl-pprint-terminfo
        ];
+       jailbreak = true;
        homepage = "https://github.com/tanakh/cless";
        description = "Colorized LESS";
        license = stdenv.lib.licenses.mit;
@@ -30741,6 +31570,7 @@ self: {
        homepage = "http://sandbox.pocoo.org/clevercss-hs/";
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cli" = callPackage
@@ -30884,23 +31714,19 @@ self: {
        version = "0.1.0.0";
        sha256 = "1jvkv6dwx2gm59vczmiagpxb0614fz63jzqrqm81bdai8yb0gpzd";
        buildDepends = [ base base-unicode-symbols peano ];
-       jailbreak = true;
        homepage = "https://github.com/strake/clist.hs";
        description = "Counted list";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clock" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "clock";
-       version = "0.4.1.3";
-       revision = "1";
-       sha256 = "0wqhg8gb10lby01f0v4fl4yp23l4ilizywp5xnsbja03svnb4f0d";
-       editedCabalFile = "653fd69fcb84f23fb93241604f83f686921593f7ded7c3bf61ce7cecf1f00440";
+       version = "0.4.5.0";
+       sha256 = "0qa59yj4qr9hah1mljfmjv511p0nh7m67dgdz1zh9lnwwgky7biw";
        buildDepends = [ base ];
-       homepage = "http://corsis.github.com/clock/";
+       homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31087,22 +31913,24 @@ self: {
 
   "clustering" = callPackage
     ({ mkDerivation, base, binary, containers, hierarchical-clustering
-     , matrices, mwc-random, primitive, split, tasty, tasty-hunit
-     , tasty-quickcheck, vector
+     , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty
+     , tasty-hunit, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "clustering";
-       version = "0.1.2";
-       sha256 = "0idmh6k6j4dmnaf8zsvw30lkwsgk5hqvp4hlzfd4j6d9ah2pwmfp";
+       version = "0.2.0";
+       sha256 = "0w4glyq1f5ksdjbicq8b0vy0dvnxz6h44dp5iza6gignmxi703as";
        buildDepends = [
-         base binary containers matrices mwc-random primitive vector
+         base binary containers matrices mwc-random parallel primitive
+         vector
        ];
        testDepends = [
-         base binary hierarchical-clustering mwc-random split tasty
-         tasty-hunit tasty-quickcheck vector
+         base binary hierarchical-clustering matrices mwc-random Rlang-QQ
+         split tasty tasty-hunit tasty-quickcheck vector
        ];
        description = "High performance clustering algorithms";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clustertools" = callPackage
@@ -31154,15 +31982,16 @@ self: {
        ];
        description = "CMA-ES wrapper in Haskell";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmark" = callPackage
-    ({ mkDerivation, base, HUnit, text }:
+    ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.3.1";
-       sha256 = "18z50pbxxir4ca7v6zpkdv3anadg2z1lwhllilag3a592ka3hdrb";
-       buildDepends = [ base text ];
+       version = "0.3.2";
+       sha256 = "0xf34i09m9a3mf6mzn48v6pdbkagsv5c0wmr64ih8d43n2figazk";
+       buildDepends = [ base bytestring text ];
        testDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
@@ -31235,6 +32064,7 @@ self: {
          base bytestring cmdargs directory filepath http-types process text
          transformers wai wai-handler-launch
        ];
+       jailbreak = true;
        homepage = "http://community.haskell.org/~ndm/cmdargs/";
        description = "Helper to enter cmdargs command lines using a web browser";
        license = stdenv.lib.licenses.bsd3;
@@ -31271,9 +32101,11 @@ self: {
          base containers directory filepath HUnit parsec pretty process
          test-framework test-framework-hunit transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/eli-frey/cmdtheline";
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cml" = callPackage
@@ -31304,13 +32136,14 @@ self: {
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
        pname = "cmu";
-       version = "1.9";
-       sha256 = "1mn6l17x7zwhc8wlbfqiaxjsvmwh6j0sr4x3gss1z32n5g03syd0";
+       version = "1.10";
+       sha256 = "0zlc6spb51s2k455s9mspqjjk8xm90wwjlj2nm7949ihkim4j5gy";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base containers ];
        description = "Unification in a Commutative Monoid";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cnc-spec-compiler" = callPackage
@@ -31341,14 +32174,15 @@ self: {
      }:
      mkDerivation {
        pname = "cndict";
-       version = "0.5.0";
-       sha256 = "095gin216bm2zrlw3j52byk924z51ijk90di2n5r1dbvf9liwj7l";
+       version = "0.5.5";
+       sha256 = "0l2fknpg07r5hp2as3irqqa7zik9p8n3jyi74a2b3d001d54gc7z";
        buildDepends = [
          base binary bytestring cassava containers file-embed text vector
        ];
        homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "code-builder" = callPackage
@@ -31470,6 +32304,7 @@ self: {
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codo-notation" = callPackage
@@ -31557,10 +32392,8 @@ self: {
          aeson base conceit network network-simple pipes pipes-aeson
          pipes-attoparsec pipes-network text transformers
        ];
-       jailbreak = true;
        description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collada-output" = callPackage
@@ -31608,6 +32441,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "http://github.com/mwotton/collapse";
        description = "utility for collapsing adjacent writes";
        license = stdenv.lib.licenses.bsd3;
@@ -31620,6 +32454,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1nzpa791s04r3qikn329r67a64gl9rnk389bk3blijx6q2r9xacc";
        buildDepends = [ aeson base bytestring text ];
+       jailbreak = true;
        homepage = "https://github.com/danchoi/collection-json.hs";
        description = "Collection+JSON hypermedia type tools";
        license = stdenv.lib.licenses.mit;
@@ -31648,6 +32483,7 @@ self: {
        homepage = "http://code.haskell.org/collections/";
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections-base-instances" = callPackage
@@ -31664,6 +32500,7 @@ self: {
        homepage = "http://code.haskell.org/collections/";
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colock" = callPackage
@@ -31755,6 +32592,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generation of various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat-diagrams" = callPackage
@@ -31772,6 +32610,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -31792,6 +32631,7 @@ self: {
        homepage = "https://github.com/fumieval/combinator-interactive";
        description = "SKI Combinator interpreter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinatorial-problems" = callPackage
@@ -31884,6 +32724,7 @@ self: {
          base containers directory doctest filepath hspec hspec-expectations
          lens QuickCheck semigroups thyme transformers
        ];
+       jailbreak = true;
        description = "Library for working with commoditized amounts and price histories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31902,6 +32743,7 @@ self: {
        ];
        description = "Provide communications security using symmetric ephemeral keys";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "commsec-keyexchange" = callPackage
@@ -31921,6 +32763,7 @@ self: {
        homepage = "https://github.com/TomMD/commsec-keyExchange";
        description = "Key agreement for commsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad" = callPackage
@@ -31954,6 +32797,7 @@ self: {
          array base comonad containers distributive semigroupoids
          transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/comonad-extras/";
        description = "Exotic comonad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -32067,6 +32911,7 @@ self: {
        ];
        description = "Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compdata-automata" = callPackage
@@ -32080,6 +32925,7 @@ self: {
        buildDepends = [ base compdata containers projection ];
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compdata-dags" = callPackage
@@ -32103,6 +32949,7 @@ self: {
        ];
        description = "Compositional Data Types on DAGs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compdata-param" = callPackage
@@ -32121,6 +32968,7 @@ self: {
        ];
        description = "Parametric Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compensated" = callPackage
@@ -32170,6 +33018,7 @@ self: {
        buildDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "complex-generic" = callPackage
@@ -32223,6 +33072,7 @@ self: {
        buildDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition" = callPackage
@@ -32278,8 +33128,10 @@ self: {
        buildDepends = [
          base compdata mtl template-haskell th-expand-syns transformers
        ];
+       jailbreak = true;
        description = "Strategy combinators for compositional data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comptrans" = callPackage
@@ -32298,6 +33150,7 @@ self: {
        homepage = "https://github.com/jkoppel/comptrans";
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "computational-algebra" = callPackage
@@ -32381,6 +33234,7 @@ self: {
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concraft-hr" = callPackage
@@ -32424,6 +33278,7 @@ self: {
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concrete-relaxng-parser" = callPackage
@@ -32459,6 +33314,7 @@ self: {
        ];
        description = "Binary and Hashable instances for TypeRep";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -32541,6 +33397,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base exceptions mtl stm transformers ];
+       jailbreak = true;
        homepage = "https://github.com/joelteon/concurrent-state";
        description = "MTL-like library using TVars";
        license = stdenv.lib.licenses.mit;
@@ -32681,8 +33538,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.2.4";
-       sha256 = "1vqajj5mwnknqcjc5pj883jz4iwjj6is4jr701bzr0n6ngvn7qvh";
+       version = "1.2.4.1";
+       sha256 = "0g5rdcj0xbiz3x2pkmhwm67r9f0yncpnssv32s7k0w7qld46wri6";
        buildDepends = [
          base exceptions lifted-base mmorph mtl resourcet transformers
          transformers-base void
@@ -32703,6 +33560,7 @@ self: {
        version = "0.1";
        sha256 = "1xmxnr7w8s3kmdv5h0y08rnp3sx5wvxqmkg1j7yjycp9z7hbmylb";
        buildDepends = [ base conduit vector ];
+       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
        license = "LGPL";
@@ -32720,6 +33578,7 @@ self: {
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
        extraLibraries = [ mp3lame ];
+       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
@@ -32738,6 +33597,7 @@ self: {
          base conduit conduit-audio resourcet transformers vector
        ];
        extraLibraries = [ samplerate ];
+       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
@@ -32756,6 +33616,7 @@ self: {
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsndfile audio file library";
        license = "LGPL";
@@ -32771,8 +33632,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-combinators";
-       version = "0.3.0.6";
-       sha256 = "0z2nzs89sw2wxrgvyd2bxyh9vs87r1g6rbjqiwcjvhjs25ppq22b";
+       version = "0.3.1";
+       sha256 = "14cvd9vs31gbgggy3v6rsg7wckr08msw1s0fwqbyal73krm79f2r";
        buildDepends = [
          base base16-bytestring base64-bytestring bytestring chunked-data
          conduit conduit-extra monad-control mono-traversable mwc-random
@@ -32818,8 +33679,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit-extra";
-       version = "1.1.7.1";
-       sha256 = "1qpqjcqy44l92s21aivd2gvb7zz574102mld19a44w0n3yxvljx3";
+       version = "1.1.7.3";
+       sha256 = "1pnk8lbblys8wf4a40acxr9p61lhwg2bhf7809fm1y23gf18ll9l";
        buildDepends = [
          attoparsec base blaze-builder bytestring conduit directory filepath
          monad-control network primitive process resourcet stm
@@ -32950,8 +33811,10 @@ self: {
          pretty-show QuickCheck scientific string-conversions
          unordered-containers vector
        ];
+       jailbreak = true;
        description = "parser for config files, shell variables, command line args";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configuration" = callPackage
@@ -32970,10 +33833,10 @@ self: {
      , base-unicode-symbols, base64-bytestring, bytestring, Cabal
      , case-insensitive, connection, data-default, deepseq, directory
      , dlist, enclosed-exceptions, errors, http-client, http-client-tls
-     , http-types, monad-control, mtl, mtl-compat, network-uri
-     , optparse-applicative, process, profunctors, text, tls
-     , transformers, transformers-compat, unordered-containers, wai
-     , warp, warp-tls, x509, x509-system, x509-validation, yaml
+     , http-types, monad-control, mtl, network-uri, optparse-applicative
+     , process, profunctors, text, tls, transformers
+     , unordered-containers, wai, warp, warp-tls, x509, x509-system
+     , x509-validation, yaml
      }:
      mkDerivation {
        pname = "configuration-tools";
@@ -32983,15 +33846,15 @@ self: {
          aeson ansi-wl-pprint attoparsec base base-unicode-symbols
          base64-bytestring bytestring Cabal case-insensitive connection
          data-default deepseq directory dlist enclosed-exceptions errors
-         http-client http-client-tls http-types monad-control mtl mtl-compat
+         http-client http-client-tls http-types monad-control mtl
          network-uri optparse-applicative process profunctors text tls
-         transformers transformers-compat unordered-containers x509
-         x509-system x509-validation yaml
+         transformers unordered-containers x509 x509-system x509-validation
+         yaml
        ];
        testDepends = [
          base base-unicode-symbols bytestring Cabal enclosed-exceptions
-         errors http-types monad-control mtl mtl-compat text
-         transformers-compat unordered-containers wai warp warp-tls yaml
+         errors http-types monad-control mtl text unordered-containers wai
+         warp warp-tls yaml
        ];
        homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
@@ -33045,6 +33908,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1pj4kby5pba1xfz2fvv2lij7h2i8crf3qkhgs3rp4ziay0jkg18v";
        buildDepends = [ array base containers ];
+       jailbreak = true;
        description = "Decidable congruence relations for Haskell: up to you whether this is a joke";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -33128,6 +33992,7 @@ self: {
          base between data-default-class monad-control network resource-pool
          streaming-commons time transformers-base
        ];
+       jailbreak = true;
        homepage = "https://github.com/trskop/connection-pool";
        description = "Connection pool built on top of resource-pool and streaming-commons";
        license = stdenv.lib.licenses.bsd3;
@@ -33193,6 +34058,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrained-normal" = callPackage
@@ -33284,6 +34150,7 @@ self: {
        sha256 = "10xjyxlx6raz5jx17wyw7zqif3bp3xsbzb1756l263g91gd20rsm";
        editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8";
        buildDepends = [ array base deepseq ];
+       jailbreak = true;
        description = "Assorted concrete container types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33379,6 +34246,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "0y51xlva4364658bgbchcasbq5pka2ixlvhdf9g38xwlmhfg736x";
        buildDepends = [ base classy-prelude mtl unordered-containers ];
+       jailbreak = true;
        homepage = "http://github.com/thinkpad20/context-stack";
        description = "An abstraction of a stack and stack-based monadic context";
        license = stdenv.lib.licenses.mit;
@@ -33433,7 +34301,6 @@ self: {
          suspend time timers transformers transformers-base
        ];
        extraLibraries = [ hyperleveldb ];
-       jailbreak = true;
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { hyperleveldb = null;};
@@ -33597,7 +34464,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "control-monad-free" = callPackage
+  "control-monad-free_0_5_3" = callPackage
     ({ mkDerivation, base, deepseq, transformers }:
      mkDerivation {
        pname = "control-monad-free";
@@ -33609,7 +34476,7 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "control-monad-free_0_6_1" = callPackage
+  "control-monad-free" = callPackage
     ({ mkDerivation, base, prelude-extras, transformers }:
      mkDerivation {
        pname = "control-monad-free";
@@ -33716,20 +34583,72 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "conversion" = callPackage
+    ({ mkDerivation, base-prelude }:
+     mkDerivation {
+       pname = "conversion";
+       version = "1.1.0.1";
+       sha256 = "1bgads36prqw7m10hfmg9161d3hs5pa5qql9lbsny5hqvxsmb30d";
+       buildDepends = [ base-prelude ];
+       homepage = "https://github.com/nikita-volkov/conversion";
+       description = "Universal converter between values of different types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "conversion-bytestring" = callPackage
+    ({ mkDerivation, base-prelude, bytestring, conversion }:
+     mkDerivation {
+       pname = "conversion-bytestring";
+       version = "1.0.0.1";
+       sha256 = "1gsbfmp58qzhvnyl6jgy1pah954qaxi184clh31lzam9m1j44k3y";
+       buildDepends = [ base-prelude bytestring conversion ];
+       homepage = "https://github.com/nikita-volkov/conversion-bytestring";
+       description = "\"Conversion\" instances for the \"bytestring\" library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "conversion-case-insensitive" = callPackage
+    ({ mkDerivation, case-insensitive, conversion }:
+     mkDerivation {
+       pname = "conversion-case-insensitive";
+       version = "1.0.0.0";
+       sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp";
+       buildDepends = [ case-insensitive conversion ];
+       homepage = "https://github.com/nikita-volkov/conversion-case-insensitive";
+       description = "\"Conversion\" instances for the \"case-insensitive\" library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "conversion-text" = callPackage
+    ({ mkDerivation, base-prelude, bytestring, conversion
+     , conversion-bytestring, text
+     }:
+     mkDerivation {
+       pname = "conversion-text";
+       version = "1.0.0.2";
+       sha256 = "0j7j0jww92v9gldh8hd35p51ka2mq4n26chfw6n4m034q3pjqpby";
+       buildDepends = [
+         base-prelude bytestring conversion conversion-bytestring text
+       ];
+       homepage = "https://github.com/nikita-volkov/conversion-text";
+       description = "\"Conversion\" instances for the \"text\" library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "convertible" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, old-locale
      , old-time, text, time
      }:
      mkDerivation {
        pname = "convertible";
-       version = "1.1.0.0";
-       sha256 = "0pc3z4jfjna1rz5wlfimw9fyhpasmdnwvava883s401760y99i0k";
+       version = "1.1.1.0";
+       sha256 = "0v18ap1mccnndgxmbfgyjdicg8jlss01bd5fq8a576dr0h4sgyg9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring containers mtl old-locale old-time text time
        ];
-       homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible";
+       homepage = "http://hackage.haskell.org/package/convertible";
        description = "Typeclasses and instances for converting between types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33786,17 +34705,17 @@ self: {
      }) {};
 
   "cookie" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, data-default
-     , deepseq, HUnit, old-locale, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, text, time
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , data-default-class, deepseq, HUnit, old-locale, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, text, time
      }:
      mkDerivation {
        pname = "cookie";
-       version = "0.4.1.4";
-       sha256 = "0axvljw34cjw47fxwxqql8rvjsyp9gxfbaijmysy5j10kx8s931d";
+       version = "0.4.1.5";
+       sha256 = "0n1kil6z2sgaj8p67wbi7gaaz5rs78aagcnbk2338xhpd69wgrmn";
        buildDepends = [
-         base blaze-builder bytestring data-default deepseq old-locale text
-         time
+         base blaze-builder bytestring data-default-class deepseq old-locale
+         text time
        ];
        testDepends = [
          base blaze-builder bytestring HUnit QuickCheck tasty tasty-hunit
@@ -33861,6 +34780,7 @@ self: {
        ];
        description = "A compiler for Copilot targeting C99";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-cbmc" = callPackage
@@ -33893,6 +34813,7 @@ self: {
        ];
        description = "An intermediate representation for Copilot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-language" = callPackage
@@ -33908,6 +34829,7 @@ self: {
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-libraries" = callPackage
@@ -33923,6 +34845,7 @@ self: {
        ];
        description = "A Haskell-embedded DSL for monitoring hard real-time distributed systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-sbv" = callPackage
@@ -33938,6 +34861,7 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copr" = callPackage
@@ -33955,9 +34879,11 @@ self: {
          semigroups text
        ];
        testDepends = [ base hlint ];
+       jailbreak = true;
        homepage = "https://github.com/relrod/copr-hs";
        description = "Haskell interface to the Fedora Copr system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "core" = callPackage
@@ -33969,6 +34895,7 @@ self: {
        buildDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "core-haskell" = callPackage
@@ -34163,6 +35090,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1wqbk40izzb6wfwk1qprnqgm5f9mhs2xm7pl1ks8ajv4hdpkrnik";
        buildDepends = [ base containers ];
+       jailbreak = true;
        homepage = "https://github.com/wei2912/counter";
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
@@ -34240,6 +35168,7 @@ self: {
          base bytestring containers process template-haskell
        ];
        testDepends = [ base process QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/nicta/cplusplus-th";
        description = "C++ Foreign Import Generation";
        license = stdenv.lib.licenses.bsd3;
@@ -34309,6 +35238,7 @@ self: {
        homepage = "https://github.com/ibotty/crypto-random-effect";
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpsa" = callPackage
@@ -34322,6 +35252,7 @@ self: {
        buildDepends = [ array base containers parallel ];
        description = "Symbolic cryptographic protocol analyzer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpu" = callPackage
@@ -34390,8 +35321,8 @@ self: {
      }:
      mkDerivation {
        pname = "cql";
-       version = "3.0.2";
-       sha256 = "0arp3nf6w7rqb1jxv2j20k4hps3zmdbz97qz500n7h5xx2s8p5c3";
+       version = "3.0.3";
+       sha256 = "0bqr28rg7cacg2qypid6jpdxq273qafn3k5z6kgaksy7db69zxym";
        buildDepends = [
          base bytestring cereal Decimal iproute network template-haskell
          text time transformers uuid
@@ -34400,7 +35331,6 @@ self: {
          base bytestring cereal Decimal iproute network QuickCheck tasty
          tasty-quickcheck text time uuid
        ];
-       jailbreak = true;
        homepage = "https://github.com/twittner/cql/";
        description = "Cassandra CQL binary protocol";
        license = "unknown";
@@ -34408,21 +35338,21 @@ self: {
 
   "cql-io" = callPackage
     ({ mkDerivation, async, auto-update, base, bytestring, containers
-     , cql, data-default-class, exceptions, hashable, iproute, lens
-     , monad-control, mtl, mwc-random, network, semigroups, stm, text
-     , time, tinylog, transformers, transformers-base, uuid, vector
+     , cql, cryptohash, data-default-class, exceptions, hashable
+     , iproute, lens, monad-control, mtl, mwc-random, network
+     , semigroups, stm, text, time, tinylog, transformers
+     , transformers-base, uuid, vector
      }:
      mkDerivation {
        pname = "cql-io";
-       version = "0.13.2";
-       sha256 = "155vz9ndwf6d7z94iq9kshbpxcqyf82lszg03x8qflmkn21i85kg";
+       version = "0.14.2";
+       sha256 = "093x4fdvc4rcklcaar49p2c9yghyr6lmmddakfbadzz18aksnq8m";
        buildDepends = [
-         async auto-update base bytestring containers cql data-default-class
-         exceptions hashable iproute lens monad-control mtl mwc-random
-         network semigroups stm text time tinylog transformers
-         transformers-base uuid vector
+         async auto-update base bytestring containers cql cryptohash
+         data-default-class exceptions hashable iproute lens monad-control
+         mtl mwc-random network semigroups stm text time tinylog
+         transformers transformers-base uuid vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/twittner/cql-io/";
        description = "Cassandra CQL client";
        license = "unknown";
@@ -34590,8 +35520,8 @@ self: {
     ({ mkDerivation, base, data-binary-ieee754, ieee754 }:
      mkDerivation {
        pname = "crackNum";
-       version = "1.1";
-       sha256 = "12sr5dqm4cgmc2hk4fhn5zd4dqnhjzzb5hqldmj4s75xhpsnws10";
+       version = "1.3";
+       sha256 = "06balzwvvpl69abfcq0gynv6zpy42aygvlicb9jsnrys2vyipv28";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base data-binary-ieee754 ieee754 ];
@@ -34612,6 +35542,7 @@ self: {
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "2D graphics library with integrated TikZ output";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craftwerk-cairo" = callPackage
@@ -34625,6 +35556,7 @@ self: {
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Cairo backend for Craftwerk";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craftwerk-gtk" = callPackage
@@ -34679,8 +35611,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.2";
-       sha256 = "0wr1nmaaz9hvfp8dk0yf3srw3x4zksr11g35nbsxw7pdpsyc1ghr";
+       version = "5.9.5";
+       sha256 = "0wzdggsgrxpifk8z8y4mqq029dmylvg16x19r28f688rgpz62y0j";
        buildDepends = [
          array base bytestring cereal cond directory filepath gray-extended
          hdaemonize MonadRandom mtl old-locale process random split time
@@ -34691,7 +35623,6 @@ self: {
          QuickCheck temporary test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mhwombat/creatur";
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
@@ -34733,6 +35664,7 @@ self: {
        homepage = "https://github.com/kawu/crf-chain1-constrained";
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crf-chain2-generic" = callPackage
@@ -34771,6 +35703,7 @@ self: {
        homepage = "https://github.com/kawu/crf-chain2-tiers";
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "critbit" = callPackage
@@ -34915,7 +35848,6 @@ self: {
          attoparsec base derive hspec hspec-expectations QuickCheck text
          time transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
@@ -34952,6 +35884,7 @@ self: {
        jailbreak = true;
        description = "A runghc replacement with transparent caching";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-api" = callPackage
@@ -35042,6 +35975,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crypto-classical" = callPackage
+    ({ mkDerivation, base, bytestring, containers, crypto-numbers
+     , crypto-random, lens, modular-arithmetic, QuickCheck, random
+     , random-shuffle, text, transformers
+     }:
+     mkDerivation {
+       pname = "crypto-classical";
+       version = "0.1.0";
+       sha256 = "06x694ia1alw53a282krzmkbcr1xbvn5nmgfqbgysgpz5ky931wg";
+       buildDepends = [
+         base bytestring containers crypto-numbers crypto-random lens
+         modular-arithmetic QuickCheck random random-shuffle text
+         transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/fosskers/crypto-classical";
+       description = "An educational tool for studying classical cryptography schemes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "crypto-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , crypto-api, cryptocipher, cryptohash-cryptoapi, hspec, resourcet
@@ -35187,6 +36140,7 @@ self: {
        homepage = "https://github.com/ibotty/crypto-random-effect";
        description = "A random effect using crypto-random";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-totp" = callPackage
@@ -35281,8 +36235,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptol";
-       version = "2.2.1";
-       sha256 = "06dl3jkv0ygyb42p89hifrsmcg8jipyag01ibwj3gr6kxm443cg7";
+       version = "2.2.2";
+       sha256 = "1rqnrjxvkisis7m5zfhyw8717a9jnjgdmm6nnbdrnbxmsabsad20";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -35292,9 +36246,11 @@ self: {
          template-haskell text tf-random transformers utf8-string
        ];
        buildTools = [ alex happy ];
+       jailbreak = true;
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptsy-api" = callPackage
@@ -35305,8 +36261,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptsy-api";
-       version = "0.2";
-       sha256 = "09sx9z6s1ii8p4hw84j4ahd81a6k4xz3fn1zi60r7grsmbx69pkw";
+       version = "0.2.1";
+       sha256 = "1knnzh77y4rr7ka2nfwr99z61v2pvx2p1mzji06ac0mjk2n80ybs";
        buildDepends = [
          aeson base bytestring deepseq either http-client http-client-tls
          old-locale pipes-attoparsec pipes-http text time transformers
@@ -35314,7 +36270,7 @@ self: {
        ];
        jailbreak = true;
        description = "Bindings for Cryptsy cryptocurrency exchange API";
-       license = "unknown";
+       license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -35353,23 +36309,27 @@ self: {
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression" = callPackage
-    ({ mkDerivation, base, Boolean, colour, csound-expression-opcodes
-     , csound-expression-typed, data-default, process
+    ({ mkDerivation, base, Boolean, colour, csound-expression-dynamic
+     , csound-expression-opcodes, csound-expression-typed, data-default
+     , process, transformers
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "4.4.1";
-       sha256 = "03l7gbbiqs1djizda16hhi24pqgmqpdsfgl0dxvpzpvz703imfg5";
+       version = "4.6.1";
+       sha256 = "0q9s4zqqxyj5y7bvinvccssp6kj3q69arljwhspj9p8rsvzlqpr3";
        buildDepends = [
-         base Boolean colour csound-expression-opcodes
-         csound-expression-typed data-default process
+         base Boolean colour csound-expression-dynamic
+         csound-expression-opcodes csound-expression-typed data-default
+         process transformers
        ];
        homepage = "https://github.com/anton-k/csound-expression";
        description = "library to make electronic music";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression-dynamic" = callPackage
@@ -35378,8 +36338,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-dynamic";
-       version = "0.1.2";
-       sha256 = "05x9fbsm8ah2s7p81xzqmfvkxs81iplg1r334j6djcyab1waqa9i";
+       version = "0.1.4.1";
+       sha256 = "0x0i2xsvjvm4ag485503x0yc3ii9j7xkr5v9w5xk4494rp8w15f8";
        buildDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          transformers wl-pprint
@@ -35395,13 +36355,14 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-opcodes";
-       version = "0.0.1";
-       sha256 = "0lm95cx66i8bysr9y9gd455pfmx9didgk78cfld8fcwjj6rv1qa0";
+       version = "0.0.2";
+       sha256 = "0friwwx0ia2wk75ylmvlladswqfwhza8grsbnqfn5q8ffsjv632r";
        buildDepends = [
          base csound-expression-dynamic csound-expression-typed transformers
        ];
        description = "opcodes for the library csound-expression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression-typed" = callPackage
@@ -35411,8 +36372,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.0.7.1";
-       sha256 = "163jkx5x3mnlcj0zxx9595i4bpp29lz60fgcdkx07vmqky7hb1ng";
+       version = "0.0.7.3.1";
+       sha256 = "0k5yqg8mvslx05bjvxz64hg04d0wky9zzdfsazvc1yf36spgpw9f";
        buildDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq ghc-prim stable-maps transformers wl-pprint
@@ -35420,18 +36381,20 @@ self: {
        homepage = "https://github.com/anton-k/csound-expression-typed";
        description = "typed core for the library csound-expression";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-sampler" = callPackage
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.4.0";
-       sha256 = "03mymb5yk4hlf6nsmakxw0nyspvrs7882dmpx9r65lkpsvgnaxyp";
+       version = "0.0.5.0";
+       sha256 = "14ya1sbq5kqg4nbl6iak181rhi8znj33vbcxnhzbbcybx1y6rsh1";
        buildDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csp" = callPackage
@@ -35443,6 +36406,7 @@ self: {
        buildDepends = [ base containers mtl nondeterminism ];
        description = "Discrete constraint satisfaction problem (CSP) solvers";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cspmchecker" = callPackage
@@ -35470,6 +36434,7 @@ self: {
        buildDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css-text" = callPackage
@@ -35599,6 +36564,7 @@ self: {
        version = "0.27.0.0";
        sha256 = "0sqrg04zlwq62jggjvrd1dq7a2alwx2190w6b19d3jn51n0s907m";
        buildDepends = [ array base ];
+       jailbreak = true;
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35611,8 +36577,10 @@ self: {
        version = "0.1.0.1";
        sha256 = "1mbqgbig5n8rrkxmrdbcl8qafa2r58c2pial2b67yr6cw08v0srv";
        buildDepends = [ base chatty-text chatty-utils ];
+       jailbreak = true;
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ctrie" = callPackage
@@ -35639,9 +36607,11 @@ self: {
      }:
      mkDerivation {
        pname = "cube";
-       version = "0.1.0";
-       sha256 = "1rjn548g324hsb95wv31nybck3hs4sxgqjp4wl62cfs5glrsx1j6";
-       buildDepends = [ base bytestring cereal containers STL ];
+       version = "0.2.0";
+       sha256 = "0shclcwnh1az40ckvmhpw93xbhrr19wfhhvclcnv2fijy29667yp";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base bytestring cereal containers hspec STL ];
        testDepends = [ base bytestring cereal containers hspec STL ];
        description = "Cubic DSL for 3D printing";
        license = stdenv.lib.licenses.bsd3;
@@ -35701,6 +36671,7 @@ self: {
        ];
        buildTools = [ c2hs ];
        extraLibraries = [ cublas cusparse ];
+       jailbreak = true;
        homepage = "https://github.com/bmsherman/cublas";
        description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -35740,8 +36711,8 @@ self: {
      }:
      mkDerivation {
        pname = "cudd";
-       version = "0.1.0.1";
-       sha256 = "0p6gf6wwz5fd9hn2bf1lnmyc43cyh1pvgzbypfr85hy8zsy6byla";
+       version = "0.1.0.2";
+       sha256 = "0zhsj4qrvk1q1rj55nsysznv11m1x31dg7gxmgp5wdsk8l18w02r";
        buildDepends = [ array base mtl transformers ];
        buildTools = [ c2hs ];
        extraLibraries = [ cudd dddmp epd mtr st util ];
@@ -35756,8 +36727,8 @@ self: {
     ({ mkDerivation, base, c2hs, cuda }:
      mkDerivation {
        pname = "cufft";
-       version = "0.1.2.0";
-       sha256 = "09d62g5nwl8bj80h8pz5k9bjcp59xcbsa5pmbygqybhcfhng25kg";
+       version = "0.1.2.1";
+       sha256 = "1qkrp2dwfpivf5j42a7wij61010a3rmldxng4j8ivkrc7vllv76j";
        buildDepends = [ base cuda ];
        buildTools = [ c2hs ];
        homepage = "http://github.com/robeverest/cufft";
@@ -35793,16 +36764,15 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, rtld, time }:
      mkDerivation {
        pname = "curlhs";
-       version = "0.1.3";
-       revision = "10";
-       sha256 = "0m8n19kyimxd9c7aazkw7gak7v1lik04m0y0izs3zanjlhqvnn3j";
-       editedCabalFile = "1ae61743cd2150bfb25b279dbf7e4b9d0c9a2339e04cdb7fcf5a0358d7b712e0";
+       version = "0.1.5";
+       revision = "1";
+       sha256 = "0j0r238v3rlk9w7zby7lvh6drzy8d1hah6yzf4dz17hg27wb22ky";
+       editedCabalFile = "54dc0c9c8004df751cde41989c305af8e60e6112def522a07bdaf54fd28f27cd";
        buildDepends = [ base bytestring rtld time ];
        testDepends = [ base hspec ];
-       homepage = "https://kkardzis.github.com/curlhs";
+       homepage = "https://github.com/kkardzis/curlhs";
        description = "bindings to libcurl, the multiprotocol file transfer library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "currency" = callPackage
@@ -35958,6 +36928,7 @@ self: {
        version = "0.4.3";
        sha256 = "14rfyxmqjrlirszk2mrqm030rya6cbcydbf7fl7if82y21qrfg0p";
        buildDepends = [ arithmoi base containers ];
+       jailbreak = true;
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -36072,6 +37043,7 @@ self: {
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Compile-time, type-safe directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "damnpacket" = callPackage
@@ -36086,6 +37058,7 @@ self: {
          attoparsec base bytestring containers deepseq text
        ];
        testDepends = [ base containers QuickCheck text ];
+       jailbreak = true;
        homepage = "https://github.com/joelteon/damnpacket";
        description = "Parsing dAmn packets";
        license = stdenv.lib.licenses.mit;
@@ -36139,27 +37112,38 @@ self: {
      }) {};
 
   "darcs" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, curl
-     , directory, extensible-exceptions, filepath, hashed-storage
-     , haskeline, html, HTTP, mmap, mtl, network, network-uri, old-time
-     , parsec, process, random, regex-compat, tar, terminfo, text, unix
-     , utf8-string, vector, zlib
+    ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
+     , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
+     , dataenc, directory, filepath, FindBin, ghc, hashable, haskeline
+     , html, HUnit, mmap, mtl, old-time, parsec, process, QuickCheck
+     , random, regex-applicative, regex-compat-tdfa, shelly, split, tar
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, transformers, transformers-compat, unix, unix-compat
+     , utf8-string, vector, zip-archive, zlib
      }:
      mkDerivation {
        pname = "darcs";
-       version = "2.8.5";
-       sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6";
+       version = "2.10.0";
+       sha256 = "0dkby6bqv8dnv6zbvhz9yrablqkzi2szfsmrhmjk1934gczxpcsj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base bytestring containers directory extensible-exceptions
-         filepath hashed-storage haskeline html HTTP mmap mtl network
-         network-uri old-time parsec process random regex-compat tar
-         terminfo text unix utf8-string vector zlib
+         array attoparsec base base16-bytestring binary bytestring
+         containers cryptohash data-ordlist dataenc directory filepath
+         hashable haskeline html mmap mtl old-time parsec process random
+         regex-applicative regex-compat-tdfa tar text time transformers
+         transformers-compat unix unix-compat utf8-string vector zip-archive
+         zlib
+       ];
+       testDepends = [
+         array base binary bytestring cmdargs containers cryptohash dataenc
+         directory filepath FindBin ghc html HUnit mmap mtl parsec process
+         QuickCheck regex-compat-tdfa shelly split test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix-compat
+         zip-archive zlib
        ];
        extraLibraries = [ curl ];
        configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
-       jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -36280,7 +37264,6 @@ self: {
        jailbreak = true;
        description = "Import/export git fast-import streams to/from darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-graph" = callPackage
@@ -36324,8 +37307,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "darcs-scripts";
-       version = "0.1";
-       sha256 = "1jyl04z76935kz71hmz2hdx9bw2ka2v8pai6lpy6iz63wamhkmps";
+       version = "0.1.1";
+       sha256 = "06gs18s89nc5qyicfpkj0hz999l5pf4glhlanm2yhyd6lxbfgkba";
        buildDepends = [ base ];
        description = "Shell scripts for support of darcs workflow";
        license = stdenv.lib.licenses.bsd3;
@@ -36362,8 +37345,8 @@ self: {
      }:
      mkDerivation {
        pname = "darcsden";
-       version = "1.1";
-       sha256 = "105al8x28ml91nll0jwqfmkg7slipkd9b4rab8sb2mh4minspff2";
+       version = "1.1.1";
+       sha256 = "1dz87a6a6bmi2sfk0q21syipgnhpg9fdlr86m7sdrlk4s9s1s0c5";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -36420,9 +37403,11 @@ self: {
          data-binary-ieee754 directory mtl optparse-applicative regex-tdfa
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/bacher09/darkplaces-demo";
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darkplaces-text" = callPackage
@@ -36435,6 +37420,7 @@ self: {
        sha256 = "08zqrivqz57r0ifjpgksm5l8h19zmsxcicwf97h3andds62v05lf";
        buildDepends = [ ansi-terminal array base bytestring text vector ];
        buildTools = [ alex ];
+       jailbreak = true;
        homepage = "https://github.com/bacher09/darkplaces-text";
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
@@ -36448,8 +37434,8 @@ self: {
      }:
      mkDerivation {
        pname = "dash-haskell";
-       version = "1.0.0.3";
-       sha256 = "1z1nqfsfkkwcg4k7jhwyiwy7m1qwcmk9q0aqjqspikv8jg3zrqnz";
+       version = "1.0.0.4";
+       sha256 = "12nggfrc10i4kmjjqgiqjw9lz2mapqxxvs9d6cba43x43pb8z893";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -36458,9 +37444,11 @@ self: {
          sqlite-simple system-fileio system-filepath tagsoup text
          transformers
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/jfeltz/dash-haskell";
        description = "Command line tool to generate Dash docsets (IDE docs) from package haddock";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-accessor" = callPackage
@@ -36507,6 +37495,7 @@ self: {
        version = "0.2.1.4";
        sha256 = "12skayn01s8svfdr4h5am2y2dw7ax6s83pb7vy3jxyddywpm04mk";
        buildDepends = [ base data-accessor monads-tf transformers ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in monads-tf State monad type family";
        license = stdenv.lib.licenses.bsd3;
@@ -36529,8 +37518,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-accessor-template";
-       version = "0.2.1.11";
-       sha256 = "1n2slv287zp6pabqb7xbfi296dbikw5a4ivqmnas0c4nxikqkayx";
+       version = "0.2.1.12";
+       sha256 = "0pkr9qbvgysgsa28dpa77a21ghlgiykkcyl41gpr4s7jl9wjs107";
        buildDepends = [ base data-accessor template-haskell utility-ht ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
@@ -36593,6 +37582,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1vp17428a2pw4g3y2ra22ll5vjnqwl2xwr2wfj8ppkxaj34a2nsh";
        buildDepends = [ base containers lens ];
+       jailbreak = true;
        description = "A rotating sequence data structure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -36624,8 +37614,8 @@ self: {
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "data-clist";
-       version = "0.0.7.3";
-       sha256 = "0kabcqyvsajf5drihp3f6da2vbw76f85cc4gh20n9czxy19g35rq";
+       version = "0.0.7.4";
+       sha256 = "0vnrn8fcnibdbvwdf2smipnvmamgva0x7pszl4bykmh15ns417vn";
        buildDepends = [ base deepseq QuickCheck ];
        homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
@@ -36654,6 +37644,7 @@ self: {
        buildDepends = [ base collections-api collections-base-instances ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default" = callPackage
@@ -36767,7 +37758,6 @@ self: {
          array base binary bytestring QuickCheck spool syb test-framework
          test-framework-quickcheck2 vector
        ];
-       jailbreak = true;
        homepage = "http://monoid.at/code";
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
        license = stdenv.lib.licenses.lgpl21;
@@ -36805,6 +37795,7 @@ self: {
          base containers directory either errors haskell-src-exts hlint
          hspec HUnit QuickCheck safe text transformers unix
        ];
+       jailbreak = true;
        homepage = "https://github.com/jcristovao/easy-data";
        description = "Consistent set of utility functions for Maybe, Either, List, Monoids";
        license = stdenv.lib.licenses.bsd3;
@@ -36928,6 +37919,7 @@ self: {
        ];
        description = "Combinators for building fast hashing functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-interval" = callPackage
@@ -37065,6 +38057,7 @@ self: {
        version = "2.1.8";
        sha256 = "0w8x5zn3d98z0q74bqfgkb9s0ca9hd1xc53gjl759s77wm4iwa0q";
        buildDepends = [ base data-lens template-haskell ];
+       jailbreak = true;
        homepage = "http://github.com/roconnor/data-lens-template/";
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
@@ -37104,6 +38097,7 @@ self: {
        homepage = "https://github.com/kawu/data-named";
        description = "Data types for named entities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-nat" = callPackage
@@ -37298,6 +38292,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1";
        buildDepends = [ base bytestring containers text vector ];
+       jailbreak = true;
        homepage = "https://github.com/jxv/data-rev";
        description = "A typeclass for reversing order of contents";
        license = stdenv.lib.licenses.bsd3;
@@ -37480,6 +38475,7 @@ self: {
        version = "0.4";
        sha256 = "1ywp3h2zccknc2sr0b5zbf9ms2zph5qh8znswxc7bi5wynyk9z98";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/cutsea110/data-util";
        description = "utilities for handle data";
        license = stdenv.lib.licenses.bsd3;
@@ -37537,19 +38533,24 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base containers ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "dataflow" = callPackage
-    ({ mkDerivation, base, mtl }:
+    ({ mkDerivation, base, containers, hspec, HUnit, mtl, parsec }:
      mkDerivation {
        pname = "dataflow";
-       version = "0.3.1.0";
-       sha256 = "0rl396ll4m5vc6347d98bf7iyyvf7przgdsmh5l53qj7vl226fj6";
-       buildDepends = [ base mtl ];
+       version = "0.6.0.0";
+       sha256 = "0npfaq8zxkw2yj56x4m3cxcrl9krknw67apjjy1nbsabw9yaim2z";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base containers mtl parsec ];
+       testDepends = [ base hspec HUnit ];
        jailbreak = true;
+       homepage = "https://github.com/owickstrom/dataflow";
        description = "Generate Graphviz documents from a Haskell representation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37631,6 +38632,7 @@ self: {
        homepage = "http://github.com/esessoms/datetime";
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dawg" = callPackage
@@ -37702,6 +38704,7 @@ self: {
        ];
        description = "An implementation of relational database \"migrations\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus" = callPackage
@@ -37763,6 +38766,7 @@ self: {
        homepage = "https://john-millikin.com/software/dbus-core/";
        description = "Low-level D-Bus protocol implementation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-qq" = callPackage
@@ -37859,6 +38863,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-code" = callPackage
@@ -37868,6 +38873,7 @@ self: {
        version = "0.4.1.3";
        sha256 = "1m904n1s2cszakjrlz81y1gplrgfv3np2ja0m6fapj9c2yyfmg6r";
        buildDepends = [ base filepath ];
+       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler base libraries";
        license = stdenv.lib.licenses.mit;
@@ -37888,6 +38894,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-eval" = callPackage
@@ -37905,6 +38912,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-flow" = callPackage
@@ -37923,6 +38931,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-llvm" = callPackage
@@ -37941,6 +38950,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-salt" = callPackage
@@ -37958,6 +38968,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-simpl" = callPackage
@@ -37975,6 +38986,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-tetra" = callPackage
@@ -37993,6 +39005,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-driver" = callPackage
@@ -38015,6 +39028,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-interface" = callPackage
@@ -38024,6 +39038,7 @@ self: {
        version = "0.4.1.3";
        sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f";
        buildDepends = [ base containers ddc-base directory ];
+       jailbreak = true;
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler user interface support";
        license = stdenv.lib.licenses.mit;
@@ -38045,6 +39060,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-tools" = callPackage
@@ -38133,8 +39149,8 @@ self: {
   "debian" = callPackage
     ({ mkDerivation, 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
+     , network, network-uri, old-locale, parsec, pretty, process
+     , process-extras, pureMD5, regex-compat, regex-tdfa
      , template-haskell, text, time, unix, Unixutils, utf8-string, zlib
      }:
      mkDerivation {
@@ -38146,13 +39162,11 @@ self: {
        buildDepends = [
          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 = [
-         base HUnit parsec pretty prettyclass regex-tdfa text
+         parsec pretty process process-extras pureMD5 regex-compat
+         regex-tdfa template-haskell text time unix Unixutils utf8-string
+         zlib
        ];
+       testDepends = [ base HUnit parsec pretty regex-tdfa text ];
        homepage = "https://github.com/ddssff/debian-haskell";
        description = "Modules for working with the Debian package system";
        license = stdenv.lib.licenses.bsd3;
@@ -38270,6 +39284,7 @@ self: {
        homepage = "https://github.com/ajtulloch/deeplearning-hs";
        description = "Deep Learning in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepseq_1_3_0_1" = callPackage
@@ -38317,6 +39332,7 @@ self: {
          base cpphs deepseq deepseq-generics generics-sop ghc-prim HUnit
          parallel random syb template-haskell
        ];
+       jailbreak = true;
        homepage = "http://fremissant.net/deepseq-bounded";
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
@@ -38409,6 +39425,7 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "The base modules of the Definitive framework";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-filesystem" = callPackage
@@ -38476,6 +39493,7 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A parser combinator library for the Definitive framework";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-reactive" = callPackage
@@ -38546,6 +39564,7 @@ self: {
        sha256 = "1l23b5v0wjg72vlnyxa87v3j2dxbld536ws8j03ddcwgqgws1fj4";
        buildDepends = [ base bytestring parsec transformers ];
        extraLibraries = [ mpdec ];
+       jailbreak = true;
        homepage = "https://github.com/massysett/deka";
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -38635,6 +39654,7 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/delta-h";
        description = "Online entropy-based model of lexical category acquisition";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "demarcate" = callPackage
@@ -38648,6 +39668,7 @@ self: {
        homepage = "https://github.com/fizruk/demarcate";
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "denominate" = callPackage
@@ -38695,12 +39716,13 @@ self: {
      }:
      mkDerivation {
        pname = "dependent-sum-template";
-       version = "0.0.0.1";
-       sha256 = "16p6ckl6ml8lgy42mvivnqphfd73cg8chms3fxid66gv4fif68zl";
+       version = "0.0.0.3";
+       sha256 = "0if3mr0cmaz3yc0hbn0fpx14kwnjsaj3hd8mw9z4va4qp85wya69";
        buildDepends = [ base dependent-sum template-haskell th-extras ];
        homepage = "/dev/null";
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "depends" = callPackage
@@ -38722,6 +39744,7 @@ self: {
        ];
        description = "A simple configuration management tool for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dephd" = callPackage
@@ -38740,6 +39763,7 @@ self: {
        homepage = "http://malde.org/~ketil/biohaskell/dephd";
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dequeue" = callPackage
@@ -38753,6 +39777,7 @@ self: {
        buildDepends = [ base QuickCheck safe ];
        description = "A typeclass and an implementation for double-ended queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derangement" = callPackage
@@ -38845,10 +39870,10 @@ self: {
        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;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-trie" = callPackage
@@ -38862,6 +39887,7 @@ self: {
        homepage = "http://github.com/baldo/derive-trie";
        description = "Automatic derivation of Trie implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -38892,8 +39918,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "descrilo";
-       version = "0.1.0.2";
-       sha256 = "1wvq4gcda39k69hadz9kfxn5bsxqjag4chbbppiwmyp503y8f2k1";
+       version = "0.1.0.3";
+       sha256 = "19x78lv6rd5i5xvqj92q5snly1579jiiw2fgmxzxza0km9j9yiw2";
        buildDepends = [ base ];
        description = "Loads a list of items with fields";
        license = stdenv.lib.licenses.gpl3;
@@ -39053,6 +40079,7 @@ self: {
        homepage = "https://github.com/musically-ut/haskell-dgim";
        description = "Implementation of DGIM algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dgs" = callPackage
@@ -39103,8 +40130,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams";
-       version = "1.2";
-       sha256 = "17j7hyd86h9msc8ni19agb0yhixga76q9kh4i109iyiyqizdnfhg";
+       version = "1.3";
+       sha256 = "1f5cpa2qjpzq9m8d3066iixbq414zk0pv1vajghb214a1w9sqaf9";
        buildDepends = [
          diagrams-contrib diagrams-core diagrams-lib diagrams-svg
        ];
@@ -39114,24 +40141,25 @@ self: {
      }) {};
 
   "diagrams-builder" = callPackage
-    ({ mkDerivation, base, blaze-svg, bytestring, cmdargs
-     , diagrams-cairo, diagrams-lib, diagrams-postscript, diagrams-svg
-     , directory, exceptions, filepath, hashable, haskell-src-exts, hint
-     , lens, mtl, split, transformers
+    ({ mkDerivation, base, bytestring, cmdargs, diagrams-cairo
+     , diagrams-lib, diagrams-postscript, diagrams-rasterific
+     , diagrams-svg, directory, exceptions, filepath, hashable
+     , haskell-src-exts, hint, JuicyPixels, lens, lucid-svg, mtl, split
+     , transformers
      }:
      mkDerivation {
        pname = "diagrams-builder";
-       version = "0.6.0.4";
-       sha256 = "11zpl1zk1cn71as8n86mg4c1whr59h9qaddkq7pfw7ni5whx0k3n";
+       version = "0.7.0.1";
+       sha256 = "1a4qzrakvis560azbwx234i7882kax1qs212g5ckkr9yvnyanp76";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base blaze-svg bytestring cmdargs diagrams-cairo diagrams-lib
-         diagrams-postscript diagrams-svg directory exceptions filepath
-         hashable haskell-src-exts hint lens mtl split transformers
+         base bytestring cmdargs diagrams-cairo diagrams-lib
+         diagrams-postscript diagrams-rasterific diagrams-svg directory
+         exceptions filepath hashable haskell-src-exts hint JuicyPixels lens
+         lucid-svg mtl split transformers
        ];
        configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -39140,20 +40168,19 @@ self: {
 
   "diagrams-cairo" = callPackage
     ({ mkDerivation, base, bytestring, cairo, colour, containers
-     , data-default-class, diagrams-core, diagrams-lib, directory
-     , filepath, hashable, JuicyPixels, lens, mtl, old-time
-     , optparse-applicative, pango, process, split, statestack, time
-     , transformers, unix, vector
+     , data-default-class, diagrams-core, diagrams-lib, filepath
+     , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango
+     , split, statestack, transformers, unix, vector
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.2.0.7";
-       sha256 = "0z87qrp2z4j2x5zwwczrjw7kps7izcyb045665319kp9yp0dbzjk";
+       version = "1.3.0.1";
+       sha256 = "04zcyvirlwzg4zrdrassxhfpfmp0hg263pzdi904nv2qp1idayqi";
        buildDepends = [
          base bytestring cairo colour containers data-default-class
-         diagrams-core diagrams-lib directory filepath hashable JuicyPixels
-         lens mtl old-time optparse-applicative pango process split
-         statestack time transformers unix vector
+         diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
+         optparse-applicative pango split statestack transformers unix
+         vector
        ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
@@ -39164,16 +40191,15 @@ self: {
     ({ mkDerivation, base, blank-canvas, cmdargs, containers
      , data-default-class, diagrams-core, diagrams-lib, lens, mtl
      , NumInstances, optparse-applicative, statestack, text
-     , vector-space
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "0.3.0.4";
-       sha256 = "1jc47y739rg51czny0z17pspskim4ss2jraw6h5gyhnr8f50rv5w";
+       version = "1.3";
+       sha256 = "1zqq77ka3p7y9szqvlazwwaamz1b7lg2l8dp2wz5wycignchl26b";
        buildDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
-         optparse-applicative statestack text vector-space
+         optparse-applicative statestack text
        ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
@@ -39181,22 +40207,22 @@ self: {
      }) {};
 
   "diagrams-contrib" = callPackage
-    ({ mkDerivation, arithmoi, base, circle-packing, colour, containers
+    ({ mkDerivation, base, circle-packing, colour, containers
      , data-default, data-default-class, diagrams-core, diagrams-lib
-     , force-layout, HUnit, lens, MonadRandom, mtl, parsec, QuickCheck
-     , semigroups, split, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, vector-space
-     , vector-space-points
+     , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
+     , mtl, parsec, QuickCheck, random, semigroups, split
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.1.2.6";
-       sha256 = "0bkil4klkdx30q6hwdcag20fbgx04vcn9kl7196mccl7yhh1msi0";
+       version = "1.3.0";
+       sha256 = "0q4369kdm04nl5rkdpbz23ckknsipmyysp5zmxp5ibmgh3mi8sq7";
        buildDepends = [
-         arithmoi base circle-packing colour containers data-default
-         data-default-class diagrams-core diagrams-lib force-layout lens
-         MonadRandom mtl parsec semigroups split text vector-space
-         vector-space-points
+         base circle-packing colour containers data-default
+         data-default-class diagrams-core diagrams-lib diagrams-solve
+         force-layout lens linear MonadRandom mtl parsec random semigroups
+         split text
        ];
        testDepends = [
          base containers diagrams-lib HUnit QuickCheck test-framework
@@ -39208,17 +40234,17 @@ self: {
      }) {};
 
   "diagrams-core" = callPackage
-    ({ mkDerivation, base, containers, dual-tree, lens, MemoTrie
-     , monoid-extras, newtype, semigroups, vector-space
-     , vector-space-points
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
+     , unordered-containers
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.2.0.6";
-       sha256 = "1i8h7arzhq2qzkv9hjldz3vymcns7y1w3wn56w57k2sbx3vx0zls";
+       version = "1.3";
+       sha256 = "1abf2pxs659bqhl6d803ny11gacfa1wy5c1g47k0h8q9nq6jg3q9";
        buildDepends = [
-         base containers dual-tree lens MemoTrie monoid-extras newtype
-         semigroups vector-space vector-space-points
+         adjunctions base containers distributive dual-tree lens linear
+         monoid-extras mtl semigroups unordered-containers
        ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
@@ -39229,8 +40255,8 @@ self: {
     ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
      mkDerivation {
        pname = "diagrams-gtk";
-       version = "1.0.1.3";
-       sha256 = "1bcgplmg01sp7iwhgx7ircbn9bj15m42w6vkh539sd65y01z3hc8";
+       version = "1.3";
+       sha256 = "0kf340d63jzb0clw9kv2i8wdhprv5cialcfqbaxyhdvf0qswp8ms";
        buildDepends = [ base cairo diagrams-cairo diagrams-lib gtk ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
@@ -39238,23 +40264,24 @@ self: {
      }) {};
 
   "diagrams-haddock" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base64-bytestring, blaze-svg
-     , bytestring, Cabal, cautious-file, cmdargs, containers, cpphs
+    ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring
+     , Cabal, cautious-file, cmdargs, containers, cpphs
      , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath
-     , haskell-src-exts, lens, mtl, parsec, QuickCheck, split, strict
-     , tasty, tasty-quickcheck, text, uniplate, vector-space
+     , haskell-src-exts, lens, linear, lucid-svg, mtl, parsec
+     , QuickCheck, split, strict, tasty, tasty-quickcheck, text
+     , uniplate
      }:
      mkDerivation {
        pname = "diagrams-haddock";
-       version = "0.2.2.14";
-       sha256 = "0j2flbirqxvgvyv8s3d8cwiqz9w3p864g2wg5hsya8r30jmlyycl";
+       version = "0.3.0.1";
+       sha256 = "1b75pynmvx32yqzvp2aflfbj373jj73wnpc9abkxl41myrmajr87";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         ansi-terminal base base64-bytestring blaze-svg bytestring Cabal
-         cautious-file cmdargs containers cpphs diagrams-builder
-         diagrams-lib diagrams-svg directory filepath haskell-src-exts lens
-         mtl parsec split strict text uniplate vector-space
+         ansi-terminal base base64-bytestring bytestring Cabal cautious-file
+         cmdargs containers cpphs diagrams-builder diagrams-lib diagrams-svg
+         directory filepath haskell-src-exts lens linear lucid-svg mtl
+         parsec split strict text uniplate
        ];
        testDepends = [
          base containers haskell-src-exts lens parsec QuickCheck tasty
@@ -39280,27 +40307,52 @@ self: {
          base colour containers diagrams-core diagrams-lib hsqml lens text
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/marcinmrotek/diagrams-hsqml";
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-html5" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, data-default-class
+     , diagrams-core, diagrams-lib, lens, mtl, NumInstances
+     , optparse-applicative, split, statestack, static-canvas, text
+     }:
+     mkDerivation {
+       pname = "diagrams-html5";
+       version = "1.3";
+       sha256 = "1g9a7wg7rdzqz0bl476gq7hbmsn369jdi67k9ikbjw7z9w060l5f";
+       buildDepends = [
+         base cmdargs containers data-default-class diagrams-core
+         diagrams-lib lens mtl NumInstances optparse-applicative split
+         statestack static-canvas text
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "HTML5 canvas backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-lib" = callPackage
-    ({ mkDerivation, active, array, base, colour, containers
-     , data-default-class, diagrams-core, dual-tree, filepath
-     , fingertree, hashable, intervals, JuicyPixels, lens, MemoTrie
-     , monoid-extras, optparse-applicative, semigroups, tagged
-     , vector-space, vector-space-points
+    ({ mkDerivation, active, adjunctions, array, base, colour
+     , containers, data-default-class, diagrams-core, diagrams-solve
+     , directory, distributive, dual-tree, exceptions, filepath
+     , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens
+     , linear, monoid-extras, mtl, optparse-applicative, process
+     , semigroups, system-filepath, tagged, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.2.0.9";
-       sha256 = "1naamjx7i9k3jwbvrz5jwhsfmri3jgjxqwalckyc473pclf6y4k9";
+       version = "1.3";
+       sha256 = "0ap92ya3m74dq4x9zv1jx7cbb0cpzssgy8r7xqmzyq54grdxv01r";
        buildDepends = [
-         active array base colour containers data-default-class
-         diagrams-core dual-tree filepath fingertree hashable intervals
-         JuicyPixels lens MemoTrie monoid-extras optparse-applicative
-         semigroups tagged vector-space vector-space-points
+         active adjunctions array base colour containers data-default-class
+         diagrams-core diagrams-solve directory distributive dual-tree
+         exceptions filepath fingertree fsnotify hashable intervals
+         JuicyPixels lens linear monoid-extras mtl optparse-applicative
+         process semigroups system-filepath tagged text transformers
+         unordered-containers
        ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
@@ -39327,23 +40379,45 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "diagrams-pgf" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, colour
+     , containers, diagrams-core, diagrams-lib, directory, filepath
+     , hashable, JuicyPixels, mtl, optparse-applicative, process, split
+     , texrunner, time, vector, zlib
+     }:
+     mkDerivation {
+       pname = "diagrams-pgf";
+       version = "0.1.0.1";
+       sha256 = "0q19qb1cxgkhg9z24kxgy80swbfc1bnrkzmv40kz997rlfz7qaiz";
+       buildDepends = [
+         base bytestring bytestring-builder colour containers diagrams-core
+         diagrams-lib directory filepath hashable JuicyPixels mtl
+         optparse-applicative process split texrunner time vector zlib
+       ];
+       homepage = "http://github.com/cchalmers/diagrams-pgf";
+       description = "PGF backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-postscript" = callPackage
     ({ mkDerivation, base, containers, data-default-class
      , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
-     , monoid-extras, mtl, semigroups, split, vector-space
+     , monoid-extras, mtl, semigroups, split, statestack
      }:
      mkDerivation {
        pname = "diagrams-postscript";
-       version = "1.1.0.5";
-       sha256 = "1nriv964zmzlcyqxb3drfbxsimg786n4bsyyy1020rchf3df8rp5";
+       version = "1.3.0.0";
+       sha256 = "1dbnmlwm6blkh8x5rvsvlm6is84bvy9aymayf5k7nhvz9qb82n8v";
        buildDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          filepath hashable lens monoid-extras mtl semigroups split
-         vector-space
+         statestack
        ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -39354,26 +40428,27 @@ self: {
        version = "1.2";
        sha256 = "15c1h0izxi475b1n8q3dmg0kpp7dk0s4nifnxcq3lbq71jmsg8ll";
        buildDepends = [ array base colour diagrams-core diagrams-lib ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/diagrams-qrcode";
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-rasterific" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default-class
-     , diagrams-core, diagrams-lib, directory, filepath, FontyFruity
-     , JuicyPixels, lens, mtl, old-time, optparse-applicative, process
-     , Rasterific, split, statestack, time, unix
+     , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable
+     , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split
+     , unix
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "0.1.0.8";
-       sha256 = "08a80w466hz89xp82n5yqqisd2vkd1876z4hw2p99bg22qr8b87k";
+       version = "1.3.1.0";
+       sha256 = "0as845zjd3wwixzgiy9vv68ginscsn5194966nhch9mbwxm32ljb";
        buildDepends = [
          base bytestring containers data-default-class diagrams-core
-         diagrams-lib directory filepath FontyFruity JuicyPixels lens mtl
-         old-time optparse-applicative process Rasterific split statestack
-         time unix
+         diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl
+         optparse-applicative Rasterific split unix
        ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
@@ -39387,30 +40462,45 @@ self: {
        version = "0.1.0.0";
        sha256 = "1lvircn37ws8xy9z8r5ric0hngx3v2vvhnf2bkakg8gnr7cvfpiv";
        buildDepends = [ base data-default-class diagrams-lib lens ];
+       jailbreak = true;
        homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-solve" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "diagrams-solve";
+       version = "0.1";
+       sha256 = "0jqc0mlswrp7iz7wg02fp9ggi04rb97bzlssvpv26z6i6ig3b5sf";
+       buildDepends = [ base ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Pure Haskell solver routines used by diagrams";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-svg" = callPackage
-    ({ mkDerivation, base, base64-bytestring, blaze-markup, blaze-svg
-     , bytestring, colour, containers, diagrams-core, diagrams-lib
-     , directory, filepath, hashable, JuicyPixels, lens, monoid-extras
-     , mtl, old-time, process, split, time, unix, vector-space
+    ({ mkDerivation, base, base64-bytestring, bytestring, colour
+     , containers, diagrams-core, diagrams-lib, directory, filepath
+     , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl
+     , old-time, optparse-applicative, process, split, text, time
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.1.0.5";
-       sha256 = "0n4ljdym9cbq4n7ynx5caxlr26ai5ifzv9x0yvqydhczmm0n35xf";
+       version = "1.3";
+       sha256 = "1jwya3cksx2js10x37fdnjvhjgkzp5pxnlfd9wnd4g8r90y77jf6";
        buildDepends = [
-         base base64-bytestring blaze-markup blaze-svg bytestring colour
-         containers diagrams-core diagrams-lib directory filepath hashable
-         JuicyPixels lens monoid-extras mtl old-time process split time unix
-         vector-space
+         base base64-bytestring bytestring colour containers diagrams-core
+         diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
+         monoid-extras mtl old-time optparse-applicative process split text
+         time
        ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -39452,13 +40542,30 @@ self: {
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://monoid.at/code";
        description = "Cryptographically secure n-sided dice via rejection sampling";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dicom" = callPackage
+    ({ mkDerivation, base, binary, bytestring, old-locale, pretty, safe
+     , time
+     }:
+     mkDerivation {
+       pname = "dicom";
+       version = "0.1.1.0";
+       sha256 = "16n6mx95zfg8pa6y2zlj20imssykcrjilas1dh9li4r377rz5sdb";
+       buildDepends = [
+         base binary bytestring old-locale pretty safe time
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/dicomgrid/dicom-haskell-library/";
+       description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dictparser" = callPackage
     ({ mkDerivation, base, hspec, parsec, split }:
      mkDerivation {
@@ -39578,6 +40685,7 @@ self: {
        homepage = "https://github.com/bgamari/digamma";
        description = "A robust implementation of the digamma function";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digest" = callPackage
@@ -39617,8 +40725,10 @@ self: {
          base blaze-bootstrap blaze-html digestive-functors
          digestive-functors-blaze http-types text
        ];
+       jailbreak = true;
        description = "Speed up form designing using digestive functors and bootstrap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-foundation-lucid" = callPackage
@@ -39633,8 +40743,10 @@ self: {
          base digestive-functors digestive-functors-lucid http-types lucid
          lucid-foundation text
        ];
+       jailbreak = true;
        description = "Speed up form designing using digestive functors and foundation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors" = callPackage
@@ -39644,8 +40756,8 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors";
-       version = "0.7.1.5";
-       sha256 = "1rfdxac3cnwa5r5zxic3xhj4n59f7s6l34xmja4q87ylqxfyqmls";
+       version = "0.8.0.0";
+       sha256 = "0wlp4504dpv0diw6ln0j3f3dz3232dgcccyzlck92b27asvl3yq3";
        buildDepends = [
          base bytestring containers mtl old-locale text time
        ];
@@ -39657,6 +40769,7 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "A practical formlet library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-aeson" = callPackage
@@ -39680,6 +40793,7 @@ self: {
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-blaze" = callPackage
@@ -39688,14 +40802,15 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-blaze";
-       version = "0.6.0.5";
-       sha256 = "1mskyz5iab8jy7b2k3nn7c3z7bvwv4cqhviw4qr5xpzqk59ls7kr";
+       version = "0.6.0.6";
+       sha256 = "1kx8d6w89cs9dr7fpfikv7mf0ql1lz854i492nwm64x3d016q6xi";
        buildDepends = [
          base blaze-html blaze-markup digestive-functors text
        ];
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Blaze frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-happstack" = callPackage
@@ -39704,15 +40819,15 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-happstack";
-       version = "0.6.1.0";
-       sha256 = "02akxqb8zmc4gbgs79g8k5ycp20c54zc025vl6l3b4mc45lp73r4";
+       version = "0.6.1.1";
+       sha256 = "0d613rxwja327fb2dm79xh55vhpa4mg8c1ch4xzrgw3jcchykag5";
        buildDepends = [
          base bytestring digestive-functors happstack-server text
        ];
-       jailbreak = true;
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-heist" = callPackage
@@ -39721,15 +40836,15 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-heist";
-       version = "0.8.6.1";
-       sha256 = "1l8ppn2h1nxzn5wxnglc2fyi7r90177v75yf4n7cyvzrcxdaz4bb";
+       version = "0.8.6.2";
+       sha256 = "0njdhyrwzvcla65j5za0h4n41f2n1sdnar7glcal343xsy2rl019";
        buildDepends = [
          base blaze-builder digestive-functors heist mtl text xmlhtml
        ];
-       jailbreak = true;
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Heist frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-hsp" = callPackage
@@ -39758,6 +40873,7 @@ self: {
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Lucid frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-scotty" = callPackage
@@ -39775,6 +40891,7 @@ self: {
        homepage = "https://bitbucket.org/wniare/digestive-functors-scotty";
        description = "Scotty backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-snap" = callPackage
@@ -39783,15 +40900,17 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-functors-snap";
-       version = "0.6.1.1";
-       sha256 = "1y9i1hiawzhdglg1jrnxd36h534i1hxg0r8dnibafwk34v1j2n24";
+       version = "0.6.1.2";
+       sha256 = "1rkapw7vgz0wfzm8g1lm8z9b7rzwzhsxsc4i7ilig23x16jw07hl";
        buildDepends = [
          base bytestring containers digestive-functors directory filepath
          mtl snap-core text
        ];
+       jailbreak = true;
        homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Snap backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digit" = callPackage
@@ -39824,8 +40943,8 @@ self: {
     ({ mkDerivation, base, numtype, time }:
      mkDerivation {
        pname = "dimensional";
-       version = "0.13.0.1";
-       sha256 = "1cn7gyskp0ax5lm5k05p6qp461hirjyhj0k1qyd64fgdmmp81vi6";
+       version = "0.13.0.2";
+       sha256 = "1gi8948q1kxnbc76v05swj0yr58j9lljxak6lyci529ny0ac4qlp";
        buildDepends = [ base numtype time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions";
@@ -39836,8 +40955,8 @@ self: {
     ({ mkDerivation, base, numtype-tf, time }:
      mkDerivation {
        pname = "dimensional-tf";
-       version = "0.3.0.1";
-       sha256 = "0gnaylxhjcyvsibq15bw9k4c846l2329yvvl79cdw2jqggfnzxw6";
+       version = "0.3.0.2";
+       sha256 = "1bqd7298y9ymykhi70pqgxwh1599xbq5x4v75mrki5kirh8gqc4x";
        buildDepends = [ base numtype-tf time ];
        homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions, implemented using type families";
@@ -39921,6 +41040,7 @@ self: {
        homepage = "https://github.com/llllllllll/Math.Diophantine";
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-binary-files" = callPackage
@@ -39933,6 +41053,7 @@ self: {
        homepage = "http://ireneknapp.com/software/";
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-daemonize" = callPackage
@@ -39982,6 +41103,7 @@ self: {
        homepage = "http://ireneknapp.com/software/";
        description = "Native webserver that acts as a library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-murmur-hash" = callPackage
@@ -40041,19 +41163,21 @@ self: {
        jailbreak = true;
        description = "Finite directed cubical complexes and associated algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_2_2_0" = callPackage
-    ({ mkDerivation, base, filepath, time, unix }:
+  "directory_1_2_2_1" = callPackage
+    ({ mkDerivation, base, filepath, python, time, unix, which }:
      mkDerivation {
        pname = "directory";
-       version = "1.2.2.0";
-       sha256 = "1dbn6d48gdqh0n2rkh02asxv94ikd8849659ndc7p3h93kgj1dy4";
+       version = "1.2.2.1";
+       sha256 = "0ikhkmgzmpxvgl9w1piv168sbwkrvn0l2xdx9zb4sw75ci1ymb1y";
        buildDepends = [ base filepath time unix ];
-       testDepends = [ base ];
+       testDepends = [ base python which ];
        description = "Platform-agnostic library for filesystem operations";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+       broken = true;
+     }) { python = null;  which = null;};
 
   "directory-layout" = callPackage
     ({ mkDerivation, base, bytestring, command-qq, containers
@@ -40141,6 +41265,7 @@ self: {
        version = "0.1";
        sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d";
        buildDepends = [ base time ];
+       jailbreak = true;
        homepage = "https://github.com/kallisti-dev/discordian-calendar";
        description = "library for handling Discordian calendar dates";
        license = stdenv.lib.licenses.bsd3;
@@ -40250,9 +41375,11 @@ self: {
          old-locale random rank1dynamic stm syb template-haskell time
          transformers
        ];
+       jailbreak = true;
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -40278,6 +41405,7 @@ self: {
          network-transport network-transport-tcp rematch stm test-framework
          test-framework-hunit transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/haskell-distributed/distributed-process-async";
        description = "Cloud Haskell Async API";
        license = stdenv.lib.licenses.bsd3;
@@ -40369,6 +41497,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 time
          transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/haskell-distributed/distributed-process-execution";
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -40422,6 +41551,7 @@ self: {
        homepage = "http://haskell-distributed.github.io";
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -40442,6 +41572,7 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -40474,6 +41605,7 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-platform";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-registry" = callPackage
@@ -40530,6 +41662,7 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-supervisor" = callPackage
@@ -40558,6 +41691,7 @@ self: {
          rematch stm test-framework test-framework-hunit time transformers
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/haskell-distributed/distributed-process-supervisor";
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -40593,6 +41727,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 time
          transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/haskell-distributed/distributed-process-task";
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -40664,6 +41799,7 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution" = callPackage
@@ -40677,6 +41813,7 @@ self: {
        homepage = "https://github.com/redelmann/haskell-distribution";
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution-plot" = callPackage
@@ -40717,21 +41854,23 @@ self: {
 
   "diversity" = callPackage
     ({ mkDerivation, base, containers, fasta, math-functions
-     , optparse-applicative, parsec, split
+     , MonadRandom, optparse-applicative, parsec, pipes, random-shuffle
+     , scientific, split
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.4.0.1";
-       sha256 = "15baqhwzhdsbn2iz2r7vkf66nbv0p4ni1qkpnpwblwbcnvfk2lzq";
+       version = "0.6.0.1";
+       sha256 = "1dx1f647849v5mlsp862x7cmwiygiph9y1fgdfg1xnfshlx6r4qp";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base containers fasta math-functions optparse-applicative parsec
-         split
+         base containers fasta math-functions MonadRandom
+         optparse-applicative parsec pipes random-shuffle scientific split
        ];
        homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Return the diversity at each position for all sequences in a fasta file";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "djinn" = callPackage
@@ -40875,6 +42014,7 @@ self: {
        sha256 = "0gfyyr1wcxni0r0r9df6lkmv6gvi0qvwclwi9majzg10pas6dk2n";
        buildDepends = [ base transformers ];
        extraLibraries = [ dns_sd ];
+       jailbreak = true;
        homepage = "https://github.com/maxpow4h/dnssd";
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -40945,6 +42085,7 @@ self: {
        homepage = "http://github.com/gimbo/docidx.hs";
        description = "Generate an HTML index of installed Haskell packages and their documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docker" = callPackage
@@ -41052,6 +42193,7 @@ self: {
          aeson base bytestring directory doctest filepath
        ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
@@ -41074,6 +42216,7 @@ self: {
          base bytestring configurator directory doctest filepath
        ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        homepage = "http://github.com/relrod/doctest-discover-noaeson";
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
        license = stdenv.lib.licenses.publicDomain;
@@ -41090,6 +42233,7 @@ self: {
        testDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dom-lt" = callPackage
@@ -41175,6 +42319,7 @@ self: {
          base bytestring containers tagsoup text unordered-containers vector
          yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/valderman/domplate";
        description = "A simple templating library using HTML5 as its template language";
        license = stdenv.lib.licenses.bsd3;
@@ -41196,18 +42341,19 @@ self: {
 
   "dotenv" = callPackage
     ({ mkDerivation, base, base-compat, hspec, optparse-applicative
-     , parsec, process
+     , parsec, parseerror-eq, process
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.1.0.7";
-       sha256 = "0wxzlgh3qz35x3vw5m1xk3f9hq5kpyhccy9h05s0q5012fcd189a";
+       version = "0.1.0.8";
+       sha256 = "1hrr8w5hi6l8v85cwq5r6175al6waj0hmfkvnx8xib2rpby47px6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base base-compat optparse-applicative parsec process
        ];
-       testDepends = [ base base-compat hspec parsec ];
+       testDepends = [ base base-compat hspec parsec parseerror-eq ];
+       homepage = "https://github.com/stackbuilders/dotenv-hs";
        description = "Loads environment variables from dotenv files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -41270,6 +42416,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dove" = callPackage
+    ({ mkDerivation, acl2, base }:
+     mkDerivation {
+       pname = "dove";
+       version = "0.0.0";
+       sha256 = "19h3inxxxcblsbakm93mblhg8g68qc699c13cnska65ij50h3jwd";
+       buildDepends = [ acl2 base ];
+       description = "The Dove verification language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dow" = callPackage
     ({ mkDerivation, array, base, directory, elerea, GLFW
      , mersenne-random, OpenGL
@@ -41285,6 +42442,7 @@ self: {
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "download" = callPackage
@@ -41311,6 +42469,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/download-curl";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "download-media-content" = callPackage
@@ -41333,6 +42492,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dozenal" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "dozenal";
+       version = "0.1.0.0";
+       sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l";
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/siddhanathan/dozenal";
+       description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "dph-base" = callPackage
     ({ mkDerivation, array, base, ghc-prim, pretty, random, vector }:
      mkDerivation {
@@ -41522,6 +42694,7 @@ self: {
        homepage = "https://github.com/cwi-swat/monadic-frp";
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "drawille" = callPackage
@@ -41546,6 +42719,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "1ldqlkxkshg4i1iqvjzq01cz9mxhyaszhybhq4kngd0rig3n1qhq";
        buildDepends = [ base bytestring postgresql-simple text time ];
+       jailbreak = true;
        homepage = "https://github.com/AndrewRademacher/drifter";
        description = "Simple schema management for arbitrary databases";
        license = stdenv.lib.licenses.mit;
@@ -41721,6 +42895,7 @@ self: {
          array base binary bytestring containers data-binary-ieee754 pretty
          transformers
        ];
+       jailbreak = true;
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41791,6 +42966,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dtw" = callPackage
+    ({ mkDerivation, base, containers, MemoTrie, QuickCheck
+     , test-framework, test-framework-quickcheck2, thyme, vector
+     , vector-space
+     }:
+     mkDerivation {
+       pname = "dtw";
+       version = "1.0.0.0";
+       sha256 = "0kcb773sly86lkvnb3ihsswrz432phi3ccizwbf1phzf72kdflzr";
+       buildDepends = [ base containers MemoTrie vector vector-space ];
+       testDepends = [
+         base containers MemoTrie QuickCheck test-framework
+         test-framework-quickcheck2 thyme vector vector-space
+       ];
+       description = "(Fast) Dynamic Time Warping";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dual-tree" = callPackage
     ({ mkDerivation, base, monoid-extras, newtype, semigroups }:
      mkDerivation {
@@ -41827,8 +43021,10 @@ self: {
        testDepends = [
          base HUnit MissingH QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       jailbreak = true;
        description = "Frontend development build tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dvda" = callPackage
@@ -41851,7 +43047,6 @@ self: {
        ];
        description = "Efficient automatic differentiation and code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dvdread" = callPackage
@@ -41875,6 +43070,7 @@ self: {
        version = "0.3.1";
        sha256 = "0dp6acmrvlns85nzbbh65vd6fjam04h11kxd9bk6j6hqa2qaqa43";
        buildDepends = [ base bytestring filepath transformers ];
+       jailbreak = true;
        description = "Read/write DVI and TFM file";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -41998,16 +43194,16 @@ self: {
      }) {};
 
   "dynamic-graph" = callPackage
-    ({ mkDerivation, base, bytestring, cairo, colour, deepseq, either
-     , GLFW-b, GLUtil, OpenGL, pango, pipes, transformers
+    ({ mkDerivation, base, cairo, colour, either, GLFW-b, GLUtil
+     , OpenGL, pango, pipes, transformers
      }:
      mkDerivation {
        pname = "dynamic-graph";
-       version = "0.1.0.6";
-       sha256 = "0ikyszx122amlg6vp6jvz16y2qndy4plwh2hq1xhi83xicjkc0x1";
+       version = "0.1.0.8";
+       sha256 = "1lh7wlzmm1nsbzy7ahkcajyfkg4v2vbyp0992570w32bn7nl4b5k";
        buildDepends = [
-         base bytestring cairo colour deepseq either GLFW-b GLUtil OpenGL
-         pango pipes transformers
+         base cairo colour either GLFW-b GLUtil OpenGL pango pipes
+         transformers
        ];
        homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
@@ -42049,6 +43245,7 @@ self: {
        version = "0.1.0.2";
        sha256 = "0pxl30zimy5733qn53xi30cfgksslc1wz6vqcfm8kg43919kdagn";
        buildDepends = [ base primitive vector ];
+       jailbreak = true;
        homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
@@ -42096,6 +43293,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/dynamic-plot";
        description = "Interactive diagram windows";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-state" = callPackage
@@ -42112,6 +43310,7 @@ self: {
        ];
        description = "Optionally serializable dynamic state keyed by type";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynobud" = callPackage
@@ -42143,7 +43342,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
-       jailbreak = true;
        description = "your dynamic optimization buddy";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42230,9 +43428,11 @@ self: {
        buildDepends = [
          base mtl parsec text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/thinkpad20/easyjson";
        description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easyplot" = callPackage
@@ -42256,6 +43456,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "147r2jw0vrld73637vw4k83v4xf8r1dl9cy6gcll9kkpkcck8lkn";
        buildDepends = [ base bytestring containers mtl superdoc zlib ];
+       jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/";
        description = "User-friendly creation of EPS, PostScript, and PDF files";
        license = stdenv.lib.licenses.gpl3;
@@ -42328,7 +43529,6 @@ self: {
        homepage = "https://github.com/fabianbergmark/ECMA-262";
        description = "A ECMA-262 interpreter library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ecu" = callPackage
@@ -42363,6 +43563,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ed25519-donna" = callPackage
+    ({ mkDerivation, base, bytestring, crypto-api }:
+     mkDerivation {
+       pname = "ed25519-donna";
+       version = "0.1";
+       sha256 = "1x7dmv53hj9j360rwyq379mfzsddbabyzpl37i5fmjwpy160c2r6";
+       buildDepends = [ base bytestring crypto-api ];
+       jailbreak = true;
+       homepage = "github.com/tommd/hs-ed25519-donna";
+       description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "eddie" = callPackage
     ({ mkDerivation, base, cmdargs, hint }:
      mkDerivation {
@@ -42386,8 +43599,8 @@ self: {
      }:
      mkDerivation {
        pname = "ede";
-       version = "0.2.8";
-       sha256 = "1pzqjs7560xkw51aqpivm6sgysnxs6c5jy4fnalvds79gk37yryh";
+       version = "0.2.8.2";
+       sha256 = "0j0b0pn9apvpqxb0gnxxp51g32xc47jky4njb9jn0x59jssc1g1q";
        buildDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
          filepath free lens mtl parsers scientific semigroups text
@@ -42408,9 +43621,11 @@ self: {
        version = "1.2.0.0";
        sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj";
        buildDepends = [ base containers deepseq parallel ];
+       jailbreak = true;
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "Semi-explicit parallel programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edenskel" = callPackage
@@ -42443,6 +43658,7 @@ self: {
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edge" = callPackage
@@ -42470,13 +43686,17 @@ self: {
      mkDerivation {
        pname = "edit-distance";
        version = "0.2.1.2";
+       revision = "1";
        sha256 = "08dxsp1ar8mr4xrjy37lzl0s1rjnqsdq30p09nclip5pyhcw7g44";
+       editedCabalFile = "27d6fb19e1707aa05883ca4ffd6715dcc81db287c71508d6aaa420cefc8f29c1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base containers random ];
+       jailbreak = true;
        homepage = "http://github.com/batterseapower/edit-distance";
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edit-distance-vector" = callPackage
@@ -42545,6 +43765,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) libedit;};
 
+  "editor-open" = callPackage
+    ({ mkDerivation, base, bytestring, process, temporary, unix }:
+     mkDerivation {
+       pname = "editor-open";
+       version = "0.2.0.0";
+       sha256 = "0lv7rkapyvhsrri1094ls4biv7s5p5a30zm20ghqaky3nka2n18p";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base bytestring process temporary unix ];
+       homepage = "https://notabug.org/pharpend/editor-open";
+       description = "Open the user's $EDITOR for text input";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "effect-handlers" = callPackage
     ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
      , kan-extensions, mtl, QuickCheck
@@ -42642,9 +43876,10 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "effin";
-       version = "0.2.1.2";
-       sha256 = "0zjblpsd837ngg1pb1rqb3wyszwx93hpn08qg0b6f68vks83z66s";
+       version = "0.2.1.3";
+       sha256 = "0iv3va8lhfikk9mssg6sx2yzvdq6yh53gnv53gl9dwll8pnj8fhh";
        buildDepends = [ base mtl ];
+       jailbreak = true;
        homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
@@ -42674,6 +43909,7 @@ self: {
        homepage = "http://www.egison.org";
        description = "Programming language with non-linear pattern-matching against unfree data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-quote" = callPackage
@@ -42708,6 +43944,7 @@ self: {
        homepage = "http://www.egison.org";
        description = "A tutorial program for the Egison programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ehaskell" = callPackage
@@ -42746,10 +43983,10 @@ self: {
          base bytestring haskell-src-meta parsec template-haskell text time
          transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/minpou/ehs/";
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eibd-client-simple" = callPackage
@@ -42781,6 +44018,7 @@ self: {
        homepage = "https://github.com/osidorkin/haskell-eigen";
        description = "Eigen C++ library (linear algebra: matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either" = callPackage
@@ -42837,6 +44075,7 @@ self: {
          aeson base bytestring ekg-core filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
@@ -42855,9 +44094,11 @@ self: {
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/ekg-bosun";
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-carbon" = callPackage
@@ -42872,6 +44113,7 @@ self: {
          base ekg-core network network-carbon text time unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/ekg-carbon";
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
@@ -42883,8 +44125,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-core";
-       version = "0.1.0.3";
-       sha256 = "0d2hvj9g62xkaah8iizgr668ij53164nnrdjkikhc2igi6wk31k4";
+       version = "0.1.0.4";
+       sha256 = "04ym37hc2l3k185dbkmfa4n7ya412cgc5zf0kynwgfvdwggjnxwh";
        buildDepends = [
          base containers ghc-prim text unordered-containers
        ];
@@ -42905,6 +44147,7 @@ self: {
          aeson base bytestring directory ekg-core fast-logger filepath text
          time unix unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/ixmatus/ekg-log";
        description = "Push metrics to a log file";
        license = stdenv.lib.licenses.bsd3;
@@ -42923,6 +44166,7 @@ self: {
        buildDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/adarqui/ekg-push";
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
        license = stdenv.lib.licenses.bsd3;
@@ -42944,6 +44188,7 @@ self: {
          base ekg-core HUnit test-framework test-framework-hunit text time
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/davecturner/ekg-rrd";
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
@@ -42955,8 +44200,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-statsd";
-       version = "0.2.0.1";
-       sha256 = "0s01bkir41189ss72sshlbg4y4qk2wvkr234m2j1y0169l067687";
+       version = "0.2.0.2";
+       sha256 = "1jblrhwpv579d51i66bin9zxmwkl899lxwygg4qqpm3cnx5vf859";
        buildDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
@@ -43001,6 +44246,7 @@ self: {
        buildDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elerea-sdl" = callPackage
@@ -43052,43 +44298,46 @@ self: {
          base bytestring containers elm-compiler elm-core-sources file-embed
          template-haskell
        ];
+       jailbreak = true;
        homepage = "http://github.com/JoeyEremondi/elm-build-lib";
        description = "Compile Elm code to JS within Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-compiler" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, blaze-html
      , blaze-markup, bytestring, cmdargs, containers, directory
-     , filemanip, filepath, HUnit, indents, language-ecmascript
-     , language-glsl, mtl, parsec, pretty, process, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, transformers, union-find, unordered-containers
+     , edit-distance, filemanip, filepath, HUnit, indents
+     , language-ecmascript, language-glsl, mtl, parsec, pretty, process
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, transformers, union-find
+     , unordered-containers
      }:
      mkDerivation {
        pname = "elm-compiler";
-       version = "0.14.1";
-       sha256 = "0my04mipgia5qw02nzzrzc4kq3vl7bv75rzrsmd2bdb2wll1k94f";
+       version = "0.15";
+       sha256 = "1g3q1z6bji1vx36kfkn8qayidds29b0jkk7k70sip4055jr4jc5n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
-         cmdargs containers directory filepath indents language-ecmascript
-         language-glsl mtl parsec pretty process text transformers
-         union-find unordered-containers
+         cmdargs containers directory edit-distance filepath indents
+         language-ecmascript language-glsl mtl parsec pretty process text
+         transformers union-find unordered-containers
        ];
        testDepends = [
          aeson aeson-pretty base binary blaze-html blaze-markup bytestring
-         cmdargs containers directory filemanip filepath HUnit indents
-         language-ecmascript language-glsl mtl parsec pretty process
+         cmdargs containers directory edit-distance filemanip filepath HUnit
+         indents language-ecmascript language-glsl mtl parsec pretty process
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text transformers union-find
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://elm-lang.org";
        description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-core-sources" = callPackage
@@ -43138,8 +44387,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-make";
-       version = "0.1.1";
-       sha256 = "02mqr6v146piwrhycnmlxnky5bmsl7ap7781qmcwkfmc89wfa4zl";
+       version = "0.1.2";
+       sha256 = "10yli9nxfyykkr3p2dma5zgblwgx2434axjj17a878xd0r4841sb";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -43151,6 +44400,7 @@ self: {
        homepage = "http://elm-lang.org";
        description = "A build tool for Elm projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-package" = callPackage
@@ -43162,8 +44412,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-package";
-       version = "0.4";
-       sha256 = "0vsq87imyvs1sa2n4z41b6qswy2cknxsg4prhwc9r7lvyljkmn03";
+       version = "0.5";
+       sha256 = "08wsl42gf5wf9pmsnld38p2m675ljihpzkrvn3dzh6zf0dwblm5n";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -43176,6 +44426,7 @@ self: {
        homepage = "http://github.com/elm-lang/elm-package";
        description = "Package manager for Elm libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-reactor" = callPackage
@@ -43187,8 +44438,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-reactor";
-       version = "0.3";
-       sha256 = "196xm10x7vi82xmq97ykffkz5j9pclq7qsasispdv3hrhpircv8z";
+       version = "0.3.1";
+       sha256 = "0j8md3cqg7wrcx85s5hj8g812zvrr3y4833n0wc3dvfa3wlblpga";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -43211,8 +44462,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-repl";
-       version = "0.4";
-       sha256 = "1yy3vxp87bxps41x985sa0q7cqm9wx5d8sc04q0licx0in2phvyi";
+       version = "0.4.1";
+       sha256 = "05fyk3q7243c8p4kw03jggrvp8qfgcfanr291bmgnn9s1lk0q253";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -43227,6 +44478,7 @@ self: {
        homepage = "https://github.com/elm-lang/elm-repl";
        description = "a REPL for Elm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-server" = callPackage
@@ -43306,6 +44558,7 @@ self: {
        homepage = "http://github.com/knrafto/email-header";
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-postmark" = callPackage
@@ -43332,8 +44585,8 @@ self: {
      }:
      mkDerivation {
        pname = "email-validate";
-       version = "2.0.1";
-       sha256 = "1qxvcm8xiyz50ganzic8cm8nxswq361i80yi939y3n89dk067lzj";
+       version = "2.1.1";
+       sha256 = "1wka2zd6s8zf99d33z6mzprxq3aaxmm9z9rnfjs4j83930h61qdq";
        buildDepends = [ attoparsec base bytestring ghc-prim ];
        testDepends = [
          base bytestring HUnit QuickCheck test-framework
@@ -43427,6 +44680,7 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM";
        description = "Extensible and Modular Generics for the Masses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "empty" = callPackage
@@ -43485,6 +44739,7 @@ self: {
        version = "0.1.0.2";
        sha256 = "1wqg0mcaf55wa70wjgd6n0gw56rghz6p76lc6kw4aki969h12xrl";
        buildDepends = [ base between transformers ];
+       jailbreak = true;
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -43497,8 +44752,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.4";
-       sha256 = "08445vp6ma2jids99b21grw8pds086yvbcbh6iyr8x3z74020y1m";
+       version = "1.2.5";
+       sha256 = "09hndfmgvganfj2y53zj5dpy1dn8rain3fyxknr14ln8c75jprah";
        buildDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
@@ -43509,6 +44764,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "engine-io-growler" = callPackage
+    ({ mkDerivation, base, bytestring, engine-io, growler, http-types
+     , mtl, pipes, pipes-attoparsec, pipes-wai, socket-io, text
+     , transformers, unordered-containers, wai, wai-websockets
+     , websockets
+     }:
+     mkDerivation {
+       pname = "engine-io-growler";
+       version = "0.1.0.1";
+       sha256 = "1yk7cpg89nsmd9kvmxdrxcgyr8wilara4kw35hyxl4l2b9c9pwjc";
+       buildDepends = [
+         base bytestring engine-io growler http-types mtl pipes
+         pipes-attoparsec pipes-wai socket-io text transformers
+         unordered-containers wai wai-websockets websockets
+       ];
+       homepage = "http://github.com/iand675/growler";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "engine-io-snap" = callPackage
     ({ mkDerivation, attoparsec-enumerator, base, bytestring
      , containers, engine-io, MonadCatchIO-transformers, snap-core
@@ -43516,8 +44790,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-snap";
-       version = "1.0.2";
-       sha256 = "0x2sb3b825ds1g2g15yyqxdrw6bh968ivmyd1933l47649qbs0xr";
+       version = "1.0.3";
+       sha256 = "0i2099b4drvzknz6ifi4dvgfibkqxfrz6w3a15k09nw3vxc14hbg";
        buildDepends = [
          attoparsec-enumerator base bytestring containers engine-io
          MonadCatchIO-transformers snap-core unordered-containers websockets
@@ -43534,10 +44808,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-yesod";
-       version = "1.0.1";
-       revision = "1";
-       sha256 = "0pczmiqrg046r367j071h2hr6p2amw93sqy7j1drd2gdiwaxzn02";
-       editedCabalFile = "5963c385f145309049f67eb35f835abf2530a7b117730bd9fe0c4991837a52aa";
+       version = "1.0.2";
+       sha256 = "15hjq128zn23kq5nlmpv7sbrhzhv1936psgf8aa7yxvx4xwy6baw";
        buildDepends = [
          base bytestring conduit conduit-extra engine-io http-types text
          unordered-containers wai wai-websockets websockets yesod-core
@@ -43596,7 +44868,6 @@ self: {
        homepage = "https://github.com/emc2/enumeration";
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumerator" = callPackage
@@ -43677,8 +44948,8 @@ self: {
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
        pname = "enummapset";
-       version = "0.5.2.0";
-       sha256 = "065gxljrjw59rdf7abq0v0c29wg1ymg984ckixnjrcs1yks0c2js";
+       version = "0.5.2.1";
+       sha256 = "019q0b1qm6bcp1ld67aklvq76wfx1qwzjbdywliv9g8ybwivaxqg";
        buildDepends = [ base containers deepseq ];
        homepage = "https://github.com/michalt/enummapset";
        description = "IntMap and IntSet with Enum keys/elements";
@@ -43810,6 +45081,7 @@ self: {
        jailbreak = true;
        description = "*Very* basic Erlang-like process support for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "epub" = callPackage
@@ -43928,6 +45200,7 @@ self: {
        buildDepends = [ base singletons template-haskell void ];
        description = "Proof assistant for Haskell using DataKinds & PolyKinds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "equivalence_0_2_5" = callPackage
@@ -43951,17 +45224,20 @@ self: {
   "equivalence" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
      , template-haskell, test-framework, test-framework-quickcheck2
+     , transformers, transformers-compat
      }:
      mkDerivation {
        pname = "equivalence";
-       version = "0.3.0.1";
-       sha256 = "0ym4dlwajwh9qk6wgqzbwy0nfnq13a3f4lcfhw7g7xn63lkwm7ch";
-       buildDepends = [ base containers mtl STMonadTrans ];
+       version = "0.3.1";
+       sha256 = "0zi053l03r5qcnpsphnq8xqazd0cbgj9n44hn47s1hagdra3j1bs";
+       buildDepends = [
+         base containers mtl STMonadTrans transformers transformers-compat
+       ];
        testDepends = [
          base containers mtl QuickCheck STMonadTrans template-haskell
-         test-framework test-framework-quickcheck2
+         test-framework test-framework-quickcheck2 transformers
+         transformers-compat
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/paba/equivalence/";
        description = "Maintaining an equivalence relation implemented as union-find using STT";
        license = stdenv.lib.licenses.bsd3;
@@ -43978,6 +45254,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base bytestring containers graphviz parsec text ];
+       jailbreak = true;
        homepage = "https://github.com/BurntSushi/erd";
        description = "An entity-relationship diagram generator from a plain text description";
        license = stdenv.lib.licenses.publicDomain;
@@ -44004,6 +45281,7 @@ self: {
        homepage = "http://code.haskell.org/~mokus/erf-native";
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "erlang" = callPackage
@@ -44104,6 +45382,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5";
        buildDepends = [ base template-haskell ];
+       jailbreak = true;
        homepage = "https://github.com/joelteon/error-loc";
        description = "An error replacement with call-site metadata";
        license = stdenv.lib.licenses.mit;
@@ -44140,12 +45419,12 @@ self: {
      }) {};
 
   "errorcall-eq-instance" = callPackage
-    ({ mkDerivation, base, base-compat, hspec, QuickCheck }:
+    ({ mkDerivation, base, base-orphans, hspec, QuickCheck }:
      mkDerivation {
        pname = "errorcall-eq-instance";
-       version = "0.2.0.1";
-       sha256 = "0df2w882bnm9khkwvs8f1p8svaqjz5vpsidgwx5dd01ypjqkzzq5";
-       buildDepends = [ base base-compat ];
+       version = "0.3.0";
+       sha256 = "0hqw82m8bbrxy5vgdwb83bhzdx070ibqrm9rshyja7cb808ahijm";
+       buildDepends = [ base base-orphans ];
        testDepends = [ base hspec QuickCheck ];
        description = "An orphan Eq instance for ErrorCall";
        license = stdenv.lib.licenses.mit;
@@ -44181,6 +45460,7 @@ self: {
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -44196,9 +45476,11 @@ self: {
        buildDepends = [
          array base containers ersatz toysolver transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/msakai/ersatz-toysat";
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ert" = callPackage
@@ -44220,6 +45502,7 @@ self: {
        homepage = "https://bitbucket.org/kayo/ert";
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "esotericbot" = callPackage
@@ -44251,8 +45534,8 @@ self: {
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.1.2.3";
-       sha256 = "0pa4j9xd8hk2imfggkjxk08314jpi0fh9z0pkr7f8mix6rvqm8ir";
+       version = "2.1.3";
+       sha256 = "1wsq058dm849ldxn5gjayagb6ds56b80dinyrpbjw8b0fr3s6v9d";
        buildDepends = [
          base conduit monad-logger persistent resourcet tagged text
          transformers unordered-containers
@@ -44267,6 +45550,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ess" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ess";
+       version = "0.1.0.0";
+       sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq";
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/michaelochurch/ess";
+       description = "The type-level S combinator in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "estimator" = callPackage
     ({ mkDerivation, ad, base, distributive, lens, linear, reflection
      }:
@@ -44441,8 +45737,8 @@ self: {
      }:
      mkDerivation {
        pname = "euler";
-       version = "0.8.2";
-       sha256 = "1dw4jsvyv4a736q2q0790qc7b5b4vaw2pwpn0ibdn33h6463a4pf";
+       version = "0.9.2";
+       sha256 = "14ghmy5qblfgacc6b07jja6pssglf393j5hjypz0l0azd9w56kh5";
        buildDepends = [ base ];
        testDepends = [
          base directory happy hlint hspec process regex-posix xml
@@ -44479,6 +45775,7 @@ self: {
        buildDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "event-handlers" = callPackage
@@ -44530,6 +45827,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventloop" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, network, suspend, text
+     , timers, websockets
+     }:
+     mkDerivation {
+       pname = "eventloop";
+       version = "0.3.0.0";
+       sha256 = "00ysjv6b4rkpy2zz3q2p9i50m3iil7q2frr3xznl4wpjiifhdpx3";
+       buildDepends = [
+         aeson base bytestring network suspend text timers websockets
+       ];
+       jailbreak = true;
+       homepage = "-";
+       description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "eventstore" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
      , network, protobuf, random, sodium, text, time, uuid
@@ -44607,6 +45921,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exact-pi" = callPackage
+    ({ mkDerivation, base, groups }:
+     mkDerivation {
+       pname = "exact-pi";
+       version = "0.1.0.0";
+       sha256 = "01vljbgsqwiv6chlp1nfvmfc4wd3nq89mvn7x8s68dhfd8f8m2g6";
+       buildDepends = [ base groups ];
+       homepage = "https://github.com/dmcclean/exact-pi";
+       description = "Exact rational multiples of pi (and integer powers of pi)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "exception-mailer" = callPackage
     ({ mkDerivation, base, hslogger, mime-mail, text }:
      mkDerivation {
@@ -44647,7 +45973,6 @@ self: {
        buildDepends = [
          base exception-transformers monads-tf transformers
        ];
-       jailbreak = true;
        description = "Exception monad transformer instances for monads-tf classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44735,8 +46060,8 @@ self: {
      }:
      mkDerivation {
        pname = "exhaustive";
-       version = "1.1.0";
-       sha256 = "14pdf5iks0j2vpg3w48qs32lnj8ahkd0jljjhx1qap66mss0i3jl";
+       version = "1.1.1";
+       sha256 = "0bgzg2qhx91hd9711bxv6cr2qc7m23g29al4gb7yx20cs78bz1mg";
        buildDepends = [ base generics-sop template-haskell transformers ];
        homepage = "http://github.com/ocharles/exhaustive";
        description = "Compile time checks that a computation considers producing data through all possible constructors";
@@ -44767,6 +46092,7 @@ self: {
        homepage = "http://github.com/glehel/exists";
        description = "Existential datatypes holding evidence of constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exp-pairs" = callPackage
@@ -44799,7 +46125,6 @@ self: {
        jailbreak = true;
        description = "Extensible Pandoc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expat-enumerator" = callPackage
@@ -44871,6 +46196,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/jwaldmann/haskell-explicit-determinant";
        description = "explicit computation of determinant of small matrices";
        license = stdenv.lib.licenses.gpl3;
@@ -44974,6 +46300,7 @@ self: {
          array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        description = "A distribution of the 'containers' package, with all modules exposed";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45065,12 +46392,16 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, base, binary, constraints, template-haskell }:
+    ({ mkDerivation, base, constraints, profunctors, tagged
+     , template-haskell, transformers
+     }:
      mkDerivation {
        pname = "extensible";
-       version = "0.3.2";
-       sha256 = "1fb027d14100s384mhl0g09jpjxqam85g6yh0pnwcn3g4fzq0fln";
-       buildDepends = [ base binary constraints template-haskell ];
+       version = "0.3.4";
+       sha256 = "09bcynchvfjk0kp5r4609giyissppi08llv33m5j1d9qda6mxhxi";
+       buildDepends = [
+         base constraints profunctors tagged template-haskell transformers
+       ];
        homepage = "https://github.com/fumieval/extensible";
        description = "Extensible, efficient, lens-friendly data types";
        license = stdenv.lib.licenses.bsd3;
@@ -45111,6 +46442,7 @@ self: {
        homepage = "https://github.com/RobotGymnast/extensible-effects";
        description = "An Alternative to Monad Transformers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-exceptions" = callPackage
@@ -45133,6 +46465,7 @@ self: {
        buildDepends = [ base binary bytestring EdisonAPI EdisonCore ];
        description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extra" = callPackage
@@ -45207,6 +46540,7 @@ self: {
        homepage = "http://github.com/haskell-faceted/haskell-faceted";
        description = "Faceted computation for dynamic information flow security";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "factory" = callPackage
@@ -45215,8 +46549,8 @@ self: {
      }:
      mkDerivation {
        pname = "factory";
-       version = "0.2.1.0";
-       sha256 = "1sxk8pv2r2a9d457ikxcz71z06sxajsjvw4647jw1s3y10fn6hvb";
+       version = "0.2.1.1";
+       sha256 = "07shidg02drvxpny0qgmshgliz0agw1app5xjs3d0z9zv3v5y1am";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -45350,8 +46684,8 @@ self: {
      }:
      mkDerivation {
        pname = "family-tree";
-       version = "0.5";
-       sha256 = "1bjg231g1rfzzqki3by85vs3ay4iy3mdg6v22kd8b4p9h4q1nmnj";
+       version = "0.5.1";
+       sha256 = "0b2063f8yz7hwv7h0yisrgh6glr5h4s1cx0q75gfg2wgp2mr72s1";
        buildDepends = [
          base binary containers hashable intervals lens tables text time
          unordered-containers
@@ -45360,7 +46694,6 @@ self: {
        homepage = "https://github.com/Taneb/family-tree";
        description = "A family tree library for the Haskell programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "farmhash" = callPackage
@@ -45373,6 +46706,7 @@ self: {
        editedCabalFile = "cd08b430fb52fb06590611fdcc555d9056c2d982e8f3c7d6be7b17b0c4b19865";
        buildDepends = [ base bytestring ];
        testDepends = [ base bytestring hspec QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
@@ -45385,7 +46719,9 @@ self: {
      mkDerivation {
        pname = "fast-logger";
        version = "2.3.1";
+       revision = "1";
        sha256 = "02smmj62jir0c4ix929xy7zsd03djp53hxps0wgqga1f123gksri";
+       editedCabalFile = "9823350b03eb3ff26c7088f9ea871ff54996b4545f534c268d988f72a126ccea";
        buildDepends = [
          array auto-update base bytestring bytestring-builder directory
          filepath text
@@ -45407,18 +46743,26 @@ self: {
      }) {};
 
   "fast-tags" = callPackage
-    ({ mkDerivation, base, containers, ghc, text }:
+    ({ mkDerivation, base, bytestring, containers, cpphs, deepseq
+     , directory, filepath, tasty, tasty-hunit, text
+     }:
      mkDerivation {
        pname = "fast-tags";
-       version = "0.0.6";
-       sha256 = "0kjj01xpdz5yzdxxagwzv2w7vma43qs71ffxbbrh1wilk7k1ma32";
-       isLibrary = false;
+       version = "1.1.0";
+       sha256 = "1m6v9jdla0r36l45gs3swycfgisl48hjq7x9rvfc08h4kd5mcmay";
+       isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base containers text ];
-       testDepends = [ base containers ghc text ];
+       buildDepends = [
+         base bytestring containers cpphs deepseq directory filepath text
+       ];
+       testDepends = [
+         base bytestring containers directory filepath tasty tasty-hunit
+         text
+       ];
        homepage = "https://github.com/elaforge/fast-tags";
-       description = "Fast incremental vi tags";
+       description = "Fast incremental vi and emacs tags";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-tagsoup" = callPackage
@@ -45446,12 +46790,12 @@ self: {
      }) {};
 
   "fasta" = callPackage
-    ({ mkDerivation, base, containers, parsec, split, text }:
+    ({ mkDerivation, base, containers, parsec, pipes, split, text }:
      mkDerivation {
        pname = "fasta";
-       version = "0.5.1.3";
-       sha256 = "1p5a98riv7wjkd0mdinqfm3qmhx6q4dbibdhpp9a4r4zm4ccwpfb";
-       buildDepends = [ base containers parsec split text ];
+       version = "0.5.4.0";
+       sha256 = "15ff6l8kv6pivl8l9apfpsnn5arwgbhzxi8h4chr05qvanlycvfg";
+       buildDepends = [ base containers parsec pipes split text ];
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
@@ -45464,6 +46808,7 @@ self: {
        version = "0.2.0.0";
        sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm";
        buildDepends = [ base hmatrix vector ];
+       jailbreak = true;
        homepage = "https://github.com/cscherrer/fastbayes";
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
@@ -45481,7 +46826,6 @@ self: {
        extraLibraries = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) fcgi;};
 
   "fastedit" = callPackage
@@ -45501,8 +46845,10 @@ self: {
          base base-prelude bytestring edit-distance file-embed hspec
          QuickCheck
        ];
+       jailbreak = true;
        description = "find nearest neighbours by edit-distance";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fastirc" = callPackage
@@ -45532,6 +46878,7 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay" = callPackage
@@ -45559,6 +46906,7 @@ self: {
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-base" = callPackage
@@ -45571,6 +46919,7 @@ self: {
        homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-builder" = callPackage
@@ -45579,13 +46928,14 @@ self: {
      }:
      mkDerivation {
        pname = "fay-builder";
-       version = "0.2.0.4";
-       sha256 = "0x1y9d2hgi3ky7f7ydc43dyd54dsmqcgxj6g8n2x3yfrcjkljq05";
+       version = "0.2.0.5";
+       sha256 = "18ii5dnzk866q79h43fspdz8dzg17mzfrykh3pl4p0q4qdnylv8i";
        buildDepends = [
          base Cabal data-default directory fay filepath safe split text
        ];
        description = "Compile Fay code on cabal install, and ad-hoc recompile during development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-dom" = callPackage
@@ -45598,6 +46948,7 @@ self: {
        homepage = "https://github.com/faylang/fay-dom";
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-hsx" = callPackage
@@ -45624,6 +46975,7 @@ self: {
        homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-ref" = callPackage
@@ -45636,6 +46988,7 @@ self: {
        homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-text" = callPackage
@@ -45648,6 +47001,7 @@ self: {
        homepage = "https://github.com/faylang/fay-text";
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-uri" = callPackage
@@ -45660,6 +47014,7 @@ self: {
        homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb" = callPackage
@@ -45672,8 +47027,8 @@ self: {
      }:
      mkDerivation {
        pname = "fb";
-       version = "1.0.8";
-       sha256 = "1cv722kkp6lbxajv3ka4088x2491yy41cfypqqkq753mm59x6s9m";
+       version = "1.0.9";
+       sha256 = "0f5zs1qnjkhrdlfvcl26l3j2xl58y97y7rh2dds12mvsyj7h446b";
        buildDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          bytestring cereal conduit conduit-extra crypto-api cryptohash
@@ -45809,6 +47164,7 @@ self: {
        homepage = "https://github.com/jkarlson/fdo-trash";
        description = "Utilities related to freedesktop Trash standard";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feature-flags" = callPackage
@@ -45857,6 +47213,7 @@ self: {
        homepage = "https://github.com/relrod/fedora-packages-hs";
        description = "Haskell interface to the Fedora Packages webapp API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed" = callPackage
@@ -45869,9 +47226,11 @@ self: {
        sha256 = "05sg2ly1pvni3sfv03rbf60vdjkrfa0f9mmc1dm1hrmp638j67gg";
        editedCabalFile = "62cb5a05a61bc09e6203b5bb7aab4464cba1703216260b0d871d98046c226358";
        buildDepends = [ base old-locale old-time time utf8-string xml ];
+       jailbreak = true;
        homepage = "https://github.com/sof/feed";
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-cli" = callPackage
@@ -45891,6 +47250,7 @@ self: {
        homepage = "http://www.syntaxpolice.org/darcs_repos/feed-cli";
        description = "A simple command line interface for creating and updating feeds like RSS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-crawl" = callPackage
@@ -45905,6 +47265,7 @@ self: {
          base bytestring conduit connection http-conduit http-types hxt
          network-uri text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/danchoi/feed-crawl";
        description = "Utility for fetching feeds with redirect info and HTML link detection";
        license = stdenv.lib.licenses.mit;
@@ -46005,6 +47366,7 @@ self: {
        version = "0.0.0.1";
        sha256 = "16brcdnbk4ykribgw5jix7k6qca2rxqms1hnljmirs0b8ldyflgx";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/markus-git/feldspar-signal";
        description = "Signal Processing extension for Feldspar";
        license = stdenv.lib.licenses.bsd3;
@@ -46085,6 +47447,7 @@ self: {
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fficxx-runtime" = callPackage
@@ -46099,8 +47462,8 @@ self: {
      }) {};
 
   "ffmpeg-light" = callPackage
-    ({ mkDerivation, base, JuicyPixels, libavcodec, libavformat
-     , libavutil, libswscale, mtl, transformers, vector
+    ({ mkDerivation, base, ffmpeg, JuicyPixels, libavcodec, libavformat
+     , libswscale, mtl, transformers, vector
      }:
      mkDerivation {
        pname = "ffmpeg-light";
@@ -46109,13 +47472,11 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base JuicyPixels mtl transformers vector ];
-       pkgconfigDepends = [ libavcodec libavformat libavutil libswscale ];
-       jailbreak = true;
+       pkgconfigDepends = [ ffmpeg libavcodec libavformat libswscale ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libavcodec = null;  libavformat = null;  libavutil = null;
-          libswscale = null;};
+     }) { inherit (pkgs) ffmpeg;  libavcodec = null;
+          libavformat = null;  libswscale = null;};
 
   "ffmpeg-tutorials" = callPackage
     ({ mkDerivation, base, bytestring, haskell98, hs-ffmpeg, SDL, stm
@@ -46292,6 +47653,7 @@ self: {
        buildDepends = [
          base parsec process system-filepath template-haskell text
        ];
+       jailbreak = true;
        homepage = "https://github.com/jfischoff/file-command-qq";
        description = "Quasiquoter for system commands involving filepaths";
        license = stdenv.lib.licenses.mit;
@@ -46352,21 +47714,22 @@ self: {
      }) {};
 
   "filediff" = callPackage
-    ({ mkDerivation, base, data-default, data-memocombinators
-     , directory, either, mtl, tasty, tasty-hunit, text, time
-     , transformers, Zora
+    ({ mkDerivation, base, bytestring, data-default
+     , data-memocombinators, directory, either, mtl, rainbow, tasty
+     , tasty-hunit, text, time, transformers, Zora
      }:
      mkDerivation {
        pname = "filediff";
-       version = "0.1.0.4";
-       sha256 = "0jqmwlg7xpz03kqchnydgrxyiz8cf4ijv3019nshwqxjwjyzf50r";
+       version = "0.1.0.8";
+       sha256 = "1wsinnmc5dw4r9wk3ijx9zlzwf0rqsknl6mql28lja2r1m2s2jc3";
        buildDepends = [
-         base data-default data-memocombinators directory either mtl tasty
-         tasty-hunit text time transformers Zora
+         base bytestring data-default data-memocombinators directory either
+         mtl rainbow tasty tasty-hunit text time transformers Zora
        ];
        testDepends = [
          base directory either mtl tasty tasty-hunit text time transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/bgwines/filediff";
        description = "Diffing and patching module";
        license = stdenv.lib.licenses.bsd3;
@@ -46498,6 +47861,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-filesystem/";
        description = "Enumerator-based API for manipulating the filesystem";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filesystem-trees" = callPackage
@@ -46543,24 +47907,28 @@ self: {
 
   "find-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
-     , directory, doctest, either, exceptions, filepath, hspec, mmorph
-     , monad-control, mtl, regex-posix, semigroups, system-filepath
-     , text, time, transformers, transformers-base, unix
+     , conduit-extra, directory, doctest, either, exceptions, filepath
+     , hspec, mmorph, monad-control, mtl, regex-posix, semigroups
+     , streaming-commons, system-filepath, text, time, transformers
+     , transformers-base, unix, unix-compat
      }:
      mkDerivation {
        pname = "find-conduit";
-       version = "0.4.1";
-       sha256 = "171y1bb3r6af41i2xsip2r4xm7grbzpvlwczrvaj8hzyknr3y7dx";
+       version = "0.4.3";
+       sha256 = "05s1whyqmv1nxcbrrfhfn8lcqb2cwyz1wa2im8b976i14qgw65lm";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
-         attoparsec base conduit conduit-combinators either exceptions
-         mmorph monad-control mtl regex-posix semigroups system-filepath
-         text time transformers transformers-base unix
+         attoparsec base conduit conduit-combinators conduit-extra either
+         exceptions filepath mmorph monad-control mtl regex-posix semigroups
+         streaming-commons system-filepath text time transformers
+         transformers-base unix unix-compat
        ];
        testDepends = [
          attoparsec base conduit conduit-combinators directory doctest
          either exceptions filepath hspec mmorph monad-control mtl
-         regex-posix semigroups system-filepath text time transformers
-         transformers-base unix
+         regex-posix semigroups streaming-commons system-filepath text time
+         transformers transformers-base unix-compat
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
@@ -46666,8 +48034,8 @@ self: {
      }:
      mkDerivation {
        pname = "fishfood";
-       version = "0.0.1.0";
-       sha256 = "13fwwvvr3jd856gc28kckmaqgy3mdy02af0i6fws9jqkchm0d2l6";
+       version = "0.0.1.3";
+       sha256 = "0bmp24mgg9y7ysnb1rig26cwgz1l40ca1fckzxh0yly0j9if062k";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -46684,10 +48052,8 @@ self: {
      }:
      mkDerivation {
        pname = "fit";
-       version = "0.5";
-       revision = "1";
-       sha256 = "0xazsm6zdvnjxhy31c5zpjbd3fc98pcy545fq3jxvzh6c913fdjl";
-       editedCabalFile = "87f70d521590ba57a662694c83401df69c45c6c721e52119fde62685873b5f6f";
+       version = "0.5.1";
+       sha256 = "0y7jvczi0ldzjw9y102z1k4nyj7z8f6p8w368x5v0m308d0jw6db";
        buildDepends = [
          attoparsec base bytestring containers contravariant mtl text
        ];
@@ -46790,6 +48156,7 @@ self: {
        homepage = "http://github.com/jvranish/FixedList/tree/master";
        description = "A fixed length list type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-point" = callPackage
@@ -46938,6 +48305,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ aeson attoparsec base bytestring text ];
+       jailbreak = true;
        homepage = "https://github.com/michaelochurch/fixedwidth-hs";
        description = "Quick parsing of fixed-width data formats";
        license = stdenv.lib.licenses.mit;
@@ -46974,6 +48342,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixpoint" = callPackage
@@ -46995,7 +48364,6 @@ self: {
        version = "1.5.0.2";
        sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5";
        buildDepends = [ base time ];
-       jailbreak = true;
        homepage = "https://github.com/pharpend/fixtime";
        description = "Some fixes to the time package";
        license = stdenv.lib.licenses.bsd2;
@@ -47038,11 +48406,25 @@ self: {
        version = "0.0.5.1";
        sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x";
        buildDepends = [ base template-haskell text ];
+       jailbreak = true;
        homepage = "https://charmander.me/flamethrower/";
        description = "A template engine for HTML";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flamingra" = callPackage
+    ({ mkDerivation, base, either, optparse-applicative, pipes }:
+     mkDerivation {
+       pname = "flamingra";
+       version = "0.1.1.1";
+       sha256 = "1yfqgbjam33vrkic5xnb8pp76215jnacr6sj1xw1xqcbcs02bn3v";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base either optparse-applicative pipes ];
+       description = "FlameGraphs of profiling";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flat-mcmc" = callPackage
     ({ mkDerivation, base, monad-par, monad-par-extras, mtl, mwc-random
      , primitive, vector
@@ -47083,6 +48465,7 @@ self: {
        version = "0.1.0.3";
        sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
        buildDepends = [ base bytestring unix-time ];
+       jailbreak = true;
        homepage = "https://github.com/tattsun/flexible-time";
        description = "simple extension of Data.UnixTime.";
        license = stdenv.lib.licenses.mit;
@@ -47186,6 +48569,7 @@ self: {
        buildDepends = [ base bytestring mtl parsec regex-compat text ];
        description = "Generate flow charts from your code base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "float-binstring" = callPackage
@@ -47258,6 +48642,7 @@ self: {
        homepage = "http://taylor.fausak.me/flow/";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flow2dot" = callPackage
@@ -47276,6 +48661,7 @@ self: {
        homepage = "http://adept.linux.kiev.ua:8080/repos/flow2dot";
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock" = callPackage
@@ -47352,6 +48738,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "flowlocks-framework" = callPackage
+    ({ mkDerivation, base, containers, QuickCheck, syb }:
+     mkDerivation {
+       pname = "flowlocks-framework";
+       version = "0.1.3";
+       sha256 = "0scxfgsdh15wnrjpmdbn7phhhxb718pnbnfb53713hsdsvacmnmv";
+       buildDepends = [ base containers syb ];
+       testDepends = [ base QuickCheck ];
+       description = "Generalized Flow Locks Framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "flowsim" = callPackage
     ({ mkDerivation, array, base, biocore, biofasta, biosff, bytestring
      , cmdargs, containers, directory, MonadRandom, mtl, random
@@ -47369,14 +48767,15 @@ self: {
        homepage = "http://biohaskell.org/Applications/FlowSim";
        description = "Simulate 454 pyrosequencing";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fltkhs" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, directory, process }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.1.0.1";
-       sha256 = "026cx8l24qjf91d8ikqyz7bj92apm3qzq0ml6rvybj44mrpd1c34";
+       version = "0.1.0.2";
+       sha256 = "11p957d12ivrf9r76zf2khjd736fdnhaj7qp0x6fbwmda2ifrij3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring directory process ];
@@ -47642,20 +49041,17 @@ self: {
        homepage = "http://github.com/minpou/forbidden-fruit";
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "force-layout" = callPackage
-    ({ mkDerivation, base, containers, data-default-class, lens
-     , vector-space, vector-space-points
+    ({ mkDerivation, base, containers, data-default-class, lens, linear
      }:
      mkDerivation {
        pname = "force-layout";
-       version = "0.3.0.11";
-       sha256 = "01cjj30xf34j7c8nk0pbrsy7zp1pyl9qwq3mvnvbikrjqbhdylhh";
-       buildDepends = [
-         base containers data-default-class lens vector-space
-         vector-space-points
-       ];
+       version = "0.4.0.0";
+       sha256 = "0rmspkl8j1z2n8r6d3dcd573z73yzn6c9r49f57syfvalq0xrzdk";
+       buildDepends = [ base containers data-default-class lens linear ];
        description = "Simple force-directed layout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47678,8 +49074,8 @@ self: {
     ({ mkDerivation, aeson, base, text }:
      mkDerivation {
        pname = "forecast-io";
-       version = "0.1.0.0";
-       sha256 = "0z2hv8lv75zij9arvxdircc0db0r0m86fgk5496hh1gvxxd5pqw6";
+       version = "0.2.0.0";
+       sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby";
        buildDepends = [ aeson base text ];
        homepage = "https://github.com/stormont/forecast-io";
        description = "A Haskell library for working with forecast.io data.";
@@ -47714,13 +49110,30 @@ self: {
      mkDerivation {
        pname = "foreign-var";
        version = "0.1";
+       revision = "1";
        sha256 = "1rxfmzq9npj1170i85qhq5fhvvzb9j1wdi5lzmj57k4hlyxcwqjd";
+       editedCabalFile = "f9c906434533279cfa8e2897c6eed6ed9c279f373efc5180bda76b704601fa1c";
        buildDepends = [ base stm transformers ];
        homepage = "http://github.com/ekmett/foreign-var/";
        description = "Encapsulating mutatable state in external libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "forger" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "forger";
+       version = "0.0.0.0";
+       sha256 = "1bykssfas1fz46qmiwhxs09xnnwp104hlmq08z9g1xh7qv8bh7iy";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/sfischer13/haskell-forger";
+       description = "Library for generating fake placeholder data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "forkable-monad" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -47769,6 +49182,7 @@ self: {
        homepage = "https://github.com/bytbox/hs-format";
        description = "Rendering from and scanning to format strings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "format-status" = callPackage
@@ -47787,6 +49201,7 @@ self: {
        jailbreak = true;
        description = "A utility for writing the date to dzen2";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formatting" = callPackage
@@ -47876,6 +49291,7 @@ self: {
        jailbreak = true;
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fountain" = callPackage
@@ -48128,8 +49544,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-functors";
-       version = "0.6.3.3";
-       sha256 = "05q3b5ls6c63piywyxpa87gzn0c46xwgisq6skb05a38q24za3a0";
+       version = "0.6.4.1";
+       sha256 = "1mc5y29j4khl222dwb9xcnfmn2jh3v47rkvkzwvlgrbg5bh81kzk";
        buildDepends = [
          algebraic-classes base comonad constraints template-haskell
          transformers void
@@ -48344,6 +49760,7 @@ self: {
        homepage = "http://code.haskell.org/~StefanKersten/code/freesound";
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freetype-simple" = callPackage
@@ -48354,6 +49771,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "1qhiy896a10af9fnzcp4y0ra1c9l6fbcclrr3k74pn2qvvfybnss";
        buildDepends = [ base boundingboxes bytestring freetype2 linear ];
+       jailbreak = true;
        homepage = "https://github.com/capsjac/freetype-simple";
        description = "Single line text rendering for OpenGL ES";
        license = stdenv.lib.licenses.publicDomain;
@@ -48385,17 +49803,16 @@ self: {
      }) {};
 
   "friday" = callPackage
-    ({ mkDerivation, base, bytestring, convertible, deepseq, primitive
-     , QuickCheck, ratio-int, test-framework, test-framework-quickcheck2
+    ({ mkDerivation, base, convertible, deepseq, primitive, QuickCheck
+     , ratio-int, test-framework, test-framework-quickcheck2
      , transformers, vector
      }:
      mkDerivation {
        pname = "friday";
-       version = "0.2.1.0";
-       sha256 = "02n0cdmd4fc3vi2i73s7q4pynnn29dpa1rh94z6j5lb5arcz9i8p";
+       version = "0.2.1.1";
+       sha256 = "1snbmr1q60lg94zzfxfc0pfzyi695m7dc79vpi66c8kb5anwahw8";
        buildDepends = [
-         base bytestring convertible deepseq primitive ratio-int
-         transformers vector
+         base convertible deepseq primitive ratio-int transformers vector
        ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 vector
@@ -48439,6 +49856,7 @@ self: {
        homepage = "http://github.com/pbrisbin/friendly-time";
        description = "Print time information in friendly ways";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frisby" = callPackage
@@ -48463,6 +49881,7 @@ self: {
        homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frquotes" = callPackage
@@ -48554,6 +49973,7 @@ self: {
        homepage = "http://www.cse.chalmers.se/alumni/markus/fstStudio/";
        description = "Finite state transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fsutils" = callPackage
@@ -48786,7 +50206,6 @@ self: {
        jailbreak = true;
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functor-apply" = callPackage
@@ -48826,15 +50245,17 @@ self: {
        homepage = "https://github.com/fmap/functor-infix";
        description = "Compositions of functors";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functor-monadic" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "functor-monadic";
-       version = "0.1.0.1";
-       sha256 = "0791pqg4b9nr4ggfhi6ijjxmnwyf2yyqxfk9iahf6jn0y09lr7pm";
+       version = "0.1.0.2";
+       sha256 = "03jipdzark9dhwlym7ky887zzl3cdsc18wwwmg5szl1wgg30li1n";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/ombocomp/FunctorMonadic/";
        description = "Monad-style combinators for functors";
        license = stdenv.lib.licenses.asl20;
@@ -48945,14 +50366,12 @@ self: {
      }) {};
 
   "future-resource" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "future-resource";
-       version = "0.3.0.0";
-       revision = "1";
-       sha256 = "1w1ifjzfpqlqf7dzlnca67xhc1m1ddaflq3xin5xf9s2qnmsahvx";
-       editedCabalFile = "f9842af26e96134d6190b8ee4f8588c0352f192443330012e66105ac4e18b082";
-       buildDepends = [ base ];
+       version = "0.4.0.0";
+       sha256 = "10whksji6r1bilmj2fxcccg89zh7c08s2zfn07r6wj3xgschrckv";
+       buildDepends = [ base transformers ];
        description = "realtime resource handling with manual concurrency";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -48992,6 +50411,7 @@ self: {
        homepage = "https://github.com/tlaitinen/fuzzy-timings";
        description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzytime" = callPackage
@@ -49019,6 +50439,7 @@ self: {
        buildDepends = [
          base hashable transformers unordered-containers vector Yampa
        ];
+       jailbreak = true;
        homepage = "https://github.com/ZioCrocifisso/FWGL";
        description = "FRP 2D/3D game engine";
        license = stdenv.lib.licenses.bsd3;
@@ -49038,6 +50459,7 @@ self: {
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vector Yampa
        ];
+       jailbreak = true;
        homepage = "https://github.com/ZioCrocifisso/FWGL";
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
@@ -49166,6 +50588,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base haskeline transformers ];
+       jailbreak = true;
        homepage = "http://hub.darcs.net/mekeor/Garepinoh/text/README.md";
        description = "reverse prefix notation calculator and calculation library";
        license = stdenv.lib.licenses.publicDomain;
@@ -49196,7 +50619,6 @@ self: {
        homepage = "http://www.daneel0yaitskov.000space.com";
        description = "planar graph embedding into a plane";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gc-monitoring-wai" = callPackage
@@ -49334,6 +50756,7 @@ self: {
        homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geek-server" = callPackage
@@ -49353,6 +50776,7 @@ self: {
        homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine server";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gemstone" = callPackage
@@ -49406,6 +50830,7 @@ self: {
        homepage = "https://github.com/womfoo/gender";
        description = "Identify a persons gender by their first name";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "general-prelude" = callPackage
@@ -49418,6 +50843,7 @@ self: {
        buildDepends = [ base lens pointless-fun strict system-filepath ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generator" = callPackage
@@ -49443,6 +50869,7 @@ self: {
        homepage = "http://liamoc.net/pdf/Generator.pdf";
        description = "Actually useful monadic random value generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-accessors" = callPackage
@@ -49552,6 +50979,7 @@ self: {
          generic-deriving hlint mtl nats parallel semigroups simple-reflect
          split text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/jfischoff/generic-maybe";
        description = "A generic version of Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
@@ -49571,7 +50999,6 @@ self: {
        testDepends = [
          base bytestring containers tasty tasty-hunit text vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/tanakh/generic-pretty";
        description = "Pretty printing for Generic value";
        license = stdenv.lib.licenses.mit;
@@ -49706,7 +51133,6 @@ self: {
        homepage = "http://projects.haskell.org/GenI";
        description = "GenI graphical user interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geni-util" = callPackage
@@ -49756,8 +51182,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
        pname = "genifunctors";
-       version = "0.2.2.0";
-       sha256 = "0j0pxpb46iq5vqbr5x1cjng9dpjcbd3q2r53ds27b956pyi82m19";
+       version = "0.3";
+       sha256 = "16jsy5dyp1hqnk40nzjprkw3bfdbc92vkgzmwdds67ljh0jn6815";
        buildDepends = [ base containers mtl template-haskell ];
        testDepends = [ base containers mtl template-haskell ];
        homepage = "https://github.com/danr/genifunctors";
@@ -49772,6 +51198,7 @@ self: {
        version = "0.6.0.5";
        sha256 = "01cwyf5kql4hf76p1ssqpmhaxyl7rmnmqwv644wgd0j8km8b6szc";
        buildDepends = [ base mtl template-haskell ];
+       jailbreak = true;
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49817,6 +51244,7 @@ self: {
        sha256 = "1cb9si5axwqi1d893vp6n2mr68isdxc9qp6dfygy0v6hci2spnmm";
        buildDepends = [ base parsec transformers ];
        testDepends = [ base HUnit parsec transformers ];
+       jailbreak = true;
        homepage = "http://github.com/andriyp/gentlemark";
        description = "Gentle markup language";
        license = stdenv.lib.licenses.bsd3;
@@ -49863,9 +51291,11 @@ self: {
          array base dimensional HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/PaulJohnson/geodetics";
        description = "Terrestrial coordinate systems and geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geohash" = callPackage
@@ -49885,12 +51315,13 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.1.0.0";
-       sha256 = "11vpk32kbsgvzq45brpmy6hn5ibcmpgjh2lqxp1s2y87fx6g9y6h";
+       version = "0.1.0.1";
+       sha256 = "0h6iivpxkc1k463cj5npzagzd01xddinpnbv8357d40617gihgrg";
        buildDepends = [
          base binary bytestring bytestring-mmap containers iproute
          reinterpret-cast text
        ];
+       jailbreak = true;
        description = "Pure haskell interface to MaxMind GeoIP database";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49950,17 +51381,20 @@ self: {
      }) {};
 
   "getopt-generics" = callPackage
-    ({ mkDerivation, base, base-compat, generics-sop, hspec
-     , hspec-expectations, silently, tagged
+    ({ mkDerivation, base, base-compat, base-orphans, generics-sop
+     , hspec, hspec-expectations, markdown-unlit, QuickCheck, silently
+     , tagged
      }:
      mkDerivation {
        pname = "getopt-generics";
-       version = "0.2";
-       sha256 = "12zidbkxnksh05l8ds100y6sx29l0i8x0xy3zfczh4cir4lbz67g";
-       buildDepends = [ base base-compat generics-sop tagged ];
+       version = "0.6.3";
+       sha256 = "18d9cbk87gx31fk1bdylllicbnxj2xmb5xzss27amy8xcmlb3qds";
+       buildDepends = [
+         base base-compat base-orphans generics-sop tagged
+       ];
        testDepends = [
-         base base-compat generics-sop hspec hspec-expectations silently
-         tagged
+         base base-compat base-orphans generics-sop hspec hspec-expectations
+         markdown-unlit QuickCheck silently tagged
        ];
        description = "Simple command line argument parsing";
        license = stdenv.lib.licenses.bsd3;
@@ -49979,10 +51413,11 @@ self: {
      }) {};
 
   "gf" = callPackage
-    ({ mkDerivation, alex, array, base, bytestring, Cabal, containers
-     , directory, filepath, fst, happy, haskeline, HTF, HUnit
-     , lifted-base, mtl, old-locale, parallel, pretty, process, random
-     , time, time-compat, unix, utf8-string
+    ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi
+     , containers, directory, filepath, fst, happy, haskeline, HTF
+     , httpd-shed, HUnit, json, lifted-base, mtl, network, old-locale
+     , parallel, pretty, process, random, time, time-compat, unix
+     , utf8-string
      }:
      mkDerivation {
        pname = "gf";
@@ -49993,12 +51428,13 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array base bytestring containers directory filepath fst haskeline
-         lifted-base mtl old-locale parallel pretty process random time
-         time-compat unix utf8-string
+         array base bytestring cgi containers directory filepath fst
+         haskeline httpd-shed json lifted-base mtl network old-locale
+         parallel pretty process random time time-compat unix utf8-string
        ];
        testDepends = [ base Cabal directory filepath HTF HUnit process ];
        buildTools = [ alex happy ];
+       jailbreak = true;
        homepage = "http://www.grammaticalframework.org/";
        description = "Grammatical Framework";
        license = "unknown";
@@ -50017,6 +51453,7 @@ self: {
        homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-core" = callPackage
@@ -50135,6 +51572,7 @@ self: {
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-exactprint" = callPackage
@@ -50155,6 +51593,7 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -50178,11 +51617,9 @@ self: {
        version = "0.1.0.0";
        sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h";
        buildDepends = [ base ghc ];
-       jailbreak = true;
        homepage = "https://github.com/alanz/ghc-generic-instances";
        description = "Derived instances of GHC.Generic of the GHC AST";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-heap-view" = callPackage
@@ -50197,6 +51634,7 @@ self: {
          base binary bytestring containers ghc template-haskell transformers
        ];
        testDepends = [ base deepseq ];
+       jailbreak = true;
        postInstall = ''
          ensureDir "$out/share/ghci"
          ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
@@ -50226,6 +51664,7 @@ self: {
          ghc-syb-utils hspec mtl optparse-applicative parsec process safe
          syb transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
@@ -50336,6 +51775,7 @@ self: {
        homepage = "https://github.com/23Skidoo/ghc-parmake";
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-parser" = callPackage
@@ -50352,6 +51792,7 @@ self: {
        homepage = "https://github.com/gibiansky/IHaskell";
        description = "Haskell source parser from GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-paths" = callPackage
@@ -50382,6 +51823,7 @@ self: {
        jailbreak = true;
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-pkg-lib" = callPackage
@@ -50395,6 +51837,7 @@ self: {
        homepage = "https://github.com/JPMoresmau/ghc-pkg-lib";
        description = "Provide library support for ghc-pkg information";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prim_0_4_0_0" = callPackage
@@ -50408,6 +51851,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof-flamegraph" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "ghc-prof-flamegraph";
+       version = "0.1.0.0";
+       sha256 = "1hrikiv6a8l7pq9j7zjb98zl1qlb8gdggfkcw49zmk7zay0bd1c2";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base ];
+       description = "Generates data to be used with flamegraph.pl from .prof files.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ghc-server" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -50474,8 +51930,8 @@ self: {
     ({ mkDerivation, base, ghc, tasty, tasty-hunit }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.1";
-       sha256 = "0c4kl0sz7dvyzf3hcwclcgxi631gvdmyr227d4p0v3zd4p2bs75k";
+       version = "0.2";
+       sha256 = "1imf7lgv5fm19p87kmkl03gbc2an5gbs2p70xw12g8nmf6s23flc";
        buildDepends = [ base ghc ];
        testDepends = [ base tasty tasty-hunit ];
        jailbreak = true;
@@ -50497,6 +51953,7 @@ self: {
          base cairo containers deepseq fgl ghc-heap-view graphviz gtk mtl
          svgcairo text transformers xdot
        ];
+       jailbreak = true;
        postInstall = ''
          ensureDir "$out/share/ghci"
          ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
@@ -50516,7 +51973,6 @@ self: {
        jailbreak = true;
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghci-haskeline" = callPackage
@@ -50584,6 +52040,7 @@ self: {
        homepage = "https://github.com/larskuhtz/ghci-pretty";
        description = "colored pretty-printing within ghci";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcid" = callPackage
@@ -50713,8 +52170,8 @@ self: {
     ({ mkDerivation, base, split }:
      mkDerivation {
        pname = "gimlh";
-       version = "0.1.2.0";
-       sha256 = "06n198b43qpixr9jqzqq4wlff01k43vqk13xhr2ly64k5nymnlr4";
+       version = "0.1.3.0";
+       sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l";
        buildDepends = [ base split ];
        homepage = "https://github.com/gazay/gimlh";
        description = "Haskell parser for GIML";
@@ -50830,7 +52287,7 @@ self: {
      , openssh, optparse-applicative, path-pieces, perl, persistent
      , persistent-sqlite, persistent-template, process, QuickCheck
      , random, regex-tdfa, resourcet, rsync, SafeSemaphore, securemem
-     , SHA, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
+     , shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck
      , tasty-rerun, template-haskell, text, time, torrent, transformers
      , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp
      , warp-tls, wget, which, xml-types, yesod, yesod-core
@@ -50838,8 +52295,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150406.1";
-       sha256 = "11r4i1bwkkwwffqqk0s9w9brbc7xnkjr6qw7amzagk4lfvcvpsvi";
+       version = "5.20150420";
+       sha256 = "0jigzf550qzphzcc3wma03kdzq478s6azd992hkcxv9ymxhg2l7x";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -50852,11 +52309,11 @@ self: {
          network-info network-multicast network-protocol-xmpp network-uri
          old-locale optparse-applicative path-pieces persistent
          persistent-sqlite persistent-template process QuickCheck random
-         regex-tdfa resourcet SafeSemaphore securemem SHA shakespeare stm
-         tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell
-         text time torrent transformers unix unix-compat utf8-string uuid
-         wai wai-extra warp warp-tls xml-types yesod yesod-core
-         yesod-default yesod-form yesod-static
+         regex-tdfa resourcet SafeSemaphore securemem shakespeare stm tasty
+         tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time
+         torrent transformers unix unix-compat utf8-string uuid wai
+         wai-extra warp warp-tls xml-types yesod yesod-core yesod-default
+         yesod-form yesod-static
        ];
        buildTools = [
          bup curl git gnupg1 lsof openssh perl rsync wget which
@@ -50912,6 +52369,7 @@ self: {
        homepage = "https://github.com/singpolyma/git-date-haskell";
        description = "Bindings to the date parsing from Git";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-embed" = callPackage
@@ -50982,8 +52440,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-monitor";
-       version = "3.1.1.3";
-       sha256 = "0xcb7i5hvx7967wqsyawxz8fk052ylrb90y3b2spw9pxhqry3j4s";
+       version = "3.1.1.4";
+       sha256 = "00byw8y9av60rwacp4006kv7qb9sc26j1f82cz1ngr42nfx9955c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -50995,6 +52453,7 @@ self: {
        homepage = "http://github.com/jwiegley/gitlib";
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-object" = callPackage
@@ -51052,9 +52511,11 @@ self: {
          base bytestring Cabal machines machines-io machines-process process
          safe transformers
        ];
+       jailbreak = true;
        homepage = "github.com/aloiscochard/git-sanity";
        description = "A sanity checker for your git history";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-vogue" = callPackage
@@ -51079,6 +52540,7 @@ self: {
          base containers directory filepath hspec process temporary
          transformers unix
        ];
+       jailbreak = true;
        homepage = "https://github.com/anchor/git-vogue";
        description = "A framework for pre-commit checks";
        license = stdenv.lib.licenses.bsd3;
@@ -51117,6 +52579,7 @@ self: {
          aeson aeson-lens base bytestring foldl lens mtl
          optparse-applicative sqlite-simple system-filepath text turtle wreq
        ];
+       jailbreak = true;
        homepage = "https://github.com/mattyhall/gitdo";
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
@@ -51126,23 +52589,30 @@ self: {
   "github" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , byteable, bytestring, case-insensitive, conduit, containers
-     , cryptohash, data-default, failure, hashable, HTTP, http-conduit
-     , http-types, network, old-locale, text, time, unordered-containers
-     , vector
+     , cryptohash, data-default, failure, hashable, hspec, HTTP
+     , http-conduit, http-types, network, old-locale, text, time
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "github";
-       version = "0.13.1";
-       sha256 = "0rz89lpswxxsdyfjb63v9md96bxr3abxzwqryh1a2jxhm7f1ia5l";
+       version = "0.13.2";
+       sha256 = "1i07jwhkzaxia98a3fjnm3hynh4mjdhy9rzdh9chdlram5wqk87z";
        buildDepends = [
          aeson attoparsec base base16-bytestring byteable bytestring
          case-insensitive conduit containers cryptohash data-default failure
          hashable HTTP http-conduit http-types network old-locale text time
          unordered-containers vector
        ];
-       homepage = "https://github.com/fpco/github";
+       testDepends = [
+         aeson attoparsec base base16-bytestring byteable bytestring
+         case-insensitive conduit containers cryptohash data-default failure
+         hashable hspec HTTP http-conduit http-types network old-locale text
+         time unordered-containers vector
+       ];
+       homepage = "https://github.com/jwiegley/github";
        description = "Access to the Github API, v3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-backup" = callPackage
@@ -51167,6 +52637,7 @@ self: {
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) git;};
 
   "github-post-receive" = callPackage
@@ -51204,9 +52675,11 @@ self: {
        version = "0.1.0";
        sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5";
        buildDepends = [ base basic-prelude github text ];
+       jailbreak = true;
        homepage = "https://github.com/greenrd/github-utils";
        description = "Useful functions that use the GitHub API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitignore" = callPackage
@@ -51256,6 +52729,7 @@ self: {
        homepage = "http://gitit.net";
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib" = callPackage
@@ -51303,6 +52777,7 @@ self: {
        ];
        description = "Gitlib repository backend that uses the git command-line tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-cross" = callPackage
@@ -51327,21 +52802,21 @@ self: {
     ({ mkDerivation, base, bytestring, conduit, conduit-combinators
      , containers, directory, exceptions, fast-logger, filepath, gitlib
      , gitlib-test, hlibgit2, hspec, hspec-expectations, HUnit
-     , lifted-async, lifted-base, missing-foreign, mmorph, monad-control
-     , monad-logger, monad-loops, mtl, resourcet, stm, stm-conduit
-     , tagged, template-haskell, text, text-icu, time, transformers
+     , lifted-async, lifted-base, mmorph, monad-control, monad-logger
+     , monad-loops, mtl, resourcet, stm, stm-conduit, tagged
+     , template-haskell, text, text-icu, time, transformers
      , transformers-base
      }:
      mkDerivation {
        pname = "gitlib-libgit2";
-       version = "3.1.0.3";
-       sha256 = "19lly5nrxa05gj6mv887d419mm65ha40rggv2a8y1jd6s7z6drfi";
+       version = "3.1.0.4";
+       sha256 = "0657m22xybk54rpyzhdv27089nh85a1n0v47w06q9h5pakq3vfv7";
        buildDepends = [
          base bytestring conduit conduit-combinators containers directory
          exceptions fast-logger filepath gitlib hlibgit2 lifted-async
-         lifted-base missing-foreign mmorph monad-control monad-logger
-         monad-loops mtl resourcet stm stm-conduit tagged template-haskell
-         text text-icu time transformers transformers-base
+         lifted-base mmorph monad-control monad-logger monad-loops mtl
+         resourcet stm stm-conduit tagged template-haskell text text-icu
+         time transformers transformers-base
        ];
        testDepends = [
          base exceptions gitlib gitlib-test hspec hspec-expectations HUnit
@@ -51349,6 +52824,7 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -51473,8 +52949,8 @@ self: {
      }:
      mkDerivation {
        pname = "gl";
-       version = "0.7.4";
-       sha256 = "08b7mayd1qfalqrr2zh8ra7mm05l2inifjamvxn84697mnvxhjg7";
+       version = "0.7.5";
+       sha256 = "0ffc9lks1fd4ch7pygdl8yfmy425aazykrn2niakb876kzzm5axi";
        buildDepends = [
          base containers directory filepath fixed half hxt split
          transformers
@@ -51508,6 +52984,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.gnome) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -51537,6 +53014,19 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "glasso" = callPackage
+    ({ mkDerivation, base, vector }:
+     mkDerivation {
+       pname = "glasso";
+       version = "0.1.0";
+       revision = "1";
+       sha256 = "1ibkvgfighkfn3v27cqy7wwhvlhmnbi1dvyycwbfba6rfy9w6gb8";
+       editedCabalFile = "abf1b0cb0b9cc8c106f833a2549e2be95111a58296d6cc01c39e18c03abef797";
+       buildDepends = [ base vector ];
+       description = "Graphical Lasso algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "glib" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib
      , gtk2hs-buildtools, text, utf8-string
@@ -51581,6 +53071,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gll" = callPackage
+    ({ mkDerivation, array, base, containers }:
+     mkDerivation {
+       pname = "gll";
+       version = "0.1.0.1";
+       sha256 = "09f5clmvn8icgsw73ysyalspy07llbg6lbiqidb4lvmznhg38rvv";
+       buildDepends = [ array base containers ];
+       description = "GLL parser with simple combinator interface";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "global" = callPackage
     ({ mkDerivation, base, haskell-src-exts, haskell-src-exts-qq
      , loch-th, SafeSemaphore, stm, syntax-trees-fork-bairyn, tagged
@@ -51597,6 +53098,7 @@ self: {
        homepage = "https://github.com/bairyn/global";
        description = "Library enabling unique top-level declarations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "global-config" = callPackage
@@ -51690,7 +53192,6 @@ self: {
        buildDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
-       jailbreak = true;
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
@@ -51717,7 +53218,6 @@ self: {
        version = "1.9.3.1";
        sha256 = "1fdbjnrc1f42jxzgi362wccdx8fdhb1ws6bg3ds7cfanffkkf6an";
        buildDepends = [ base containers ghc-prim gloss ];
-       jailbreak = true;
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
@@ -51734,6 +53234,7 @@ self: {
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-devil" = callPackage
@@ -51745,6 +53246,7 @@ self: {
        buildDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-examples" = callPackage
@@ -51763,11 +53265,9 @@ self: {
          gloss-algorithms gloss-raster gloss-rendering random repa
          repa-algorithms repa-io vector
        ];
-       jailbreak = true;
        homepage = "http://gloss.ouroborus.net";
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-game" = callPackage
@@ -51809,7 +53309,6 @@ self: {
          base containers ghc-prim gloss gloss-rendering repa
        ];
        extraLibraries = [ llvm ];
-       jailbreak = true;
        homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
@@ -51840,7 +53339,6 @@ self: {
        version = "1.9.3.1";
        sha256 = "1ns9x9fwkvxy0dwgdd3apv3p0d4857h3mkb3dx0rg9rs3wbapyzy";
        buildDepends = [ base bmp bytestring containers GLUT OpenGL ];
-       jailbreak = true;
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -51868,6 +53366,7 @@ self: {
        extraLibraries = [ glpk ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) glpk;};
 
   "gluturtle" = callPackage
@@ -51981,23 +53480,23 @@ self: {
 
   "gnuplot" = callPackage
     ({ mkDerivation, array, base, containers, data-accessor
-     , data-accessor-transformers, deepseq, filepath, old-locale
-     , process, temporary, time, transformers, utility-ht
+     , data-accessor-transformers, deepseq, filepath, process, temporary
+     , time, transformers, utility-ht
      }:
      mkDerivation {
        pname = "gnuplot";
-       version = "0.5.3.1";
-       sha256 = "03q226k7dhlc9mvfkkw3p00h7fh55s7l5hxgb2aarlz6q3rnjrcb";
+       version = "0.5.4";
+       sha256 = "1rx6gppgikjyd8ndlmc1yx3b4670184l80g8vrpcgjmbq23wjnmh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base containers data-accessor data-accessor-transformers
-         deepseq filepath old-locale process temporary time transformers
-         utility-ht
+         deepseq filepath process temporary time transformers utility-ht
        ];
        homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
        description = "2D and 3D plots using gnuplot";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnutls" = callPackage
@@ -52013,6 +53512,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnutls/";
        description = "Bindings for GNU libgnutls";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) gnutls;};
 
   "goa" = callPackage
@@ -52042,6 +53542,7 @@ self: {
        homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goatee-gtk" = callPackage
@@ -52110,6 +53611,7 @@ self: {
        ];
        description = "Google Drive API access";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-html5-slide" = callPackage
@@ -52147,6 +53649,7 @@ self: {
        homepage = "https://github.com/liyang/google-mail-filters";
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-oauth2" = callPackage
@@ -52175,6 +53678,7 @@ self: {
        homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "googleplus" = callPackage
@@ -52353,7 +53857,6 @@ self: {
        homepage = "http://projects.haskell.org/grammar-combinators/";
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-examples" = callPackage
@@ -52371,6 +53874,7 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -52388,6 +53892,7 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -52400,6 +53905,7 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -52417,6 +53923,7 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -52434,6 +53941,7 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-core" = callPackage
@@ -52470,6 +53978,7 @@ self: {
          base Cabal containers fgl hspec hspec-expectations multiset
          mwc-random QuickCheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/ulikoehler/graph-random";
        description = "Functions for generating structured or random FGL graphs";
        license = stdenv.lib.licenses.asl20;
@@ -52493,9 +54002,11 @@ self: {
        version = "0.7.6";
        sha256 = "014zsw98ksylr4g1ax3xxlsh9jiybaz7xjapl2h88a8ma91da3jz";
        buildDepends = [ base base-unicode-symbols containers mtl ];
+       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-cl" = callPackage
@@ -52535,6 +54046,7 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-lambdascope" = callPackage
@@ -52571,9 +54083,11 @@ self: {
        buildDepends = [
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
+       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-ski" = callPackage
@@ -52594,6 +54108,7 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-strategies" = callPackage
@@ -52607,9 +54122,11 @@ self: {
        buildDepends = [
          base base-unicode-symbols containers graph-rewriting
        ];
+       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-trs" = callPackage
@@ -52632,6 +54149,7 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-ww" = callPackage
@@ -52653,6 +54171,7 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-serialize" = callPackage
@@ -52711,6 +54230,7 @@ self: {
        homepage = "http://www.github.com/batterseapower/graph-wrapper";
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphbuilder" = callPackage
@@ -52730,6 +54250,7 @@ self: {
        homepage = "https://github.com/tel/graphbuilder";
        description = "A declarative, monadic graph construction language for small graphs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphene" = callPackage
@@ -52763,6 +54284,7 @@ self: {
        homepage = "http://github.com/luqui/graphics-drawingcombinators";
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -52940,6 +54462,7 @@ self: {
        homepage = "https://github.com/sof/greencard";
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greencard-lib" = callPackage
@@ -52952,6 +54475,7 @@ self: {
        homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greg-client" = callPackage
@@ -52977,8 +54501,8 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.7.1";
-       sha256 = "06xpfzqnsyrknfccqb748prvx3f87jzvmzfpp75x5s1psms7685b";
+       version = "7.8.2";
+       sha256 = "0bb9cykr47sbkccnfcxaq3fx2q0m4c3cvfjhdg2jqwvn0jsp98ik";
        buildDepends = [ base cereal containers ];
        testDepends = [
          base containers QuickCheck test-framework
@@ -53058,6 +54582,7 @@ self: {
        homepage = "http://github.com/lykahb/groundhog";
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-mysql" = callPackage
@@ -53127,6 +54652,7 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "group-with" = callPackage
@@ -53141,6 +54667,7 @@ self: {
        testDepends = [
          base Cabal containers hspec hspec-expectations QuickCheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/ulikoehler/group-with";
        description = "Classify objects by key-generating function, like SQL GROUP BY";
        license = stdenv.lib.licenses.asl20;
@@ -53255,6 +54782,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gsasl/";
        description = "Bindings for GNU libgsasl";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) gsasl;};
 
   "gsc-weighting" = callPackage
@@ -53266,6 +54794,7 @@ self: {
        buildDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsl-random" = callPackage
@@ -53329,6 +54858,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) gst_plugins_base;  inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -53522,6 +55052,7 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: glade package";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-glib" = callPackage
@@ -53619,6 +55150,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base glib gtk3 transformers ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/hello/";
        description = "Gtk2Hs Hello World, an example package";
        license = stdenv.lib.licenses.mit;
@@ -53660,21 +55192,21 @@ self: {
      }) { gtk3 = null;};
 
   "gtk3-mac-integration" = callPackage
-    ({ mkDerivation, array, base, containers, glib, gtk-mac-integration
-     , gtk2hs-buildtools, gtk3, mtl
+    ({ mkDerivation, array, base, containers, glib
+     , gtk-mac-integration-gtk3, gtk2hs-buildtools, gtk3, mtl
      }:
      mkDerivation {
        pname = "gtk3-mac-integration";
-       version = "0.3.0.2";
-       sha256 = "0fsgcy5vwdcy7mf57w6axqa7804w0729mbzb7gvf4wh25k2i2xhp";
+       version = "0.3.0.3";
+       sha256 = "1jzkx10mmmxxv1ys9ywr2sfpy0pxvy8276pbkh0xnypxsyd2sfdn";
        buildDepends = [ array base containers glib gtk3 mtl ];
        buildTools = [ gtk2hs-buildtools ];
-       pkgconfigDepends = [ gtk-mac-integration ];
+       pkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gtk-mac-integration = null;};
+     }) { gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext
@@ -53774,6 +55306,7 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/GuardedRewriting";
        description = "Datatype-generic rewriting with preconditions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "guess-combinator" = callPackage
@@ -53786,7 +55319,6 @@ self: {
        homepage = "http://code.atnnn.com/project/guess";
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gulcii" = callPackage
@@ -53798,6 +55330,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base cairo containers filepath gtk ];
+       jailbreak = true;
        homepage = "http://code.mathr.co.uk/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
@@ -53927,6 +55460,7 @@ self: {
        buildDepends = [ base monads-tf transformers vector ];
        buildTools = [ c2hs ];
        extraLibraries = [ csound64 libsndfile ];
+       jailbreak = true;
        description = "interface to CSound API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53972,6 +55506,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hLLVM" = callPackage
+    ({ mkDerivation, array, base, bytestring, cmdargs, containers
+     , data-dword, directory, filepath, hooplext, mtl, parsec, pretty
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "hLLVM";
+       version = "0.5.0.1";
+       sha256 = "0my2071si1x25q482rz48ihj6b9pg1vf6g722jdx8nbgri1x4wzz";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         array base bytestring cmdargs containers data-dword directory
+         filepath hooplext mtl parsec pretty template-haskell transformers
+       ];
+       jailbreak = true;
+       description = "A library for analyzing and transforming LLVM (3.5) assembly codes";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) { hooplext = null;};
+
   "hMollom" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Crypto
      , dataenc, ghc-prim, HTTP, mtl, old-locale, old-time, pureMD5
@@ -54030,6 +55585,7 @@ self: {
        homepage = "http://floss.scru.org/hOpenPGP/";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB" = callPackage
@@ -54075,6 +55631,7 @@ self: {
        homepage = "https://github.com/BioHaskell/hPDB-examples";
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPushover" = callPackage
@@ -54086,10 +55643,10 @@ self: {
        version = "0.2";
        sha256 = "14k3sdy2c0anfsw0hdir0l107ixlsnr90miwxrxdsckh40kz3ad3";
        buildDepends = [ aeson base bytestring http-conduit network text ];
+       jailbreak = true;
        homepage = "tot";
        description = "Pushover.net API functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hR" = callPackage
@@ -54179,6 +55736,7 @@ self: {
        homepage = "http://perception.inf.um.es/tensor";
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hVOIDP" = callPackage
@@ -54197,6 +55755,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) blas;  lapack = null;};
 
+  "hXmixer" = callPackage
+    ({ mkDerivation, base, directory, gtk3, process, split, text }:
+     mkDerivation {
+       pname = "hXmixer";
+       version = "0.2.5.0";
+       sha256 = "0nl6ylprxc1mz96713n222gy1b3pifkp3mb42v181w1iwms405y5";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [ base directory gtk3 process split text ];
+       homepage = "http://colinrmitchell.endoftheinternet.org/";
+       description = "A Gtk mixer application for FreeBSD";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haar" = callPackage
     ({ mkDerivation, base, QuickCheck, split, test-framework
      , test-framework-quickcheck2
@@ -54303,7 +55875,6 @@ self: {
        buildDepends = [ base bytestring cgi containers hack ];
        description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-cgi" = callPackage
@@ -54447,6 +56018,7 @@ self: {
        homepage = "http://github.com/snoyberg/hack-middleware-cleanpath/tree/master";
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-middleware-clientsession" = callPackage
@@ -54522,6 +56094,7 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-contrib";
        description = "Hack2 contrib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-contrib-extra" = callPackage
@@ -54600,6 +56173,7 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-handler-snap-server";
        description = "Hack2 Snap server handler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-handler-warp" = callPackage
@@ -54675,7 +56249,6 @@ self: {
        homepage = "https://github.com/blitzcode/hackage-diff";
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-mirror" = callPackage
@@ -54706,6 +56279,7 @@ self: {
        homepage = "http://fpcomplete.com";
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-plot" = callPackage
@@ -54725,6 +56299,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hackage-plot";
        description = "Generate cumulative graphs of hackage uploads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-proxy" = callPackage
@@ -54857,6 +56432,7 @@ self: {
        homepage = "https://github.com/dterei/Hackager";
        description = "Hackage testing tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackernews" = callPackage
@@ -54866,13 +56442,14 @@ self: {
      }:
      mkDerivation {
        pname = "hackernews";
-       version = "0.3.1.2";
-       sha256 = "0y7548x98zgmaqzgzaxrjs1zckkhzx4w7440ml3zfh2rv65frkkj";
+       version = "0.4.0.0";
+       sha256 = "1avznjavz5f3rrmcy6xbi3nh2knarrjnxlrh7sk82zv5aashvp2h";
        buildDepends = [
          aeson attoparsec base bytestring either HsOpenSSL http-streams
          io-streams text time transformers
        ];
        testDepends = [ base hspec transformers ];
+       jailbreak = true;
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54981,6 +56558,7 @@ self: {
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
        ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -55037,6 +56615,7 @@ self: {
        testDepends = [
          base base-compat bytestring deepseq hspec QuickCheck
        ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
@@ -55080,6 +56659,7 @@ self: {
        homepage = "https://github.com/philopon/haddocset";
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hadoop-formats" = callPackage
@@ -55093,6 +56673,7 @@ self: {
        buildDepends = [ attoparsec base bytestring text vector ];
        testDepends = [ base bytestring filepath text vector ];
        extraLibraries = [ snappy ];
+       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-formats";
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
@@ -55114,7 +56695,6 @@ self: {
          unordered-containers uuid vector xmlhtml
        ];
        testDepends = [ base protobuf tasty tasty-hunit vector ];
-       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-rpc";
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -55144,10 +56724,10 @@ self: {
          attoparsec base bytestring hadoop-rpc tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-tools";
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haeredes" = callPackage
@@ -55253,8 +56833,8 @@ self: {
      }:
      mkDerivation {
        pname = "hails";
-       version = "0.11.2.0";
-       sha256 = "0s16hrkvbnpqdpykwwq0i0530lq4v2zpc2bx7b8ykf7isnwvjzhf";
+       version = "0.11.2.1";
+       sha256 = "1s447iqgpxsx78zd873izyqhdq34dz1ikjcfw8m9r0rv5nkxkf7c";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -55438,6 +57018,7 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -55455,6 +57036,7 @@ self: {
        homepage = "https://github.com/bitonic/hakyll-agda";
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-blaze-templates" = callPackage
@@ -55497,6 +57079,7 @@ self: {
        homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation";
        description = "automatic hyphenation for Hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-contrib-links" = callPackage
@@ -55537,6 +57120,7 @@ self: {
        homepage = "http://github.com/kowey/hakyll-convert";
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -55634,17 +57218,17 @@ self: {
     ({ mkDerivation, async, base, containers, data-default
      , diagrams-cairo, diagrams-gtk, diagrams-lib, grid, gtk, HUnit, mtl
      , mvc, pipes, QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, timeit, vector-space-points
+     , test-framework-quickcheck2, timeit
      }:
      mkDerivation {
        pname = "halma";
-       version = "0.1.0.1";
-       sha256 = "1k12f3ag54qqnl391i5sw3lmlrsjn693yjkigv9ypaghan02gh9p";
+       version = "0.2.0.0";
+       sha256 = "053r1npyq7f07d29bryrr0vwx4kpm3m1bdjkwr77znimshcvy9b3";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          async base containers data-default diagrams-cairo diagrams-gtk
-         diagrams-lib grid gtk mtl mvc pipes timeit vector-space-points
+         diagrams-lib grid gtk mtl mvc pipes timeit
        ];
        testDepends = [
          base containers grid HUnit QuickCheck test-framework
@@ -55653,6 +57237,7 @@ self: {
        homepage = "https://github.com/timjb/halma";
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haltavista" = callPackage
@@ -55754,8 +57339,8 @@ self: {
      }:
      mkDerivation {
        pname = "handa-gdata";
-       version = "0.7.0.2";
-       sha256 = "0h75qj05hpdyl9x54rcb3sqzzzyby57g2aihjgawif2zg7wif7a7";
+       version = "0.7.0.3";
+       sha256 = "1rm61kzvy8vrqmpa82y98hdf3dhqxkq9yh583p0l48zfj28ljh91";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -55767,6 +57352,7 @@ self: {
        homepage = "http://code.google.com/p/hgdata";
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "handa-geodata" = callPackage
@@ -55809,6 +57395,7 @@ self: {
          shell-escape split transformers
        ];
        testDepends = [ base bytestring tasty tasty-hunit tasty-th ];
+       jailbreak = true;
        homepage = "https://github.com/utdemir/handsy";
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
        license = stdenv.lib.licenses.bsd3;
@@ -55843,27 +57430,29 @@ self: {
          lens-aeson process scotty text transformers unix-time wai-extra
          wai-middleware-static yaml
        ];
+       jailbreak = true;
        description = "Simple Continuous Integration/Deployment System";
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
   "hans" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cereal
-     , containers, fingertree, HTTP, monadLib, old-locale, random, time
-     , unix
+     , containers, fingertree, HTTP, monadLib, network, old-locale
+     , random, time, unix
      }:
      mkDerivation {
        pname = "hans";
-       version = "2.4.0.0";
-       sha256 = "1sjvjx27hll04i0g0744zlvlq4vd7q0299czg9bnihvsds6rr84n";
+       version = "2.5.0.0";
+       sha256 = "19zmwwnccmr1smypm8xbxh1r0fcrd9967dqcrjw5mm9675v1iw0p";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base blaze-html blaze-markup bytestring cereal containers
-         fingertree HTTP monadLib old-locale random time unix
+         fingertree HTTP monadLib network old-locale random time unix
        ];
        description = "IPv4 Network Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pcap" = callPackage
@@ -55873,9 +57462,11 @@ self: {
        version = "0.1.0.2";
        sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s";
        buildDepends = [ base bytestring hans pcap ];
+       jailbreak = true;
        homepage = "https://github.com/tolysz/hans-pcap";
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pfq" = callPackage
@@ -55910,9 +57501,11 @@ self: {
          base base-compat directory either filepath hspec mtl old-locale
          process temporary time transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -56201,7 +57794,6 @@ self: {
        ];
        description = "Happstack extension for use with FastCGI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-fay" = callPackage
@@ -56233,6 +57825,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-foundation" = callPackage
@@ -56329,6 +57922,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using HSP templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-hstringtemplate" = callPackage
@@ -56386,6 +57980,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-lite" = callPackage
@@ -56596,8 +58191,10 @@ self: {
          array base containers haskell-src-meta mtl template-haskell
        ];
        buildTools = [ happy ];
+       jailbreak = true;
        description = "Quasi-quoter for Happy parsers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara" = callPackage
@@ -56663,6 +58260,7 @@ self: {
        version = "0.1.1.0";
        sha256 = "0x51sqlybfq2pqv6nrhvf50yds3gs08sfih7zi9ijvn5dkrxx1z3";
        buildDepends = [ aeson base bytestring directory filepath text ];
+       jailbreak = true;
        homepage = "https://github.com/freizl/har";
        description = "HAR spec in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -56750,6 +58348,7 @@ self: {
        homepage = "http://www.cs.chalmers.se/~d00nibro/harp/";
        description = "HaRP allows pattern-matching with regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "harpy" = callPackage
@@ -56995,6 +58594,7 @@ self: {
        ];
        description = "Hashed file storage support code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashmap" = callPackage
@@ -57439,8 +59039,10 @@ self: {
        version = "0.0.0.4";
        sha256 = "1r0vhaxcsszrcqnw70gz8xpfrqddmxf9kpka63gix1bjic4alzjn";
        buildDepends = [ base deepseq ];
+       jailbreak = true;
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-docs" = callPackage
@@ -57460,10 +59062,10 @@ self: {
          text unordered-containers
        ];
        testDepends = [ base ];
-       jailbreak = true;
        homepage = "http://github.com/chrisdone/haskell-docs";
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-formatter" = callPackage
@@ -57486,6 +59088,7 @@ self: {
          base containers directory-tree doctest filemanip filepath hlint
          tasty tasty-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/evolutics/haskell-formatter";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.gpl3;
@@ -57545,6 +59148,7 @@ self: {
        homepage = "http://www.informatik.uni-bremen.de/~cxl/lehre/pi3.ws01/asteroids/";
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-lexer" = callPackage
@@ -57615,6 +59219,7 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client" = callPackage
@@ -57642,6 +59247,7 @@ self: {
          test-framework-th text transformers transformers-base
          transformers-compat unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
@@ -57678,9 +59284,11 @@ self: {
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
          transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://documentup.com/haskell-suite/haskell-packages";
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-pdf-presenter" = callPackage
@@ -57810,7 +59418,6 @@ self: {
        ];
        description = "Client API for Rocket Scissor Spacegoo";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src" = callPackage
@@ -57933,10 +59540,10 @@ self: {
          ghc-prim ghc-syb-utils haskell-src-exts hspec HUnit monoid-extras
          mtl pretty QuickCheck rosezipper semigroups syb uniplate
        ];
+       jailbreak = true;
        homepage = "https://github.com/alanz/haskell-token-utils";
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-type-exts" = callPackage
@@ -58015,19 +59622,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell2010_1_1_2_0" = callPackage
+  "haskell2010" = callPackage
     ({ mkDerivation, array, base, ghc-prim }:
      mkDerivation {
        pname = "haskell2010";
        version = "1.1.2.0";
        sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m";
        buildDepends = [ array base ghc-prim ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/onlinereport/haskell2010/";
        description = "Compatibility with Haskell 2010";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell98_2_0_0_3" = callPackage
+  "haskell98" = callPackage
     ({ mkDerivation, array, base, directory, old-locale, old-time
      , process, time
      }:
@@ -58038,9 +59647,11 @@ self: {
        buildDepends = [
          array base directory old-locale old-time process time
        ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/definition/";
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell98libraries" = callPackage
@@ -58086,6 +59697,7 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-mtl" = callPackage
@@ -58102,6 +59714,7 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-tf" = callPackage
@@ -58119,6 +59732,7 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-transformers" = callPackage
@@ -58136,6 +59750,7 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-lifted" = callPackage
@@ -58153,6 +59768,7 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using lifted-base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-dynamic" = callPackage
@@ -58204,6 +59820,7 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for HDBC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hdbc-mysql" = callPackage
@@ -58241,6 +59858,7 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC ODBC driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hdbc-postgresql" = callPackage
@@ -58260,6 +59878,7 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) postgresql;};
 
   "haskelldb-hdbc-sqlite3" = callPackage
@@ -58278,6 +59897,7 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC SQLite driver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql" = callPackage
@@ -58458,6 +60078,7 @@ self: {
          semigroups test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/happy0/haskellscrabble";
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
@@ -58553,8 +60174,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskintex";
-       version = "0.5.0.2";
-       sha256 = "1qfqslr8pxks3qmfarmscgvc0q8zn72prqyk5xhmfvkf6q35pmfn";
+       version = "0.5.0.3";
+       sha256 = "0gbsr3b832rb3gk6gx3s1lrjpv4kqcf62cz3wgjj5riscq1vg73k";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -58607,6 +60228,7 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the Bitcoin protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -58631,6 +60253,7 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-crypto";
        description = "Implementation of Bitcoin cryptographic primitives";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-protocol" = callPackage
@@ -58653,6 +60276,7 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-protocol";
        description = "Implementation of the Bitcoin network protocol messages";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-script" = callPackage
@@ -58677,6 +60301,7 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-script";
        description = "Implementation of Bitcoin script parsing and evaluation";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-util" = callPackage
@@ -58697,6 +60322,7 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-util";
        description = "Utility functions for the Network.Haskoin project";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-wallet" = callPackage
@@ -58804,6 +60430,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Haskore";
        description = "The Haskore Computer Music System";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-realtime" = callPackage
@@ -58822,6 +60449,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Haskore/";
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-supercollider" = callPackage
@@ -58880,6 +60508,7 @@ self: {
        homepage = "http://haskell.org/haskore/";
        description = "The February 2000 version of Haskore";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasktags" = callPackage
@@ -58978,6 +60607,7 @@ self: {
          base-prelude either hasql-backend hasql-postgres hspec
          monad-control mtl-prelude slave-thread text vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A minimalistic general high level API for relational databases";
        license = stdenv.lib.licenses.mit;
@@ -59123,6 +60753,7 @@ self: {
        homepage = "http://haste-lang.org/";
        description = "Haskell To ECMAScript compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haste-markup" = callPackage
@@ -59144,12 +60775,13 @@ self: {
     ({ mkDerivation, base, haste-compiler, transformers }:
      mkDerivation {
        pname = "haste-perch";
-       version = "0.1.0.8";
-       sha256 = "0p15wzl7rina4pnldhkm188addqlgmc9k4cryv7v2dr9i0wv5y8f";
+       version = "0.1.0.9";
+       sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8";
        buildDepends = [ base haste-compiler transformers ];
        homepage = "https://github.com/agocorona/haste-perch";
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hat" = callPackage
@@ -59185,6 +60817,7 @@ self: {
          base blaze-html directory filepath HaTeX parsec text time
          transformers
        ];
+       jailbreak = true;
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59261,8 +60894,8 @@ self: {
      }:
      mkDerivation {
        pname = "haxl";
-       version = "0.1.0.0";
-       sha256 = "1spkcvsy0p3ksxapaz93db09y2jsswr5k6qs6cvxmwxxhbnswv36";
+       version = "0.2.0.0";
+       sha256 = "13nd291s04wyyx60cfs7x02dfpm4b9qn73h70c97gjq2s7l7y7qy";
        buildDepends = [
          aeson base bytestring containers directory filepath hashable HUnit
          pretty text time unordered-containers vector
@@ -59271,7 +60904,6 @@ self: {
          aeson base bytestring containers hashable HUnit text
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/facebook/Haxl";
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
@@ -59392,6 +61024,7 @@ self: {
        extraLibraries = [
          wayland-client wayland-cursor wayland-egl wayland-server
        ];
+       jailbreak = true;
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59456,6 +61089,7 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbb" = callPackage
@@ -59472,7 +61106,6 @@ self: {
        homepage = "https://bitbucket.org/bhris/hbb";
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbcd" = callPackage
@@ -59561,11 +61194,11 @@ self: {
   "hbro" = callPackage
     ({ mkDerivation, aeson, base, bytestring, classy-prelude, cond
      , containers, data-default-class, dyre, errors, fast-logger, glib
-     , gtk3, integer-simple, lens, lifted-async, lifted-base
-     , monad-control, monad-logger, mtl, network-uri
-     , optparse-applicative, pango, parsec, process, resourcet, safe
-     , semigroups, stm-chans, system-fileio, text, time, transformers
-     , transformers-base, unix, webkitgtk3, zeromq4-haskell
+     , gtk3, lens, lifted-async, lifted-base, monad-control
+     , monad-logger, mtl, network-uri, optparse-applicative, pango
+     , parsec, process, resourcet, safe, semigroups, stm-chans
+     , system-fileio, text, time, transformers, transformers-base, unix
+     , webkitgtk3, zeromq4-haskell
      }:
      mkDerivation {
        pname = "hbro";
@@ -59575,18 +61208,16 @@ self: {
        isExecutable = true;
        buildDepends = [
          aeson base bytestring classy-prelude cond containers
-         data-default-class dyre errors fast-logger glib gtk3 integer-simple
-         lens lifted-async lifted-base monad-control monad-logger mtl
-         network-uri optparse-applicative pango parsec process resourcet
-         safe semigroups stm-chans system-fileio text time transformers
-         transformers-base unix webkitgtk3 zeromq4-haskell
+         data-default-class dyre errors fast-logger glib gtk3 lens
+         lifted-async lifted-base monad-control monad-logger mtl network-uri
+         optparse-applicative pango parsec process resourcet safe semigroups
+         stm-chans system-fileio text time transformers transformers-base
+         unix webkitgtk3 zeromq4-haskell
        ];
-       jailbreak = true;
        homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
        license = "unknown";
-       broken = true;
-     }) { integer-simple = null;};
+     }) {};
 
   "hbro-contrib" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
@@ -59755,6 +61386,7 @@ self: {
        buildDepends = [ base directory HaskellForMaths QuickCheck text ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcwiid" = callPackage
@@ -59816,6 +61448,7 @@ self: {
          aeson base convertible HDBC scientific text unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/danchoi/hdbc-aeson";
        description = "Deserialize from HDBC rows to FromJSON instances";
        license = stdenv.lib.licenses.mit;
@@ -59868,9 +61501,11 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time uuid
        ];
+       jailbreak = true;
        homepage = "https://github.com/s9gf4ult/hdbi";
        description = "Haskell Database Independent interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-conduit" = callPackage
@@ -59920,6 +61555,7 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-postgresql";
        description = "PostgreSQL driver for hdbi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-sqlite" = callPackage
@@ -59940,6 +61576,7 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-sqlite";
        description = "SQlite driver for HDBI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-tests" = callPackage
@@ -59961,6 +61598,7 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-tests";
        description = "test suite for testing HDBI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdevtools" = callPackage
@@ -60092,6 +61730,7 @@ self: {
        homepage = "https://github.com/mvoidex/hdocs";
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdph" = callPackage
@@ -60115,6 +61754,7 @@ self: {
        homepage = "https://github.com/PatrickMaier/HdpH";
        description = "Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdph-closure" = callPackage
@@ -60132,6 +61772,7 @@ self: {
        homepage = "https://github.com/PatrickMaier/HdpH";
        description = "Explicit closures in Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heap" = callPackage
@@ -60232,6 +61873,7 @@ self: {
        version = "0.0.1";
        sha256 = "1c524klmsl8n6alphxdmwm4hw05hhq3rcyb5540ksnnys77b8y2b";
        buildDepends = [ aeson base hedis scientific text time ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/hedis-config";
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
@@ -60249,6 +61891,7 @@ self: {
          base hedis monad-control mtl transformers transformers-base
          transformers-compat
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/redis-monadic";
        description = "A la MonadReader for Redis connection";
        license = stdenv.lib.licenses.bsd3;
@@ -60271,6 +61914,7 @@ self: {
          base binary bytestring hedis HUnit lifted-base string-conversions
          test-framework test-framework-hunit transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/akaspin/hedis-pile";
        description = "Caching mandatory data with Redis";
        license = stdenv.lib.licenses.bsd3;
@@ -60329,6 +61973,7 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/hedn";
        description = "EDN parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heist" = callPackage
@@ -60341,9 +61986,9 @@ self: {
      mkDerivation {
        pname = "heist";
        version = "0.14.1";
-       revision = "1";
+       revision = "2";
        sha256 = "11g6nrg9xn9ypwrz7mj3hqjhg45ia1miihh1ydls7vfdm2fqlagy";
-       editedCabalFile = "2d58f7f1572a3a9ed3f20cb344a4f45e33303a40889b1e5bd8f83e4b972b195e";
+       editedCabalFile = "73ce4cfe9090a973644268118b4d765577c2e8ddeeb1ad245d335772f5369d34";
        buildDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist errors filepath hashable
@@ -60449,8 +62094,8 @@ self: {
      }:
      mkDerivation {
        pname = "helium";
-       version = "1.8";
-       sha256 = "0nhpkilxhkp0q9flq6ap8lhync21v8bz5jvb6j79flcvb0vh74rq";
+       version = "1.8.1";
+       sha256 = "0vwk8h5fwl63pjcydwndqgpikfjdm37w7gjmmgac95gl66fc5h5j";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -60460,6 +62105,7 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Helium Compiler";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hell" = callPackage
@@ -60483,6 +62129,7 @@ self: {
        ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hellage" = callPackage
@@ -60684,6 +62331,7 @@ self: {
        buildDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "her-lexer" = callPackage
@@ -60727,6 +62375,7 @@ self: {
        homepage = "https://github.com/danchoi/herbalizer";
        description = "HAML to ERB translator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "here" = callPackage
@@ -60777,6 +62426,7 @@ self: {
        buildTools = [ alex happy ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hermit-syb" = callPackage
@@ -60841,6 +62491,7 @@ self: {
        ];
        description = "A library for compiling and serving static web assets";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "herringbone-embed" = callPackage
@@ -60857,6 +62508,7 @@ self: {
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "herringbone-wai" = callPackage
@@ -60873,6 +62525,7 @@ self: {
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hesql" = callPackage
@@ -61051,6 +62704,7 @@ self: {
        buildDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
+       jailbreak = true;
        description = "Lenses for Hexpat";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -61131,6 +62785,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hexstring" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring
+     , hspec, text
+     }:
+     mkDerivation {
+       pname = "hexstring";
+       version = "0.11.1";
+       sha256 = "0509h2fhrpcsjf7gffychf700xca4a5l937jfgdzywpm4bzdpn20";
+       buildDepends = [
+         aeson base base16-bytestring binary bytestring text
+       ];
+       testDepends = [ base binary bytestring hspec text ];
+       homepage = "http://www.leonmergen.com/opensource.html";
+       description = "Fast and safe representation of a hex string";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hfann" = callPackage
     ({ mkDerivation, base, doublefann, fann }:
      mkDerivation {
@@ -61243,6 +62914,7 @@ self: {
        homepage = "http://github.com/cmh/Hfractal";
        description = "OpenGL fractal renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfsevents" = callPackage
@@ -61268,6 +62940,7 @@ self: {
        homepage = "http://www.fing.edu.uy/inco/proyectos/fusion";
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hg-buildpackage" = callPackage
@@ -61531,6 +63204,7 @@ self: {
        buildDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hidapi" = callPackage
@@ -61569,6 +63243,7 @@ self: {
        testDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchical-clustering-diagrams" = callPackage
@@ -61650,6 +63325,7 @@ self: {
          base bytestring cereal hspec leveldb-haskell lifted-base
          monad-control mtl process resourcet transformers transformers-base
        ];
+       jailbreak = true;
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
@@ -61714,7 +63390,6 @@ self: {
          base blaze-html blaze-markup bytestring containers filepath mtl
          pcre-light text
        ];
-       jailbreak = true;
        description = "source code highlighting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61725,8 +63400,8 @@ self: {
      }:
      mkDerivation {
        pname = "highlighting-kate";
-       version = "0.5.14";
-       sha256 = "0hpg2f660s035gj0fzy42s52adgqlgssn7pf2k0bcxml3qxf3jnr";
+       version = "0.5.15";
+       sha256 = "0ig9yz7cd08wkvhbfw8rlg4flclsk2lqqx0zkl8721zgviqj9rg4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -61756,11 +63431,9 @@ self: {
          array base bytestring directory filepath optparse-applicative text
          transformers
        ];
-       jailbreak = true;
        homepage = "http://www.bubblycloud.com/hills/";
        description = "Generate STL models from SRTM elevation data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "himerge" = callPackage
@@ -61797,6 +63470,7 @@ self: {
        buildDepends = [
          base bytestring directory gtk HTTP http-conduit network temporary
        ];
+       jailbreak = true;
        homepage = "http://github.com/Fuuzetsu/himg";
        description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
        license = stdenv.lib.licenses.gpl3;
@@ -62007,6 +63681,7 @@ self: {
        jailbreak = true;
        description = "A server process that runs hint";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinvaders" = callPackage
@@ -62037,6 +63712,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hipbot" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, blaze-builder, bytestring
+     , either, exceptions, http-client, http-client-tls, http-types, jwt
+     , lens, mtl, network-uri, postgresql-simple, safe, stm, text, time
+     , transformers, unordered-containers, utf8-string, wai, wai-lens
+     , webcrank-wai, wreq
+     }:
+     mkDerivation {
+       pname = "hipbot";
+       version = "0.2";
+       sha256 = "1fi96mfkdn3dr1wzz4a1bab4ynlzfdm0j5626dh460m2bdb2lfw6";
+       buildDepends = [
+         aeson base bifunctors blaze-builder bytestring either exceptions
+         http-client http-client-tls http-types jwt lens mtl network-uri
+         postgresql-simple safe stm text time transformers
+         unordered-containers utf8-string wai wai-lens webcrank-wai wreq
+       ];
+       homepage = "https://github.com/purefn/hipbot";
+       description = "A library for building HipChat Bots";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hipe" = callPackage
     ({ mkDerivation, base, containers, hgeometry, hxt, parsec, split
      , text, text-format
@@ -62178,6 +63875,7 @@ self: {
        homepage = "https://github.com/kawu/hist-pl/tree/master/fusion";
        description = "Merging historical dictionary with PoliMorf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl-lexicon" = callPackage
@@ -62332,6 +64030,7 @@ self: {
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/seagreen/hjcase";
        description = "Jcase library for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -62451,6 +64150,7 @@ self: {
          aeson base bytestring directory filepath HUnit test-framework
          test-framework-hunit text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema Draft 4 library";
        license = stdenv.lib.licenses.mit;
@@ -62474,6 +64174,7 @@ self: {
        ];
        description = "A library to build valid LaTeX files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlbfgsb" = callPackage
@@ -62519,31 +64220,34 @@ self: {
   "hledger" = callPackage
     ({ mkDerivation, base, base-compat, cmdargs, containers, csv
      , directory, filepath, haskeline, hledger-lib, HUnit, mtl
-     , mtl-compat, old-locale, old-time, parsec, pretty-show, process
-     , regex-tdfa, regexpr, safe, shakespeare, shakespeare-text, split
-     , tabular, terminfo, test-framework, test-framework-hunit, text
-     , time, transformers, utf8-string, wizards
+     , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa
+     , regexpr, safe, shakespeare, shakespeare-text, split, tabular
+     , terminfo, test-framework, test-framework-hunit, text, time
+     , transformers, utf8-string, wizards
      }:
      mkDerivation {
        pname = "hledger";
        version = "0.25";
+       revision = "1";
        sha256 = "0gzhlrxdjgg7313aipxr0ziakvdlj07d7sm9cc0q2mx3f37mrnxx";
+       editedCabalFile = "e67ec6a6820e09eba70980062cded8f2ea6466b83009f2808e8910101f900a1b";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base base-compat cmdargs containers csv directory filepath
-         haskeline hledger-lib HUnit mtl mtl-compat old-locale old-time
-         parsec pretty-show process regex-tdfa regexpr safe shakespeare
+         haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
+         pretty-show process regex-tdfa regexpr safe shakespeare
          shakespeare-text split tabular terminfo text time utf8-string
          wizards
        ];
        testDepends = [
          base base-compat cmdargs containers csv directory filepath
-         haskeline hledger-lib HUnit mtl mtl-compat old-locale old-time
-         parsec pretty-show process regex-tdfa regexpr safe shakespeare
+         haskeline hledger-lib HUnit mtl mtl-compat old-time parsec
+         pretty-show process regex-tdfa regexpr safe shakespeare
          shakespeare-text split tabular test-framework test-framework-hunit
          text time transformers wizards
        ];
+       jailbreak = true;
        homepage = "http://hledger.org";
        description = "The main command-line interface for the hledger accounting tool";
        license = "GPL";
@@ -62574,12 +64278,11 @@ self: {
     ({ mkDerivation, base, hledger-lib, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.2";
-       sha256 = "1bdskrg6rxnhf3jzhg5n933ynkkn6n2fyphpwz3svv4qs9sqnwl1";
+       version = "0.2.0.3";
+       sha256 = "0m2wbjbihv0zlz2y3khy81xhh2c261fb4wr55csqy22rds73fwy8";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base hledger-lib time ];
-       jailbreak = true;
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
@@ -62605,39 +64308,42 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.5";
-       sha256 = "0xv8rmxf1534g6mbxlhmrx71w0amdrhhj1dwyw5dv91i743br5mp";
+       version = "0.1.1.6";
+       sha256 = "1w8f69ssr7g50w4mikfakznrw7y0lqcjr78ad5bwz37ppi4fhdvj";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base Cabal Decimal hledger-lib statistics time ];
-       jailbreak = true;
        description = "computes the internal rate of return of an investment";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-lib" = callPackage
     ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring
      , cmdargs, containers, csv, Decimal, directory, filepath, HUnit
-     , mtl, mtl-compat, old-locale, old-time, parsec, pretty-show
-     , regex-tdfa, regexpr, safe, split, test-framework
-     , test-framework-hunit, time, transformers, utf8-string
+     , mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa
+     , regexpr, safe, split, test-framework, test-framework-hunit, time
+     , transformers, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
        version = "0.25";
+       revision = "2";
        sha256 = "0p0j69gyd9q6rx86vzrqaclf4jys1d60rw5344danb2m3vgv7c21";
+       editedCabalFile = "1ff33c2f9bb3163aaac70aa78d622e42a19f3eaa0f37391e90352dbb663a7837";
        buildDepends = [
          array base base-compat blaze-markup bytestring cmdargs containers
-         csv Decimal directory filepath HUnit mtl mtl-compat old-locale
-         old-time parsec pretty-show regex-tdfa regexpr safe split time
-         transformers utf8-string
+         csv Decimal directory filepath HUnit mtl mtl-compat old-time parsec
+         pretty-show regex-tdfa regexpr safe split time transformers
+         utf8-string
        ];
        testDepends = [
          array base base-compat blaze-markup cmdargs containers csv Decimal
-         directory filepath HUnit mtl mtl-compat old-locale old-time parsec
-         pretty-show regex-tdfa regexpr safe split test-framework
-         test-framework-hunit time transformers
+         directory filepath HUnit mtl mtl-compat old-time parsec pretty-show
+         regex-tdfa regexpr safe split test-framework test-framework-hunit
+         time transformers
        ];
+       jailbreak = true;
        homepage = "http://hledger.org";
        description = "Core data types, parsers and utilities for the hledger accounting tool";
        license = "GPL";
@@ -62667,28 +64373,29 @@ self: {
     ({ mkDerivation, base, base-compat, blaze-html, blaze-markup
      , bytestring, clientsession, cmdargs, conduit-extra, data-default
      , directory, filepath, hjsmin, hledger, hledger-lib, hspec
-     , http-client, http-conduit, HUnit, json, network-conduit
-     , old-locale, parsec, regexpr, safe, shakespeare, template-haskell
-     , text, time, transformers, wai, wai-extra, wai-handler-launch
-     , warp, yaml, yesod, yesod-core, yesod-form, yesod-static
-     , yesod-test
+     , http-client, http-conduit, HUnit, json, network-conduit, parsec
+     , regexpr, safe, shakespeare, template-haskell, text, time
+     , transformers, wai, wai-extra, wai-handler-launch, warp, yaml
+     , yesod, yesod-core, yesod-form, yesod-static, yesod-test
      }:
      mkDerivation {
        pname = "hledger-web";
        version = "0.25";
+       revision = "1";
        sha256 = "15rkmw9zg95ijsl4xchgm642y888fa76lxwpzg4qqb5gpjbflz9x";
+       editedCabalFile = "415979e85eb96e7108b25431fde2c08e8dbda6f613f72597bf467319b3e674e4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base base-compat blaze-html blaze-markup bytestring clientsession
          cmdargs conduit-extra data-default directory filepath hjsmin
          hledger hledger-lib http-client http-conduit HUnit json
-         network-conduit old-locale parsec regexpr safe shakespeare
-         template-haskell text time transformers wai wai-extra
-         wai-handler-launch warp yaml yesod yesod-core yesod-form
-         yesod-static
+         network-conduit parsec regexpr safe shakespeare template-haskell
+         text time transformers wai wai-extra wai-handler-launch warp yaml
+         yesod yesod-core yesod-form yesod-static
        ];
        testDepends = [ base base-compat hspec yesod yesod-test ];
+       jailbreak = true;
        homepage = "http://hledger.org";
        description = "A web interface for the hledger accounting tool";
        license = "GPL";
@@ -62704,6 +64411,7 @@ self: {
        buildDepends = [ base bindings-DSL bytestring ];
        testDepends = [ base hlint ];
        pkgconfigDepends = [ libbladeRF ];
+       jailbreak = true;
        homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
@@ -62750,6 +64458,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) git;  inherit (pkgs) openssl;};
 
+  "hlibsass" = callPackage
+    ({ mkDerivation, base, hspec, sass }:
+     mkDerivation {
+       pname = "hlibsass";
+       version = "0.1.1.0";
+       revision = "1";
+       sha256 = "1dq09m5ag63zzhfa5xkvh3vzrn2ywamvdl41gjrirmbiziqa86l8";
+       editedCabalFile = "768c79fd71253719dfd74821dbf070bd3d1ff30a298fd76d9e6c616bd4b5799a";
+       buildDepends = [ base ];
+       testDepends = [ base hspec ];
+       extraLibraries = [ sass ];
+       homepage = "https://github.com/jakubfijalkowski/hlibsass";
+       description = "Low-level bindings to libsass";
+       license = stdenv.lib.licenses.mit;
+     }) { sass = null;};
+
   "hlint" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
@@ -62757,8 +64481,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.19";
-       sha256 = "07wibincqgz0sqvc00c06r5am2iyiknrrnywc8023rafajv3079p";
+       version = "1.9.20";
+       sha256 = "1nm6z0v040ma5wkzfv8nhplpq7dnaf645bax2r3q5fj6j4cv1hzh";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -62823,6 +64547,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base monads-tf stm transformers unix X11 ];
+       jailbreak = true;
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -62837,6 +64562,7 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmark" = callPackage
@@ -62907,8 +64633,8 @@ self: {
     ({ mkDerivation, base, bytestring, cassava, hmatrix, vector }:
      mkDerivation {
        pname = "hmatrix-csv";
-       version = "0.1.0.1";
-       sha256 = "0xfh7gj4f5sb14j3m15mp9bddz90jk0g4qz0rjhfdwyd8k9k6hfp";
+       version = "0.1.0.2";
+       sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb";
        buildDepends = [ base bytestring cassava hmatrix vector ];
        homepage = "https://github.com/grtlr/hmatrix-csv";
        description = "CSV encoding and decoding for hmatrix";
@@ -63087,6 +64813,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmeap" = callPackage
@@ -63145,8 +64872,8 @@ self: {
     ({ mkDerivation, base, stm }:
      mkDerivation {
        pname = "hmidi";
-       version = "0.2.1.0";
-       sha256 = "143w042krxayn2xbn3ag3mkfd9j4075adrjqs651hh3mbr8s9725";
+       version = "0.2.2.0";
+       sha256 = "1khqhw69c3bf3qj8pzxz876xisr099rgdgf2rr101x83h9hj8acb";
        buildDepends = [ base stm ];
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Binding to the OS level MIDI services";
@@ -63171,6 +64898,7 @@ self: {
        homepage = "http://www.github.com/mboes/hmk";
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmm" = callPackage
@@ -63222,6 +64950,7 @@ self: {
        homepage = "http://code.google.com/p/hmpfr/";
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) mpfr;};
 
   "hmt" = callPackage
@@ -63304,6 +65033,7 @@ self: {
        ];
        buildTools = [ c2hs ];
        extraLibraries = [ netcdf ];
+       jailbreak = true;
        homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
@@ -63414,6 +65144,7 @@ self: {
        buildDepends = [
          base filemanip filepath fsnotify system-filepath text
        ];
+       jailbreak = true;
        homepage = "http://github.com/jhickner/hobbes";
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
@@ -63504,6 +65235,7 @@ self: {
        homepage = "http://www.kfish.org/software/hogg/";
        description = "Library and tools to manipulate the Ogg container format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hogre" = callPackage
@@ -63560,9 +65292,9 @@ self: {
      mkDerivation {
        pname = "hoist-error";
        version = "0.1.0.2";
-       revision = "1";
+       revision = "2";
        sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z";
-       editedCabalFile = "900b08c7b95c9490dfc65334b32c1fdcb4a578e458f47dbfa58108c433fe7a8a";
+       editedCabalFile = "fca4ac245a1bddf638317290deb580d05d1539c6a700b02744ce61e259e2e879";
        buildDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
@@ -63589,6 +65321,7 @@ self: {
        buildDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "holey-format" = callPackage
@@ -63628,6 +65361,7 @@ self: {
        homepage = "http://github.com/yogsototh/holy-project";
        description = "Start your Haskell project with cabal, git and tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "homeomorphic" = callPackage
@@ -63711,6 +65445,7 @@ self: {
          aeson base bytestring Cabal directory filepath hoogle monad-loops
          mtl process yaml
        ];
+       jailbreak = true;
        homepage = "http://github.com/gilligan/hoobuddy";
        description = "Simple tool for fetching and merging hoogle data";
        license = stdenv.lib.licenses.mit;
@@ -63726,6 +65461,7 @@ self: {
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hood-off" = callPackage
@@ -63737,6 +65473,7 @@ self: {
        buildDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodie" = callPackage
@@ -63755,6 +65492,7 @@ self: {
        jailbreak = true;
        description = "A small, toy roguelike";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle" = callPackage
@@ -63774,6 +65512,7 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-builder" = callPackage
@@ -63790,6 +65529,7 @@ self: {
        ];
        description = "text builder for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-core" = callPackage
@@ -63823,6 +65563,7 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXi;};
 
   "hoodle-extra" = callPackage
@@ -63868,6 +65609,7 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-publish" = callPackage
@@ -63892,6 +65634,7 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-render" = callPackage
@@ -63912,6 +65655,7 @@ self: {
        ];
        description = "Hoodle file renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-types" = callPackage
@@ -63927,6 +65671,7 @@ self: {
        ];
        description = "Data types for programs for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoogle" = callPackage
@@ -63939,8 +65684,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle";
-       version = "4.2.39";
-       sha256 = "0n3sh13lhg9aip1390by0wfdfsrnqz61zgs6ji143ak7fdff1559";
+       version = "4.2.40";
+       sha256 = "11clwdqgsg38lw0jc382xkazlgm8lpa7d8sydgi14wkgwy4v9zqv";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -63964,15 +65709,14 @@ self: {
      }:
      mkDerivation {
        pname = "hoogle-index";
-       version = "0.4.1";
-       sha256 = "09ax7y205ds8wb99qmwszclam8p9s9swv0byf0ap2qiz948gjfbg";
+       version = "0.4.2";
+       sha256 = "12hsajans11csbhiz7d187hx17h7s736g26cvmnahx9lgmgjgada";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base bytestring Cabal containers directory errors filepath hoogle
          optparse-applicative process temporary transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/hoogle-index";
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
@@ -63995,7 +65739,9 @@ self: {
      mkDerivation {
        pname = "hoopl";
        version = "3.10.0.2";
+       revision = "1";
        sha256 = "11j7xd82zx7ja08lsnnkfq39yzqc2wbgdxgnwsviml58bkp495yj";
+       editedCabalFile = "5067e0036ed0f2728f5d0d62580070bfa2537bc3aed5e649d1a136e70042cff9";
        buildDepends = [ base containers ];
        homepage = "http://ghc.cs.tufts.edu/hoopl/";
        description = "A library to support dataflow analysis and optimization";
@@ -64200,6 +65946,7 @@ self: {
        version = "0.1.1";
        sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4";
        buildDepends = [ AC-Angle base time ];
+       jailbreak = true;
        homepage = "https://github.com/intractable/horizon";
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
        license = stdenv.lib.licenses.bsd3;
@@ -64222,7 +65969,6 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "http://rd.slavepianos.org/t/hosc";
        description = "Haskell Open Sound Control";
        license = "GPL";
@@ -64324,7 +66070,6 @@ self: {
        homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hotswap" = callPackage
@@ -64338,6 +66083,7 @@ self: {
        homepage = "https://github.com/mikeplus64/hotswap";
        description = "Simple code hotswapping";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hourglass" = callPackage
@@ -64372,6 +66118,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Heap profiling helper library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hp2any-graph" = callPackage
@@ -64393,6 +66140,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
 
   "hp2any-manager" = callPackage
@@ -64430,23 +66178,46 @@ self: {
      }) {};
 
   "hp2pretty" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, containers
-     , filepath, floatshow, mtl
+    ({ mkDerivation, array, attoparsec, base, containers, filepath
+     , floatshow, mtl, text
      }:
      mkDerivation {
        pname = "hp2pretty";
-       version = "0.5";
-       sha256 = "1kjfvp29s8wwdwpkqx47qpqy5ybl1ynx42idraarngcv8i9bzfgm";
+       version = "0.6";
+       sha256 = "1bma881ljhwhzirj2q9rqf0bxx9xfy0ng2z9mrhdnaywnw4d8v4c";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         array attoparsec base bytestring containers filepath floatshow mtl
+         array attoparsec base containers filepath floatshow mtl text
        ];
-       homepage = "http://gitorious.org/hp2pretty";
+       homepage = "http://code.mathr.co.uk/hp2pretty";
        description = "generate pretty graphs from heap profiles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpack" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, deepseq, directory
+     , filepath, hspec, interpolate, mockery, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "hpack";
+       version = "0.1.2";
+       sha256 = "1rnsqgycnqp3z3hszq438h8hwm0s6gs5vykm620am36r6md3kmzh";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base base-compat deepseq directory filepath
+         unordered-containers yaml
+       ];
+       testDepends = [
+         aeson base base-compat deepseq directory filepath hspec interpolate
+         mockery unordered-containers yaml
+       ];
+       homepage = "https://github.com/sol/hpack#readme";
+       description = "An alternative format for Haskell packages";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hpaco" = callPackage
     ({ mkDerivation, aeson, base, cmdargs, filepath, hpaco-lib, strict
      , utf8-string, yaml
@@ -64460,6 +66231,7 @@ self: {
        buildDepends = [
          aeson base cmdargs filepath hpaco-lib strict utf8-string yaml
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/tdammers/hpaco";
        description = "Modular template compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -64478,6 +66250,7 @@ self: {
          aeson base bytestring containers data-variant file-embed filepath
          mtl parsec safe split strict transformers
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/tdammers/hpaco";
        description = "Modular template compiler library";
        license = stdenv.lib.licenses.bsd3;
@@ -64640,8 +66413,8 @@ self: {
      }:
      mkDerivation {
        pname = "hplayground";
-       version = "0.1.2.9";
-       sha256 = "090j08ygfjsmhyfdg0azl0qwfm0i96yyk67xnwyv1as56r2pvn6r";
+       version = "0.1.3.1";
+       sha256 = "15yri40046lap05b762k4nk9nly8k6cbypic790zfmhj9ljjq1bv";
        buildDepends = [
          base containers data-default haste-compiler haste-perch monads-tf
          transformers
@@ -64649,6 +66422,7 @@ self: {
        homepage = "https://github.com/agocorona/hplayground";
        description = "monadic, reactive Formlets running in the Web browser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hplaylist" = callPackage
@@ -64731,6 +66505,7 @@ self: {
        homepage = "http://code.haskell.org/protocol-buffers/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -64879,7 +66654,6 @@ self: {
        homepage = "http://github.com/paulrzcz/hquantlib.git";
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hquery" = callPackage
@@ -64930,21 +66704,21 @@ self: {
 
   "hruby" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, QuickCheck
-     , scientific, stm, text, unordered-containers, vector
+     , ruby, scientific, stm, text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1";
-       sha256 = "1w13j70r6b66nyjj2fsa1z1m5p8v0zil6jf31x0h0f222x4fvmih";
+       version = "0.3.1.2";
+       sha256 = "1w57k3c4y08mk0887knar33yg36hpk2z31lqwz4aiq3dnidvjmdz";
        buildDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
        ];
        testDepends = [ aeson attoparsec base QuickCheck text vector ];
+       extraLibraries = [ ruby ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) { inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
@@ -64986,6 +66760,7 @@ self: {
          tasty-quickcheck
        ];
        extraLibraries = [ b2 ];
+       jailbreak = true;
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
@@ -65014,6 +66789,7 @@ self: {
        testDepends = [ base HUnit ];
        description = "A Haskell framework for parallel monte carlo simulations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-carbon-examples" = callPackage
@@ -65118,6 +66894,7 @@ self: {
        homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gen-iface" = callPackage
@@ -65136,6 +66913,7 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -65158,8 +66936,8 @@ self: {
     ({ mkDerivation, base, haskell-src, hspec }:
      mkDerivation {
        pname = "hs-inspector";
-       version = "0.3.0.0";
-       sha256 = "0nr7g8z70cgxfzqqs331aj1f11va0hjd0am83hm8iwmyrqv9rbk1";
+       version = "0.4.0.0";
+       sha256 = "04i1jydalnc67zagz2ladidjxd0l4l9fl65apswylarm6pn7kfp1";
        buildDepends = [ base haskell-src ];
        testDepends = [ base haskell-src hspec ];
        description = "Haskell source code analyzer";
@@ -65183,6 +66961,7 @@ self: {
        ];
        description = "Java .class files assembler/disassembler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-json-rpc" = callPackage
@@ -65244,6 +67023,7 @@ self: {
        ];
        extraLibraries = [ mesos protobuf ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) mesos;  inherit (pkgs) protobuf;};
 
   "hs-nombre-generator" = callPackage
@@ -65255,8 +67035,10 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base HandsomeSoup hxt random ];
+       jailbreak = true;
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-pgms" = callPackage
@@ -65296,6 +67078,7 @@ self: {
        version = "0.2.1.0";
        sha256 = "09v2kp643asl3zpv8rbb8a7zv0h3bn5l4gxz44d71kly9qr3jkhh";
        buildDepends = [ base data-default-class text ];
+       jailbreak = true;
        homepage = "https://github.com/trskop/hs-pkg-config";
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
@@ -65331,6 +67114,7 @@ self: {
        version = "0.1.0";
        sha256 = "0rx7shfjyi9k910mvzskykqxnijl8rrh08c0bkqlmqwisyhl7wbb";
        buildDepends = [ array base regex-base regex-posix ];
+       jailbreak = true;
        description = "Easy to use Regex";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -65355,6 +67139,7 @@ self: {
        homepage = "https://github.com/codygman/hs-scrape/";
        description = "Simple and easy web scraping and automation in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-twitter" = callPackage
@@ -65398,6 +67183,7 @@ self: {
        homepage = "http://qrcard.us/";
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs2048" = callPackage
@@ -65506,6 +67292,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { xenctrl = null;};
 
+  "hsass" = callPackage
+    ({ mkDerivation, base, data-default-class, filepath, hlibsass
+     , hspec, hspec-discover, monad-loops, mtl, temporary
+     }:
+     mkDerivation {
+       pname = "hsass";
+       version = "0.1.0";
+       sha256 = "1hl0lpjkzxhd4svkfvzl6p8gg32qvkggqdphz14fi11p34ksf41i";
+       buildDepends = [
+         base data-default-class filepath hlibsass monad-loops mtl
+       ];
+       testDepends = [
+         base data-default-class hspec hspec-discover temporary
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/jakubfijalkowski/hsass";
+       description = "Integrating Sass into Haskell applications";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hsay" = callPackage
     ({ mkDerivation, base, Hclip, HTTP, process, unix }:
      mkDerivation {
@@ -65515,6 +67321,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base Hclip HTTP process unix ];
+       jailbreak = true;
        description = "(ab)Use Google Translate as a speech synthesiser";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -65563,8 +67370,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsbencher";
-       version = "1.20.0.3";
-       sha256 = "1qnj4zhq6j4cvnxcparm2xr9qc6l9q7j72h4dr5jz04lz8c2fkcl";
+       version = "1.20.0.5";
+       sha256 = "1fqp0n106dnqik3p6fa60xkamls8wgg8c5sp2klgp36n3xflvy9h";
        buildDepends = [
          async base bytestring containers data-default directory filepath
          GenericPretty io-streams mtl process random time unix
@@ -65584,14 +67391,13 @@ self: {
      }:
      mkDerivation {
        pname = "hsbencher-codespeed";
-       version = "0.1";
-       sha256 = "1mq2d5sl0r6maw3sajqs3mcwmc37kr6pkf6qplpl5hskv8i3i7ni";
+       version = "0.1.0.1";
+       sha256 = "1a3hac73mzd0q25b1xbdh121k33m12phpxfn6hh7qcg5yys2i8l5";
        buildDepends = [
          base bytestring containers data-default directory filepath
          hsbencher HTTP http-conduit http-types json mtl network resourcet
          time
        ];
-       jailbreak = true;
        description = "Backend for uploading benchmark data to CodeSpeed";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65599,21 +67405,22 @@ self: {
   "hsbencher-fusion" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, csv
      , data-default, directory, filepath, handa-gdata, hsbencher
-     , http-conduit, mtl, network, statistics, text, time
+     , http-conduit, mtl, network, split, statistics, text, time
      }:
      mkDerivation {
        pname = "hsbencher-fusion";
-       version = "0.3.4";
-       sha256 = "078jzxvlka273nlpfsl9l3sbga2qbnm9hqdprpaks1xrldzzg949";
+       version = "0.3.15.2";
+       sha256 = "0xp2jm5zvrx5sz2mniachd7hjmhmf0sv9as3dzln8693n6l1ak4r";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring containers criterion csv data-default directory
-         filepath handa-gdata hsbencher http-conduit mtl network statistics
-         text time
+         filepath handa-gdata hsbencher http-conduit mtl network split
+         statistics text time
        ];
        description = "Backend for uploading benchmark data to Google Fusion Tables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc2hs" = callPackage
@@ -65638,8 +67445,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsc3";
-       version = "0.15";
-       sha256 = "1rmxl1wcly74bjkw79zw9ydmiclk5716w75b4nz8xkqraijiafrg";
+       version = "0.15.1";
+       sha256 = "1ad5q4rq82v7l556rinaiikglr1kjswi5raw0dxqwsfjbp8imbha";
        buildDepends = [
          base binary bytestring containers data-default data-ordlist
          directory filepath hashable hosc network process random safe split
@@ -66059,6 +67866,7 @@ self: {
          process pure-cdb uniplate vector
        ];
        testDepends = [ base directory mtl process test-simple Unixutils ];
+       jailbreak = true;
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -66076,6 +67884,7 @@ self: {
        homepage = "http://ui3.info/darcs/hscrtmpl/";
        description = "Haskell shell script template";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscurses" = callPackage
@@ -66159,6 +67968,7 @@ self: {
        homepage = "http://neugierig.org/software/darcs/hsdip/";
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsdns" = callPackage
@@ -66188,6 +67998,7 @@ self: {
        homepage = "https://github.com/bazqux/hsdns-cache";
        description = "Caching asynchronous DNS resolver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hse-cpp" = callPackage
@@ -66263,6 +68074,7 @@ self: {
        homepage = "https://github.com/tmhedberg/hsenv";
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hserv" = callPackage
@@ -66297,6 +68109,7 @@ self: {
        homepage = "https://github.com/emmanueltouzery/hsexif";
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsfacter" = callPackage
@@ -66336,6 +68149,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base ghc ];
+       jailbreak = true;
        description = "Z-decoder";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -66434,8 +68248,8 @@ self: {
     ({ mkDerivation, base, haskeline }:
      mkDerivation {
        pname = "hsilop";
-       version = "0.1.0.0";
-       sha256 = "1yaghdyw94ynq5wg6qk5yswrwwf4vx6j7kpl43alym8dh754npw5";
+       version = "0.1.1.0";
+       sha256 = "001wwlwxd3qb3mcpn0l5qmd7nvpy8qlrcr5j3s5111pgfi8ib0sn";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base haskeline ];
@@ -66469,21 +68283,20 @@ self: {
 
   "hsini" = callPackage
     ({ mkDerivation, base, bytestring, containers, HUnit, mtl, parsec
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, test-framework-th
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, tasty-th
      }:
      mkDerivation {
        pname = "hsini";
-       version = "0.3.1";
-       sha256 = "06cys4i1nsic13dkp5jgammm3qykzizlnp6wdka2vl699rvnzaaf";
+       version = "0.4.2";
+       sha256 = "1zkrfc2zyhcwy7l1k8kn0k2qv6jkxw0d6h6bifzh6d5h01ws72mr";
        buildDepends = [ base bytestring containers mtl parsec ];
        testDepends = [
-         base bytestring containers HUnit mtl parsec QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-         test-framework-th
+         base bytestring containers HUnit mtl parsec QuickCheck tasty
+         tasty-hunit tasty-quickcheck tasty-th
        ];
        description = "Package for user configuration files (INI)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hskeleton" = callPackage
@@ -66510,6 +68323,7 @@ self: {
        homepage = "http://code.haskell.org/~arossato/hslackbuilder";
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslibsvm" = callPackage
@@ -66564,6 +68378,7 @@ self: {
        version = "2.0.2";
        sha256 = "0qkyclj9fajvzbfcs0ik8ncy66x916r40jd85r4wi5nh482i7sp3";
        buildDepends = [ base hslogger mtl template-haskell ];
+       jailbreak = true;
        description = "Automatic generation of hslogger functions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -66662,6 +68477,7 @@ self: {
        homepage = "http://foo/bar/baz.html";
        description = "A collection of miscellaneous modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsmtpclient" = callPackage
@@ -66734,6 +68550,7 @@ self: {
        homepage = "https://github.com/mrdomino/hsnock/";
        description = "Nock 5K interpreter";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsnoise" = callPackage
@@ -66906,8 +68723,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.1.5";
-       sha256 = "0lj8inhp0lxh23ayc3wcj5c7rslwr4q6s6wqswhda0v3cz3lfmsc";
+       version = "2.1.7";
+       sha256 = "096rfq7ss5hvy1wcc9fdb4svnfiy96p79xh7vj3h7radh2wggfwv";
        buildDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
@@ -66953,13 +68770,17 @@ self: {
      }) {};
 
   "hspec-contrib" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, HUnit, QuickCheck }:
+    ({ mkDerivation, base, hspec, hspec-core, HUnit, logging-facade
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "hspec-contrib";
-       version = "0.2.0";
-       sha256 = "0p6jh3j84cq66gfp2pk957ha4ds7797vfbfri9lsg9gd4998dwkq";
-       buildDepends = [ base hspec-core HUnit ];
-       testDepends = [ base hspec hspec-core HUnit QuickCheck ];
+       version = "0.2.1";
+       sha256 = "0m7h0bl34qp8yc5pdlk9hn3a9drd11qy7qkqx3lqh2kzr7wbffj0";
+       buildDepends = [ base hspec-core HUnit logging-facade ];
+       testDepends = [
+         base hspec hspec-core HUnit logging-facade QuickCheck
+       ];
        homepage = "http://hspec.github.io/";
        description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
@@ -66973,8 +68794,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.1.5";
-       sha256 = "1za9ybkcqrzgrmqvzijvw471yk5kjhp0pr0n47n4f4cy0ha7l0fb";
+       version = "2.1.7";
+       sha256 = "1ifwsqa8ay8f8l96k37rawxjya0qs72bcifxfr5hlz3gagg4a02b";
        buildDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -66993,8 +68814,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.1.5";
-       sha256 = "03bs5gxzhn605f8k7wdm629kzsmxy5mjb1v834q69f3w1iczx304";
+       version = "2.1.7";
+       sha256 = "0gh9kn9ds50xl0zin5vbablf4dpfiabi96sz2a4xsxlskfjflhl0";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base directory filepath ];
@@ -67037,7 +68858,9 @@ self: {
      mkDerivation {
        pname = "hspec-expectations-lifted";
        version = "0.5.0";
+       revision = "1";
        sha256 = "0c3fxgwxjwqgwpnlxlbp2amhk44m34iq2lxs1rxkp3vjwkqi2m8b";
+       editedCabalFile = "43e88e0e7587ba1965ba3f2416500c239ad44ba19043bb249c6f307665e85208";
        buildDepends = [ base hspec-expectations transformers ];
        testDepends = [ base hspec ];
        description = "A version of hspec-expectations generalized to MonadIO";
@@ -67055,6 +68878,7 @@ self: {
        buildDepends = [
          base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo
        ];
+       jailbreak = true;
        homepage = "https://github.com/hspec/hspec-expectations#readme";
        description = "hspec-expectations with pretty printing on failure";
        license = stdenv.lib.licenses.mit;
@@ -67166,20 +68990,20 @@ self: {
   "hspec-snap" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , digestive-functors, directory, HandsomeSoup, hspec, hspec-core
-     , hxt, lens, mtl, snap, snap-core, snap-extras, text, transformers
+     , hxt, lens, mtl, snap, snap-core, text, transformers
      }:
      mkDerivation {
        pname = "hspec-snap";
-       version = "0.3.2.3";
-       sha256 = "187j2fhiwv3v2rlh1h9jdxpywdms9n37yp3597dmsbq2kggzsigh";
+       version = "0.3.2.6";
+       sha256 = "12kmkixr7azd33r5fx3z4siw0xdkda4sfxwi75vlm5w9w07ackpn";
        buildDepends = [
          base bytestring containers digestive-functors HandsomeSoup hspec
          hspec-core hxt lens mtl snap snap-core text transformers
        ];
        testDepends = [
          aeson base bytestring containers digestive-functors directory
-         HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core
-         snap-extras text transformers
+         HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
+         transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/dbp/hspec-snap";
@@ -67368,6 +69192,7 @@ self: {
        ];
        description = "The Haskell Stream Processor command line utility";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsql" = callPackage
@@ -67465,9 +69290,11 @@ self: {
        buildDepends = [
          base containers deepseq directory hsqml OddWord text
        ];
+       jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -67520,6 +69347,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hsreadability" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
+     , data-default, file-embed, http-conduit, http-types, HUnit
+     , test-framework, test-framework-hunit, text, xsd
+     }:
+     mkDerivation {
+       pname = "hsreadability";
+       version = "1.0.0.0";
+       revision = "1";
+       sha256 = "0q4sqx7xjsa8jplrdzirdlh6170ckqags02idjknwpc48plarnaw";
+       editedCabalFile = "e0b87a28497a4730024ce1459c7812d519027e8b90aa863dac85dd251558fa23";
+       buildDepends = [
+         aeson authenticate-oauth base bytestring data-default http-conduit
+         http-types text xsd
+       ];
+       testDepends = [
+         aeson base file-embed HUnit test-framework test-framework-hunit
+         text
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/rasendubi/hsreadability";
+       description = "Access to the Readability API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hsshellscript" = callPackage
     ({ mkDerivation, base, c2hs, directory, parsec, random, unix }:
      mkDerivation {
@@ -67732,6 +69584,7 @@ self: {
        homepage = "http://www.dcc.fc.up.pt/~pbv/stuff/hstzaar";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsubconvert" = callPackage
@@ -67818,6 +69671,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -67839,8 +69693,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsx2hs";
-       version = "0.13.3.1";
-       sha256 = "12hj4vqkz097kjf2gk40jj9r61sydfmlhm6b5r0z1q96ys9m82k9";
+       version = "0.13.3.2";
+       sha256 = "1vpq6a1379h7lmxcmwdb0r81gda2zn4lv02xslrixszsb757l1ck";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -67905,8 +69759,8 @@ self: {
      }) {};
 
   "htar" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib, directory, filepath
-     , old-locale, tar, time, zlib
+    ({ mkDerivation, base, bytestring, bzlib, directory, filepath, tar
+     , time, zlib
      }:
      mkDerivation {
        pname = "htar";
@@ -67915,7 +69769,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bytestring bzlib directory filepath old-locale tar time zlib
+         base bytestring bzlib directory filepath tar time zlib
        ];
        description = "Command-line tar archive utility";
        license = stdenv.lib.licenses.bsd3;
@@ -67995,8 +69849,27 @@ self: {
        testDepends = [
          attoparsec base hspec QuickCheck regex-pcre-builtin text
        ];
+       jailbreak = true;
        description = "Validating an email address against HTML standard";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "html-entities" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, directory, doctest
+     , filepath, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "html-entities";
+       version = "1.0.1.0";
+       sha256 = "0s44w6nhp6xlibh1740paa21rbjvbnkhjdf35d9yw5hycjwyjwqc";
+       buildDepends = [
+         attoparsec base-prelude text unordered-containers
+       ];
+       testDepends = [ base base-prelude directory doctest filepath ];
+       homepage = "https://github.com/nikita-volkov/html-entities";
+       description = "A codec library for HTML-escaped text and HTML-entities";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "html-kure" = callPackage
@@ -68030,11 +69903,31 @@ self: {
        version = "0.1.0.1";
        sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw";
        buildDepends = [ base lens mtl tagsoup transformers ];
+       jailbreak = true;
        homepage = "http://github.com/kylcarte/html-rules/";
        description = "Perform traversals of HTML structures using sets of rules";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "html-tokenizer" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, case-insensitive
+     , conversion, conversion-case-insensitive, conversion-text
+     , directory, doctest, filepath, html-entities, text
+     }:
+     mkDerivation {
+       pname = "html-tokenizer";
+       version = "0.2.1.2";
+       sha256 = "0pq4bmh0bn9z95014h1n98m4jjjhkcnr65dlxhp9mkf0fkh5hb21";
+       buildDepends = [
+         attoparsec base-prelude case-insensitive conversion
+         conversion-case-insensitive conversion-text html-entities text
+       ];
+       testDepends = [ base base-prelude directory doctest filepath ];
+       homepage = "https://github.com/nikita-volkov/html-tokenizer";
+       description = "An \"attoparsec\"-based HTML tokenizer";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "html-truncate" = callPackage
     ({ mkDerivation, base, tagsoup }:
      mkDerivation {
@@ -68072,8 +69965,8 @@ self: {
     ({ mkDerivation, base, containers, text }:
      mkDerivation {
        pname = "html5-entity";
-       version = "0.2.0.2";
-       sha256 = "1vy47b9k71jjrrhgakq9hla67cf006fvj6ggqxq14b0a1bclfkf7";
+       version = "0.2.0.3";
+       sha256 = "0bmmzshxanzw5y2y0hvgzz9yw18jqgv535i1xq2a5lf7w8wpj1if";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers text ];
@@ -68094,6 +69987,7 @@ self: {
        homepage = "http://github.com/pirapira/htodo";
        description = "A todo application";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htoml" = callPackage
@@ -68205,6 +70099,7 @@ self: {
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-accept" = callPackage
@@ -68234,22 +70129,21 @@ self: {
 
   "http-client" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, clock, containers
-     , cookie, data-default-class, deepseq, directory, exceptions
-     , filepath, ghc-prim, hspec, http-types, mime-types, monad-control
-     , network, network-uri, publicsuffixlist, random, streaming-commons
-     , text, time, transformers, zlib
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ghc-prim, hspec, http-types, mime-types, monad-control, network
+     , network-uri, random, streaming-commons, text, time, transformers
+     , zlib
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.11";
-       sha256 = "0lzrvkja3na2s6r4ixgnj7fx8gjm02bxxs101d69d6s3b0n80phb";
+       version = "0.4.11.2";
+       sha256 = "074qh0yj3i4q6m88jccp59vpv5prdwglrrcglsr5k89g06hx4xb2";
        buildDepends = [
          array base base64-bytestring blaze-builder bytestring
-         case-insensitive clock containers cookie data-default-class deepseq
+         case-insensitive containers cookie data-default-class deepseq
          exceptions filepath ghc-prim http-types mime-types network
-         network-uri publicsuffixlist random streaming-commons text time
-         transformers
+         network-uri random streaming-commons text time transformers
        ];
        testDepends = [
          async base base64-bytestring blaze-builder bytestring
@@ -68396,8 +70290,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-common";
-       version = "0.7.2.0";
-       sha256 = "0w83qz35aaxc2k3qqpamh8anqxr7w3vym5qh40w1a8n4x00pm960";
+       version = "0.8.2.0";
+       sha256 = "14s5a178sb2vm5k00rs21760mds5dz2gs10k9iyn22h01mxyf599";
        buildDepends = [
          base base64-bytestring blaze-builder bytestring case-insensitive
          directory mtl network text transformers unordered-containers
@@ -68481,6 +70375,7 @@ self: {
        homepage = "https://github.com/bazqux/http-conduit-downloader";
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-date" = callPackage
@@ -68513,6 +70408,7 @@ self: {
        homepage = "http://github.com/achudnov/http-encodings";
        description = "A library for encoding and decoding bodies of HTTP messages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-enumerator" = callPackage
@@ -68720,8 +70616,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-streams";
-       version = "0.7.2.6";
-       sha256 = "1n44cscyrwrp71j96kjbwhak8c7hy4pjgp4b4p6ygm1hiy2xx1b7";
+       version = "0.8.3.1";
+       sha256 = "13fdwyq50d5gipvdxmi125bn7aqhc3zqbi8jikir3l8bigfby5w0";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          case-insensitive directory HsOpenSSL http-common io-streams mtl
@@ -68736,9 +70632,11 @@ self: {
          snap-core snap-server system-fileio system-filepath text
          transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://research.operationaldynamics.com/projects/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-test" = callPackage
@@ -68758,6 +70656,7 @@ self: {
        homepage = "https://github.com/openbrainsrc/http-test";
        description = "Test framework for HTTP APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-types" = callPackage
@@ -68869,6 +70768,7 @@ self: {
        homepage = "https://github.com/fmap/https-everywhere-rules-raw";
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "httpspec" = callPackage
@@ -69139,6 +71039,7 @@ self: {
        homepage = "http://github.com/hunt-framework/";
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunt-server" = callPackage
@@ -69226,6 +71127,7 @@ self: {
        homepage = "http://justinethier.github.com/husk-scheme";
        description = "R5RS Scheme interpreter, compiler, and library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "husk-scheme-libs" = callPackage
@@ -69242,6 +71144,7 @@ self: {
        homepage = "http://justinethier.github.com/husk-scheme";
        description = "Extra libraries for the husk Scheme platform";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "husky" = callPackage
@@ -69264,6 +71167,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hutton" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, connection, flow
+     , http-client, http-conduit, http-types, network, rainbow
+     , regex-compat, text, time, transformers, websockets, wuss
+     }:
+     mkDerivation {
+       pname = "hutton";
+       version = "1.0.0";
+       sha256 = "12rvlagd0n946x05wnyixd1b16ls9ynagccw2bc77fjqfb0d9shi";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring connection flow http-client http-conduit
+         http-types network rainbow regex-compat text time transformers
+         websockets wuss
+       ];
+       jailbreak = true;
+       description = "A program for the button on Reddit";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "huzzy" = callPackage
     ({ mkDerivation, base, easyplot }:
      mkDerivation {
@@ -69271,6 +71196,7 @@ self: {
        version = "0.1.5.5";
        sha256 = "0i8h380nszd7hk7x6l7qx0ri6k12551li2m77gspzakcf47l6ldp";
        buildDepends = [ base easyplot ];
+       jailbreak = true;
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69450,7 +71376,7 @@ self: {
 
   "hxt-cache" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
-     , directory, filepath, hxt, old-locale, SHA, time, unix
+     , directory, filepath, hxt, SHA, time, unix
      }:
      mkDerivation {
        pname = "hxt-cache";
@@ -69458,7 +71384,7 @@ self: {
        sha256 = "1ki3h9x186c6p1c6hnczr0a1idil6kfvs2jl9d9hmzp9rlmh2w7l";
        buildDepends = [
          base binary bytestring containers deepseq directory filepath hxt
-         old-locale SHA time unix
+         SHA time unix
        ];
        homepage = "https://github.com/UweSchmidt/hxt";
        description = "Cache for HXT XML Documents and other binary data";
@@ -69566,10 +71492,8 @@ self: {
     ({ mkDerivation, base, hxt, mtl }:
      mkDerivation {
        pname = "hxt-pickle-utils";
-       version = "0.1.0.2";
-       revision = "1";
-       sha256 = "06v4935lljcyyx4a5v0z4id3fz4v28aghsrzr94k6diibpnwcdz2";
-       editedCabalFile = "89173b402c57c3ee7ee0eb2814e58d81e46cce5742a4f01684980b841359d2fb";
+       version = "0.1.0.3";
+       sha256 = "1id9459yphsbxqa0z89dhsmqqcgvk2axv91d05aw3n6r4ygs3nwx";
        buildDepends = [ base hxt mtl ];
        homepage = "https://github.com/silkapp/hxt-pickle-utils";
        description = "Utility functions for using HXT picklers";
@@ -69751,6 +71675,7 @@ self: {
        homepage = "http://github.com/ekmett/hybrid-vectors";
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydra-hs" = callPackage
@@ -69796,6 +71721,7 @@ self: {
        homepage = "https://github.com/rrnewton/hydra-print";
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen" = callPackage
@@ -69812,6 +71738,7 @@ self: {
        homepage = "https://www.github.com/ktvoelker/hydrogen";
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-cli" = callPackage
@@ -69850,6 +71777,7 @@ self: {
        homepage = "https://scravy.de/hydrogen-cli-args/";
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-data" = callPackage
@@ -69863,6 +71791,7 @@ self: {
        homepage = "https://scravy.de/hydrogen-data/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-multimap" = callPackage
@@ -69888,6 +71817,7 @@ self: {
        homepage = "https://scravy.de/hydrogen-parsing/";
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-prelude" = callPackage
@@ -69908,6 +71838,7 @@ self: {
        homepage = "http://scravy.de/hydrogen-prelude/";
        description = "Hydrogen Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-prelude-parsec" = callPackage
@@ -69921,6 +71852,7 @@ self: {
        homepage = "http://scravy.de/hydrogen-prelude-parsec/";
        description = "Hydrogen Prelude /w Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-syntax" = callPackage
@@ -70077,6 +72009,7 @@ self: {
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperpublic" = callPackage
@@ -70155,6 +72088,7 @@ self: {
        homepage = "https://github.com/zoetic-community/hypher";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hzk" = callPackage
@@ -70232,9 +72166,11 @@ self: {
          data-default mime mtl network network-uri old-locale parsec text
          time
        ];
+       jailbreak = true;
        homepage = "http://github.com/tingtun/iCalendar";
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iException" = callPackage
@@ -70261,9 +72197,11 @@ self: {
          base containers iso3166-country-codes text unordered-containers
        ];
        testDepends = [ base HUnit tasty tasty-hunit text ];
+       jailbreak = true;
        homepage = "https://github.com/ibotty/iban";
        description = "Validate and generate IBANs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iconv" = callPackage
@@ -70275,6 +72213,7 @@ self: {
        buildDepends = [ base bytestring ];
        description = "String encoding conversion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ide-backend" = callPackage
@@ -70344,17 +72283,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ide-backend-server" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, Cabal, containers
+     , data-accessor, data-accessor-mtl, directory, filemanip, filepath
+     , ghc, haddock-api, ide-backend-common, mtl, process, temporary
+     , text, time, transformers, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ide-backend-server";
+       version = "0.9.0";
+       sha256 = "0kljg5dpcxhk4dr8mi5ywb0ykygqm9p89rinyk1i2fqdcvza89rm";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         array async base bytestring Cabal containers data-accessor
+         data-accessor-mtl directory filemanip filepath ghc haddock-api
+         ide-backend-common mtl process temporary text time transformers
+         unix unordered-containers
+       ];
+       description = "An IDE backend server";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ideas" = callPackage
-    ({ mkDerivation, array, base, cgi, containers, directory, filepath
-     , parsec, QuickCheck, random, time, uniplate, wl-pprint
+    ({ mkDerivation, array, base, bytestring, containers, Diff
+     , directory, exceptions, filepath, mtl, multipart, network
+     , old-locale, old-time, parsec, QuickCheck, random, time, uniplate
+     , wl-pprint, xhtml
      }:
      mkDerivation {
        pname = "ideas";
-       version = "1.2";
-       sha256 = "13mj1xa1bpr0bj9id00vcm6fnai7cf2289s6gs52rmkbnhkp998m";
+       version = "1.3.1";
+       sha256 = "1rwvnxih9lb8hw3wvnv377z78szdq80qsrspnxbdqf37kfdw3fx0";
        buildDepends = [
-         array base cgi containers directory filepath parsec QuickCheck
-         random time uniplate wl-pprint
+         array base bytestring containers Diff directory exceptions filepath
+         mtl multipart network old-locale old-time parsec QuickCheck random
+         time uniplate wl-pprint xhtml
        ];
        jailbreak = true;
        homepage = "http://ideas.cs.uu.nl/www/";
@@ -70369,8 +72333,8 @@ self: {
      }:
      mkDerivation {
        pname = "ideas-math";
-       version = "1.1";
-       sha256 = "1wvxkav9c7d2na9wkzkl4pxhwihlw6iqdjga7gbjy7pmqn8xja51";
+       version = "1.2";
+       sha256 = "1s3pryjzc7dkmfdfrysag1w1j752y29cga4040a8fag10n9w7rr2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base containers ideas parsec QuickCheck random ];
@@ -70496,6 +72460,7 @@ self: {
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) boehmgc;  inherit (pkgs) gmp;};
 
   "ieee" = callPackage
@@ -70650,9 +72615,11 @@ self: {
        sha256 = "04ipbhry1v3cpkflshqa9sp46px0k6g67n8apvdqykk5fsssdpm1";
        editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f";
        buildDepends = [ ad base polynomial ];
+       jailbreak = true;
        homepage = "https://github.com/dmcclean/igrf";
        description = "International Geomagnetic Reference Field";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell" = callPackage
@@ -70694,6 +72661,7 @@ self: {
        homepage = "http://gibiansky.github.io/IHaskell/";
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -70707,9 +72675,11 @@ self: {
        buildDepends = [
          aeson aeson-pretty base chunked-data classy-prelude here ihaskell
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-basic" = callPackage
@@ -70719,9 +72689,11 @@ self: {
        version = "0.2.0.0";
        sha256 = "0xf2z4xr0gkq3zvpiwvl73b6wbql4x8fdbw81kz990ifb0vwq65w";
        buildDepends = [ base classy-prelude ihaskell ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-blaze" = callPackage
@@ -70735,9 +72707,11 @@ self: {
        buildDepends = [
          base blaze-html blaze-markup classy-prelude ihaskell
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-charts" = callPackage
@@ -70752,9 +72726,11 @@ self: {
          base bytestring Chart Chart-cairo classy-prelude data-default-class
          directory ihaskell
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-diagrams" = callPackage
@@ -70769,6 +72745,7 @@ self: {
          base bytestring classy-prelude diagrams diagrams-cairo diagrams-lib
          directory ihaskell
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
@@ -70785,6 +72762,7 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-hatex" = callPackage
@@ -70794,9 +72772,11 @@ self: {
        version = "0.2.0.0";
        sha256 = "02ynqhirz8bblcfaxksgxxqgnkmxqazj8imwxc2gbrw2v3p0i39s";
        buildDepends = [ base HaTeX ihaskell text ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -70810,9 +72790,11 @@ self: {
        buildDepends = [
          base bytestring classy-prelude directory ihaskell JuicyPixels
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-magic" = callPackage
@@ -70828,6 +72810,7 @@ self: {
          base base64-bytestring bytestring classy-prelude ihaskell
          ipython-kernel magic text utf8-string
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
@@ -70846,9 +72829,11 @@ self: {
          aeson base classy-prelude here ihaskell parsec random
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -70864,6 +72849,7 @@ self: {
          base base64-bytestring blaze-html bytestring directory filepath
          ihaskell ihaskell-blaze Rlang-QQ split stm template-haskell xformat
        ];
+       jailbreak = true;
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71083,6 +73069,7 @@ self: {
        ];
        description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -71186,6 +73173,7 @@ self: {
        homepage = "http://github.com/tomahawkins/improve/wiki/ImProve";
        description = "An imperative, verifiable programming language for high assurance applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inc-ref" = callPackage
@@ -71234,6 +73222,7 @@ self: {
        testDepends = [ base bytestring ];
        description = "Inclusion of files in executables at compile-time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-computing" = callPackage
@@ -71253,6 +73242,7 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-parser" = callPackage
@@ -71282,6 +73272,7 @@ self: {
        homepage = "http://github.com/sebfisch/incremental-sat-solver";
        description = "Simple, Incremental SAT Solving as a Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "increments" = callPackage
@@ -71352,8 +73343,10 @@ self: {
        sha256 = "01d7025js5a3373a8ixl3clvmd0blpkly6js3ggnp26p4h5ilhv4";
        editedCabalFile = "dbc4c7390f6664ca0ad083bb005897e6f3ca5dca5e95709621c131d7a1a0f09f";
        buildDepends = [ base ];
+       jailbreak = true;
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indexed" = callPackage
@@ -71415,6 +73408,7 @@ self: {
        buildDepends = [ base gtk HDBC HDBC-sqlite3 ];
        description = "Indian Language Font Converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indices" = callPackage
@@ -71450,6 +73444,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "infernu" = callPackage
+    ({ mkDerivation, base, containers, digits, either, fgl
+     , language-ecmascript, mtl, optparse-applicative, parsec
+     , transformers
+     }:
+     mkDerivation {
+       pname = "infernu";
+       version = "0.0.0.1";
+       sha256 = "0m4azl5pxypnf3q9riwf1gkwlfwrw5dswgrr2y9j1myb812ag5qn";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         base containers digits either fgl language-ecmascript mtl
+         optparse-applicative parsec transformers
+       ];
+       homepage = "https://github.com/sinelaw/infernu";
+       description = "Type inference and checker for JavaScript (experimental)";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "infinite-search" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -71487,6 +73502,7 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inflections" = callPackage
@@ -71495,8 +73511,8 @@ self: {
      }:
      mkDerivation {
        pname = "inflections";
-       version = "0.1.0.9";
-       sha256 = "10l7dnjc6h75bf61rp38w7pqm6yqvhssvjqmh01nwa2bxxayzl7m";
+       version = "0.1.0.10";
+       sha256 = "0v9iz9q4f5cx2hr0afvbzy5ax71kx1klbjrla14bqdfh55hzdhrp";
        buildDepends = [ base containers parsec ];
        testDepends = [
          base containers HUnit parsec QuickCheck test-framework
@@ -71637,6 +73653,7 @@ self: {
        version = "0.1.2";
        sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477";
        buildDepends = [ attoparsec base bytestring dlist ];
+       jailbreak = true;
        homepage = "http://github.com/tel/inserts";
        description = "Stupid simple bytestring templates";
        license = stdenv.lib.licenses.mit;
@@ -71669,6 +73686,7 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "instant-zipper" = callPackage
@@ -71707,16 +73725,16 @@ self: {
      }) {};
 
   "int-cast" = callPackage
-    ({ mkDerivation, base, nats, QuickCheck, test-framework
+    ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "int-cast";
        version = "0.1.2.0";
        sha256 = "0gfx3pg0n1jyn8z2q804iyc24ahi41sjr3h7v5ivzc3g57vi1ykb";
-       buildDepends = [ base nats ];
+       buildDepends = [ base ];
        testDepends = [
-         base nats QuickCheck test-framework test-framework-quickcheck2
+         base QuickCheck test-framework test-framework-quickcheck2
        ];
        homepage = "https://github.com/hvr/int-cast";
        description = "Checked conversions between integral types";
@@ -71732,7 +73750,6 @@ self: {
        sha256 = "0sh01sbib7z0bx934a7gq6583hdz8yncaxpfi9k8y4v18gm8j55f";
        editedCabalFile = "5d63fab9a7c94b4e713d151bdc0c361228efbac2b7583dfa8e6c5370ecae5663";
        buildDepends = [ ghc-prim ];
-       jailbreak = true;
        description = "Integer library based on GMP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71958,15 +73975,16 @@ self: {
      }) {};
 
   "interpolation" = callPackage
-    ({ mkDerivation, base, QuickCheck, utility-ht }:
+    ({ mkDerivation, array, base, containers, QuickCheck, utility-ht }:
      mkDerivation {
        pname = "interpolation";
-       version = "0.0";
-       sha256 = "0l6i6gz555sq2kzffmlidh14wjg2hzvd7qc7b4sv532qbmlrhixv";
+       version = "0.1";
+       sha256 = "1yip0fjhmd9gf9w7qi4yfpq38m51jn0i52zxil2hfc49r5aydlya";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base utility-ht ];
-       testDepends = [ base QuickCheck utility-ht ];
+       testDepends = [ array base containers QuickCheck utility-ht ];
+       jailbreak = true;
        homepage = "http://code.haskell.org/~thielema/interpolation/";
        description = "piecewise linear and cubic Hermite interpolation";
        license = stdenv.lib.licenses.bsd3;
@@ -71990,19 +74008,19 @@ self: {
   "intricacy" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , cryptohash, directory, filepath, hscurses, mtl, network-fancy
-     , random, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time, transformers
-     , vector
+     , random, safe, SDL, SDL-gfx, SDL-mixer, SDL-ttf, stm, time
+     , transformers, vector
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.3.8";
-       sha256 = "1w4lawwd59zkfdvi8lkg7cmqnzr0mjrkcsgpibyr8p2x42zxskgm";
+       version = "0.4.1";
+       sha256 = "1gv2kgm3r5b4nh8d58nwrilyzxr7l4awn1qlwl7wnkfi99h5nlz8";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          array base binary bytestring containers cryptohash directory
-         filepath hscurses mtl network-fancy random SDL SDL-gfx SDL-mixer
-         SDL-ttf stm time transformers vector
+         filepath hscurses mtl network-fancy random safe SDL SDL-gfx
+         SDL-mixer SDL-ttf stm time transformers vector
        ];
        homepage = "http://mbays.freeshell.org/intricacy";
        description = "A game of competitive puzzle-design";
@@ -72025,6 +74043,7 @@ self: {
        homepage = "https://github.com/pxqr/intset";
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invariant" = callPackage
@@ -72123,8 +74142,8 @@ self: {
     ({ mkDerivation, base, hspec, stm, transformers }:
      mkDerivation {
        pname = "io-region";
-       version = "0.1.0";
-       sha256 = "11k1kw47g0mv0nd6gl9pyslr7y2d3wfbw04l6cqqf8cb1mrgl8j2";
+       version = "0.1.1";
+       sha256 = "1w8m21zkhbhqr9lsdzwxfpy0jhb2ciybn3bvhyp3zlxkq9k3yc7f";
        buildDepends = [ base stm ];
        testDepends = [ base hspec transformers ];
        homepage = "https://github.com/Yuras/io-region/wiki";
@@ -72145,7 +74164,7 @@ self: {
      }) {};
 
   "io-streams" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+    ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder
      , deepseq, directory, filepath, HUnit, mtl, network, primitive
      , process, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, time, transformers, vector
@@ -72153,17 +74172,17 @@ self: {
      }:
      mkDerivation {
        pname = "io-streams";
-       version = "1.2.1.2";
-       sha256 = "03jwm9p4pmh6bra19lkgbkb08aghfylv4gjwg3mfcipw981dnzb8";
+       version = "1.3.0.0";
+       sha256 = "029qp0jfap6jczxdi2my1g4vcp8pr4zkxp64xfl7cyiigbapkimw";
        buildDepends = [
-         attoparsec base blaze-builder bytestring network primitive process
-         text time transformers vector zlib-bindings
+         attoparsec base bytestring bytestring-builder network primitive
+         process text time transformers vector zlib-bindings
        ];
        testDepends = [
-         attoparsec base blaze-builder bytestring deepseq directory filepath
-         HUnit mtl network primitive process QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         transformers vector zlib zlib-bindings
+         attoparsec base bytestring bytestring-builder deepseq directory
+         filepath HUnit mtl network primitive process QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time transformers vector zlib zlib-bindings
        ];
        configureFlags = [ "-fnointeractivetests" ];
        description = "Simple, composable, and easy-to-use stream I/O";
@@ -72220,6 +74239,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/tattsun/iothread";
        description = "run IOs in a single thread";
        license = stdenv.lib.licenses.mit;
@@ -72235,6 +74255,7 @@ self: {
        homepage = "https://bitbucket.org/dshearer/iotransaction/";
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ip6addr" = callPackage
@@ -72322,7 +74343,6 @@ self: {
        pkgconfigDepends = [ ipopt nlopt ];
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) ipopt;  inherit (pkgs) nlopt;};
 
   "ipprint" = callPackage
@@ -72334,6 +74354,7 @@ self: {
        buildDepends = [ base Extra haskell-src ];
        description = "Tiny helper for pretty-printing values in ghci console";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iproute" = callPackage
@@ -72465,6 +74486,18 @@ self: {
        homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "irc-colors" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "irc-colors";
+       version = "0.1";
+       sha256 = "1xl38bq1b6w7z8q0frra4h76lyk63bsy5i1qd34pdgwvikd2rkh0";
+       buildDepends = [ base text ];
+       description = "Colourize your IRC strings";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "irc-conduit" = callPackage
@@ -72539,9 +74572,11 @@ self: {
          base bytestring containers directory filepath irc mtl network
          old-locale parsec random SafeSemaphore stm time unix
        ];
+       jailbreak = true;
        homepage = "http://hub.darcs.net/stepcut/ircbot";
        description = "A library for writing irc bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ircbouncer" = callPackage
@@ -72573,9 +74608,11 @@ self: {
        version = "0.1.1.0";
        sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr";
        buildDepends = [ aeson base http-client lens text wreq ];
+       jailbreak = true;
        homepage = "https://github.com/arnoblalam/iron_mq_haskell";
        description = "Iron.IO message queueing client library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ironforge" = callPackage
@@ -72591,8 +74628,10 @@ self: {
        buildDepends = [
          antisplice base chatty chatty-utils mtl transformers
        ];
+       jailbreak = true;
        description = "A technical demo for Antisplice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "is" = callPackage
@@ -72636,6 +74675,7 @@ self: {
        jailbreak = true;
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isiz" = callPackage
@@ -72720,12 +74760,12 @@ self: {
      }) {};
 
   "iso8601-time" = callPackage
-    ({ mkDerivation, base, hspec, HUnit, old-locale, time }:
+    ({ mkDerivation, base, hspec, HUnit, time }:
      mkDerivation {
        pname = "iso8601-time";
        version = "0.1.3";
        sha256 = "05qwpcj4whibj0bmdnq0wns9ks5v4fqnsyq7sl2v36pd11h9i9zv";
-       buildDepends = [ base old-locale time ];
+       buildDepends = [ base time ];
        testDepends = [ base hspec HUnit time ];
        homepage = "https://github.com/nh2/iso8601-time";
        description = "Convert to/from the ISO 8601 time format";
@@ -72994,7 +75034,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -73014,7 +75053,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-examples" = callPackage
@@ -73037,7 +75075,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-hw" = callPackage
@@ -73055,7 +75092,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-opts" = callPackage
@@ -73118,6 +75154,7 @@ self: {
        homepage = "https://github.com/lilac/ivy-web/";
        description = "A lightweight web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ix-shapable" = callPackage
@@ -73191,6 +75228,7 @@ self: {
        ];
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iyql" = callPackage
@@ -73356,6 +75394,7 @@ self: {
        ];
        buildTools = [ c2hs ];
        extraLibraries = [ blas cblas lapacke ];
+       jailbreak = true;
        homepage = "https://github.com/cgo/jalla";
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
@@ -73378,9 +75417,11 @@ self: {
          filepath HPDF JuicyPixels process property-list resourcet temporary
          transformers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jarfind" = callPackage
@@ -73398,6 +75439,7 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-bridge" = callPackage
@@ -73418,6 +75460,7 @@ self: {
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-bridge-extras" = callPackage
@@ -73430,6 +75473,7 @@ self: {
        jailbreak = true;
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-character" = callPackage
@@ -73454,6 +75498,7 @@ self: {
        jailbreak = true;
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javasf" = callPackage
@@ -73574,6 +75619,7 @@ self: {
        ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro-rpc" = callPackage
@@ -73593,6 +75639,7 @@ self: {
        homepage = "http://hub.darcs.net/gershomb/jmacro";
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro-rpc-happstack" = callPackage
@@ -73610,6 +75657,7 @@ self: {
        homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
        description = "Happstack backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro-rpc-snap" = callPackage
@@ -73626,6 +75674,7 @@ self: {
        homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
        description = "Snap backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jobqueue" = callPackage
@@ -73679,6 +75728,7 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jonathanscard" = callPackage
@@ -73744,6 +75794,7 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose-jwt" = callPackage
@@ -73757,7 +75808,9 @@ self: {
      mkDerivation {
        pname = "jose-jwt";
        version = "0.5";
+       revision = "2";
        sha256 = "0pk6fq3wsbl6pl79dcyns1c94xmv98acfr6rbxhyfqmc5lys759s";
+       editedCabalFile = "e3f6e8d368c88a0be06d656e627e86b8ad481cf75578a97af2a5c29bf0bb55b6";
        buildDepends = [
          aeson base base64-bytestring byteable bytestring cereal cipher-aes
          containers crypto-cipher-types crypto-numbers crypto-pubkey
@@ -73809,6 +75862,7 @@ self: {
        homepage = "https://github.com/sseefried/js-good-parts.git";
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "js-jquery" = callPackage
@@ -73825,21 +75879,23 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, hslogger, lens, template-haskell, text
-     , transformers
+    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
+     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.2.0.3";
-       sha256 = "0bldhn9bhhz07shcdcdc0p01ggxa8af43cf0bza9za8zywgq5i9x";
-       buildDepends = [ base lens template-haskell text transformers ];
+       version = "0.2.0.4";
+       sha256 = "154f75lhlqixrmwrvzcdvmvmila7cj8hzgch2020yamlwyi4gnk8";
+       buildDepends = [
+         base lens template-haskell text transformers webkitgtk3
+         webkitgtk3-javascriptcore
+       ];
        testDepends = [
-         base hslogger lens template-haskell text transformers
+         base glib gtk3 hslogger lens template-haskell text transformers
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle-hello" = callPackage
@@ -73855,7 +75911,6 @@ self: {
        homepage = "https://github.com/ghcjs/jsaddle-hello";
        description = "JSaddle Hello World, an example package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsc" = callPackage
@@ -73934,8 +75989,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-autotype";
-       version = "0.5";
-       sha256 = "05r61sgp5asyah71zxhy3gw7f97bqsqxgqinfvj6fiwq7gir58wr";
+       version = "1.0";
+       sha256 = "0vny84qr14i2q7hkvmngbryn6r9hxsmk6c5dw6f93s8cn0ymgsk8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -74062,6 +76117,7 @@ self: {
          aeson base bytestring containers pureMD5 template-haskell
        ];
        pkgconfigDepends = [ python ];
+       jailbreak = true;
        homepage = "http://stewart.guru";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
@@ -74078,21 +76134,23 @@ self: {
        homepage = "http://github.com/finnsson/json-qq";
        description = "Json Quasiquatation library for Haskell";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, conduit
-     , conduit-extra, deepseq, hashable, mtl, QuickCheck, stm
+    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
+     , conduit, conduit-extra, deepseq, hashable, mtl, QuickCheck, stm
      , stm-conduit, test-framework, test-framework-quickcheck2, text
-     , unordered-containers
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.2.1.2";
-       sha256 = "0lwn9gmjads8hbn2yi9rsn8h1k57mba6z4p06vzwli95f8gdsy0h";
+       version = "0.2.1.5";
+       sha256 = "10yxfdqj1bpi065wi7wp80z24bil7gxajiqxkx2w91w198pzlrlh";
        buildDepends = [
-         aeson async base bytestring conduit conduit-extra deepseq hashable
-         mtl stm stm-conduit text unordered-containers
+         aeson async attoparsec base bytestring conduit conduit-extra
+         deepseq hashable mtl stm stm-conduit text transformers
+         unordered-containers
        ];
        testDepends = [
          aeson async base bytestring conduit conduit-extra deepseq hashable
@@ -74103,6 +76161,7 @@ self: {
        homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc-client" = callPackage
@@ -74124,6 +76183,7 @@ self: {
          aeson base bytestring HUnit json-rpc-server mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74153,20 +76213,20 @@ self: {
   "json-schema" = callPackage
     ({ mkDerivation, aeson, aeson-utils, attoparsec, base, bytestring
      , containers, generic-aeson, generic-deriving, mtl, scientific
-     , tagged, tasty, tasty-hunit, tasty-th, text, time
-     , unordered-containers, vector
+     , tasty, tasty-hunit, tasty-th, text, time, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "json-schema";
-       version = "0.7.3.3";
-       sha256 = "0645ji3dl0xilpkgpblz3kkp1yvzxxcm9qm205wk2xsn00mp864c";
+       version = "0.7.3.4";
+       sha256 = "0p9m706hl8phl12zb9inn6hkrgzxgd3k9lg2p1kav53j5mz17w0p";
        buildDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
-         tagged text time unordered-containers vector
+         text time unordered-containers vector
        ];
        testDepends = [
-         aeson aeson-utils attoparsec base bytestring generic-aeson tagged
-         tasty tasty-hunit tasty-th text vector
+         aeson aeson-utils attoparsec base bytestring generic-aeson tasty
+         tasty-hunit tasty-th text vector
        ];
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
@@ -74188,6 +76248,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-stream" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-stream";
+       version = "0.3.0.4";
+       sha256 = "01hmy7xxlh79mspcx3xgmqlndj8p2mqdjlakr3sl4p837xdkhv2d";
+       buildDepends = [
+         aeson base bytestring scientific text unordered-containers vector
+       ];
+       testDepends = [
+         aeson base bytestring hspec scientific text unordered-containers
+         vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/ondrap/json-stream";
+       description = "Incremental applicative JSON parser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "json-tools" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , process, tar, text, unordered-containers, vector
@@ -74287,9 +76368,11 @@ self: {
        buildDepends = [
          aeson base bytestring old-locale text time unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/dpwright/jsonresume.hs";
        description = "Parser and datatypes for the JSON Resume format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonrpc-conduit" = callPackage
@@ -74310,6 +76393,27 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "jsonschema-gen" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, process
+     , scientific, tagged, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "jsonschema-gen";
+       version = "0.2.0.0";
+       sha256 = "0n7qm46ivp5lr83rfvyijavx6qbw3fd0m54zzk2bz203ggymab9x";
+       buildDepends = [
+         aeson base bytestring containers scientific tagged text time
+         unordered-containers vector
+       ];
+       testDepends = [
+         aeson base bytestring containers process tagged text transformers
+       ];
+       homepage = "https://github.com/yuga/jsonschema-gen";
+       description = "JSON Schema generator from Algebraic data type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jsonsql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , HUnit, optparse-applicative, scientific, string-qq, text
@@ -74326,6 +76430,7 @@ self: {
          optparse-applicative scientific string-qq text unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/danchoi/jsonsql";
        description = "Interpolate JSON object values into SQL strings";
        license = stdenv.lib.licenses.mit;
@@ -74347,6 +76452,7 @@ self: {
          optparse-applicative scientific string-qq text unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/danchoi/jsontsv";
        description = "JSON to TSV transformer";
        license = stdenv.lib.licenses.mit;
@@ -74405,6 +76511,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jumpthefive" = callPackage
+    ({ mkDerivation, base, parallel }:
+     mkDerivation {
+       pname = "jumpthefive";
+       version = "0.0.1";
+       sha256 = "0ymp7hkkla7jxn3c7prsrcdl0mzkpqdm6ivq599qwx39rcnq6dpl";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base parallel ];
+       description = "an elementary symmetric chiffre for pragmatically protecting one's effects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "jvm-parser" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , data-binary-ieee754, fgl, fingertree, pretty, zlib
@@ -74430,8 +76549,8 @@ self: {
      }:
      mkDerivation {
        pname = "jwt";
-       version = "0.5.3";
-       sha256 = "1225fa53gghfpgwhr4x269a6kygfj39fh2qdapdi9mrrvlg302i4";
+       version = "0.6.0";
+       sha256 = "02nb1nz7rrgqgr9dg01gi2kh29hpy4mlwpvk5ziqcg3zkb0gl60w";
        buildDepends = [
          aeson base base64-bytestring bytestring containers cryptohash
          data-default http-types network network-uri scientific semigroups
@@ -74464,6 +76583,7 @@ self: {
        testDepends = [
          base bytestring cereal hspec hspec-discover QuickCheck time
        ];
+       jailbreak = true;
        homepage = "https://github.com/abhinav/kafka-client";
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
@@ -74515,6 +76635,7 @@ self: {
          aeson base containers data-default scotty stm text time
          transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/ku-fpg/kansas-comet/";
        description = "A JavaScript push mechanism based on the comet idiom";
        license = stdenv.lib.licenses.bsd3;
@@ -74571,8 +76692,8 @@ self: {
      }:
      mkDerivation {
        pname = "kansas-lava-papilio";
-       version = "0.2.0";
-       sha256 = "1p1mlpcm5jaxa6ja5g9vcgkf1dqnh6b2xzy45m0qas9ak47qrhrd";
+       version = "0.3.0";
+       sha256 = "1dyvw2n25cd22zdpzyy8ipsxr3lbvhq10xbaz83l94rcf2k9yhqj";
        buildDepends = [
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava kansas-lava-cores netlist network sized-types
@@ -74622,8 +76743,8 @@ self: {
      }:
      mkDerivation {
        pname = "karver";
-       version = "0.1.1";
-       sha256 = "1n6q13i6j68siq36bli0hnf1ssny4ax71ai48da1x3z6996hbg06";
+       version = "0.1.2";
+       sha256 = "0rbxhwxajcv8y6m0pz316r431jh5k8w3bcxqw117cnv6xkwgxpi1";
        buildDepends = [
          aeson attoparsec base bytestring text unordered-containers vector
        ];
@@ -74654,6 +76775,7 @@ self: {
        homepage = "https://github.com/davnils/katt";
        description = "Client for the Kattis judge system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kbq-gu" = callPackage
@@ -74697,6 +76819,7 @@ self: {
          ansi-terminal base bytestring cmdargs directory MissingH parsec
          process
        ];
+       jailbreak = true;
        description = "Build profiles for kdesrc-build";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -74815,9 +76938,11 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base udbus ];
+       jailbreak = true;
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keys" = callPackage
@@ -74861,6 +76986,7 @@ self: {
        homepage = "http://github.com/cdornan/keystore";
        description = "Managing stores of secret things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyvaluehash" = callPackage
@@ -74881,16 +77007,17 @@ self: {
 
   "keyword-args" = callPackage
     ({ mkDerivation, base, bytestring, cassava, containers, hspec
-     , parsec
+     , parsec, parseerror-eq
      }:
      mkDerivation {
        pname = "keyword-args";
-       version = "0.2.0.1";
-       sha256 = "1bzljlab62bdcjnq6n06rv2lcgs5mpwdhcrpxkdwk241np1iz12g";
+       version = "0.2.0.2";
+       sha256 = "18cj2l804d77mxzmdl2mai1a157yljskadqdlinmc9w9krhcx4jx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base bytestring cassava containers parsec ];
-       testDepends = [ base containers hspec parsec ];
+       testDepends = [ base containers hspec parsec parseerror-eq ];
+       homepage = "https://github.com/stackbuilders/keyword-args";
        description = "Extract data from a keyword-args config file format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -75080,8 +77207,8 @@ self: {
      }:
      mkDerivation {
        pname = "knots";
-       version = "0.1.0.0";
-       sha256 = "1kqcfabbk308ph9i04d6sz9hrh2lcmqp7aml7av9h15hdhq77nf2";
+       version = "0.1.0.1";
+       sha256 = "1yv26gnf8aipjh6d6apszbx4jwvfa7cafnjz0frw73xagnd1z084";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -75090,7 +77217,6 @@ self: {
        jailbreak = true;
        description = "Khovanov homology computations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "koellner-phonetic" = callPackage
@@ -75172,6 +77298,7 @@ self: {
        sha256 = "1q25ahsxsxrj8l99skymzssklj11d5prsa09b23dmbgc4qw28lg8";
        buildDepends = [ base directory filepath mtl time unix ];
        buildTools = [ c2hs ];
+       jailbreak = true;
        homepage = "http://github.com/hesselink/kqueue";
        description = "A binding to the kqueue event library";
        license = stdenv.lib.licenses.bsd3;
@@ -75509,6 +77636,7 @@ self: {
        homepage = "https://patch-tag.com/r/mkollar/lambda2js/";
        description = "Untyped Lambda calculus to JavaScript compiler";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdaBase" = callPackage
@@ -75519,6 +77647,7 @@ self: {
        sha256 = "0mmdkyadpnkm8d3jv6vb7ln762vkf744hcq6qiyhznxhvih0k28x";
        buildDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdaFeed" = callPackage
@@ -75551,6 +77680,7 @@ self: {
        ];
        description = "...";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot" = callPackage
@@ -75573,6 +77703,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -75598,6 +77729,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -75624,6 +77756,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -75642,6 +77775,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -75665,6 +77799,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -75683,6 +77818,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -75701,6 +77837,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -75717,6 +77854,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -75780,17 +77918,19 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacms-core";
-       version = "0.0.8.0";
-       sha256 = "1aayf3gfv0lpyx5di3m9n0py25ldv6c666z8bkd4kcb8k0ay5bs7";
+       version = "0.1.0.0";
+       sha256 = "0f34158j493ga5zrl1fxqyxvxfj3gzx77vs3p9rb7syn7c1zxa53";
        buildDepends = [
          base blaze-html bytestring containers data-default esqueleto
          file-embed friendly-time gravatar lists mime-mail old-locale
          persistent shakespeare template-haskell text time uuid wai yesod
          yesod-auth yesod-core yesod-form
        ];
+       jailbreak = true;
        homepage = "http://lambdacms.org";
-       description = "Core CMS extension for Yesod apps";
+       description = "LambdaCms Core subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacms-media" = callPackage
@@ -75799,15 +77939,16 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacms-media";
-       version = "0.0.2";
-       sha256 = "1cbgbkj22pj1nv6k5vcqzfwc2wrdkhr3966pl13d99jj7sfb5jw5";
+       version = "0.2.0";
+       sha256 = "08c2qdpqv8bw0qkpjk5fcyyqdgpxgp6xivfimai6bh3lxz2yk0gz";
        buildDepends = [
          base directory filepath lambdacms-core persistent shakespeare text
          time yesod yesod-form
        ];
-       homepage = "http://lambdacms.org/media";
-       description = "Media CMS extension for Yesod apps";
+       homepage = "http://lambdacms.org";
+       description = "LambdaCms \"media\" extension";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube" = callPackage
@@ -75848,7 +77989,6 @@ self: {
        buildDepends = [
          base bytestring bytestring-trie containers mtl vector
        ];
-       jailbreak = true;
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "LambdaCube 3D IR";
        license = stdenv.lib.licenses.bsd3;
@@ -75866,7 +78006,6 @@ self: {
          base bytestring bytestring-trie containers ghc-prim lambdacube-core
          mtl vector
        ];
-       jailbreak = true;
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "LambdaCube 3D EDSL definition";
        license = stdenv.lib.licenses.bsd3;
@@ -75926,6 +78065,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "OpenGL backend for LambdaCube graphics language (main package)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-samples" = callPackage
@@ -75948,6 +78088,7 @@ self: {
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "Samples for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdatwit" = callPackage
@@ -75971,6 +78112,7 @@ self: {
          network-uri resourcet safecopy text transformers transformers-base
          twitter-conduit twitter-types utf8-string
        ];
+       jailbreak = true;
        homepage = "http://github.com/ashyisme/lambdatwit";
        description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
        license = stdenv.lib.licenses.mit;
@@ -76036,9 +78178,11 @@ self: {
        version = "0.6.0";
        sha256 = "07hb9hg4grmf01zlvfm583q9km4dxfgm4pkb9glihl3v7iqz21vs";
        buildDepends = [ base parsec pretty transformers ];
+       jailbreak = true;
        homepage = "http://github.com/knrafto/language-bash/";
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-boogie" = callPackage
@@ -76112,6 +78256,7 @@ self: {
        homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-quote" = callPackage
@@ -76184,10 +78329,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ecmascript";
-       version = "0.17";
-       revision = "2";
-       sha256 = "15v0nwp97058yjn0sp0hlsk7pvs6vaak3521p99f0z7a1dx4d876";
-       editedCabalFile = "834526a1a67668bc7689b50d0ff28b674235724d5b3df5ce8cccbcd5fd4f5622";
+       version = "0.17.0.1";
+       sha256 = "1yawnk6ylx7g9fgx2ib11dgkwkpaz2cy3iph84pxzgqw30yh9q4l";
        buildDepends = [
          base containers data-default-class Diff mtl parsec QuickCheck
          template-haskell testing-feat uniplate wl-pprint
@@ -76278,6 +78421,7 @@ self: {
        ];
        description = "GLSL abstract syntax tree, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-go" = callPackage
@@ -76409,6 +78553,7 @@ self: {
        homepage = "http://github.com/jtdaugherty/language-mixal/";
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-objc" = callPackage
@@ -76424,9 +78569,11 @@ self: {
          process syb
        ];
        buildTools = [ alex happy ];
+       jailbreak = true;
        homepage = "http://www.tiresiaspress.us/haskell/language-objc";
        description = "Analysis and generation of Objective C code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-openscad" = callPackage
@@ -76465,34 +78612,33 @@ self: {
   "language-puppet" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base16-bytestring, bytestring, case-insensitive, containers
-     , cryptohash, Diff, directory, filecache, Glob, hashable, hruby
-     , hslogger, hslua, hspec, http-conduit, http-types, HUnit, iconv
-     , lens, lens-aeson, luautils, mtl, operational
-     , optparse-applicative, parallel-io, parsec, parsers, pcre-utils
-     , process, regex-pcre-builtin, scientific, split, stm
-     , strict-base-types, temporary, text, time, transformers-compat
-     , unix, unordered-containers, vector, yaml
+     , cryptohash, Diff, directory, either, exceptions, filecache, Glob
+     , hashable, hruby, hslogger, hslua, hspec, HUnit, lens, lens-aeson
+     , luautils, mtl, operational, optparse-applicative, parallel-io
+     , parsec, parsers, pcre-utils, process, regex-pcre-builtin
+     , scientific, servant, servant-client, split, stm
+     , strict-base-types, temporary, text, time, transformers, unix
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.1.0";
-       sha256 = "1mda3ip071qx7xfhv3d4q1pdivhycsdk9fxykm7hcs9a7a4c5jls";
+       version = "1.1.1.2";
+       sha256 = "0d5510krnwfq4vfnq2vlzbjnyhnr13hx1jnm3gajznb2bzn6srx4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
-         case-insensitive containers cryptohash Diff directory filecache
-         Glob hashable hruby hslogger hslua hspec http-conduit http-types
-         iconv lens lens-aeson luautils mtl operational optparse-applicative
+         case-insensitive containers cryptohash Diff directory either
+         exceptions filecache Glob hashable hruby hslogger hslua hspec lens
+         lens-aeson luautils mtl operational optparse-applicative
          parallel-io parsec parsers pcre-utils process regex-pcre-builtin
-         scientific split stm strict-base-types text time
-         transformers-compat unix unordered-containers vector yaml
+         scientific servant servant-client split stm strict-base-types text
+         time transformers unix unordered-containers vector yaml
        ];
        testDepends = [
-         ansi-wl-pprint base Glob hspec HUnit lens parsec parsers
+         ansi-wl-pprint base either Glob hspec HUnit lens parsec parsers
          strict-base-types temporary text unix unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
@@ -76624,9 +78770,11 @@ self: {
        version = "0.1.0.0";
        sha256 = "17x6311mrijm1in78nbcgfq4gmhahqcrhf5yynq3g6b1hylgswsv";
        buildDepends = [ base mtl parsers text trifecta ];
+       jailbreak = true;
        homepage = "https://github.com/abhinav/language-thrift";
        description = "Parser for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-typescript" = callPackage
@@ -76765,6 +78913,7 @@ self: {
        version = "0.1";
        sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf";
        buildDepends = [ base transformers ];
+       jailbreak = true;
        homepage = "http://github.com/duairc/layers";
        description = "Modular type class machinery for monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
@@ -76788,7 +78937,6 @@ self: {
        jailbreak = true;
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layout" = callPackage
@@ -76889,6 +79037,7 @@ self: {
        buildDepends = [ base ];
        description = "Differential solving with lazy splines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lbfgs" = callPackage
@@ -76925,6 +79074,7 @@ self: {
        homepage = "http://urchin.earth.li/~ian/cabal/lcs/";
        description = "Find longest common sublist of two lists";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lda" = callPackage
@@ -76943,6 +79093,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ldap-client" = callPackage
+    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+     , connection, containers, hspec, network, process, semigroups, stm
+     , text
+     }:
+     mkDerivation {
+       pname = "ldap-client";
+       version = "0.1.0";
+       sha256 = "18c33jfgwa7vdickxshyhmrqdpndy7ayjd3z0zqkjqa7awd0zcf4";
+       buildDepends = [
+         asn1-encoding asn1-types async base bytestring connection
+         containers network semigroups stm text
+       ];
+       testDepends = [ base bytestring hspec process semigroups ];
+       homepage = "https://supki.github.io/ldap-client";
+       description = "Pure Haskell LDAP Client Library";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ldif" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, directory
      , filepath, HUnit, parsec, rosezipper
@@ -76979,6 +79149,7 @@ self: {
        homepage = "https://github.com/skypers/leaf";
        description = "A simple portfolio generator";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leaky" = callPackage
@@ -77048,6 +79219,7 @@ self: {
        jailbreak = true;
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -77094,6 +79266,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base containers ];
+       jailbreak = true;
        homepage = "http://github.com/phaazon/leetify";
        description = "Leetify text";
        license = stdenv.lib.licenses.bsd3;
@@ -77131,6 +79304,7 @@ self: {
          leksah-server ltk monad-loops QuickCheck text transformers
          webkitgtk3
        ];
+       jailbreak = true;
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
@@ -77166,6 +79340,25 @@ self: {
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "lendingclub" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, HsOpenSSL
+     , http-streams, io-streams, mtl, scientific, text, vector
+     }:
+     mkDerivation {
+       pname = "lendingclub";
+       version = "0.1.1";
+       sha256 = "1r40qm7f45vgzdxnzlhpqhsi81rbwa2nss3gf1d5mqz32dscjwfx";
+       buildDepends = [
+         aeson base blaze-builder bytestring HsOpenSSL http-streams
+         io-streams mtl scientific text vector
+       ];
+       homepage = "https://www.lendingclub.com/developers/lc-api.action";
+       description = "Bindings for the LendingClub marketplace API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens_4_7_0_1" = callPackage
@@ -77182,9 +79375,9 @@ self: {
      mkDerivation {
        pname = "lens";
        version = "4.7.0.1";
-       revision = "2";
+       revision = "3";
        sha256 = "1j9d7g4sj38zq2r8vhy05b2kbxx1sg2k0b3yx05lbxlb79wcm1j1";
-       editedCabalFile = "fd79ae606fe461d82d0eca185ade4ba04200b4afbf65348a59ffc600a5b7dc03";
+       editedCabalFile = "6ac87d4c8600c9497c965d54b1e97f10d0073bed3c45381b78d1ba4b81da57c8";
        buildDepends = [
          array base bifunctors bytestring comonad containers contravariant
          distributive exceptions filepath free ghc-prim hashable mtl
@@ -77199,6 +79392,7 @@ self: {
          test-framework-quickcheck2 test-framework-th text transformers
          unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd3;
@@ -77217,8 +79411,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.9";
-       sha256 = "1ssnjdcd50khm18pb4ramvadqqnqn119z90i7991jja3na2mwsqr";
+       version = "4.9.1";
+       sha256 = "1ic8zvwl1cz9qppwqp713r7savvnqij0gclpdgxmnnh67l962170";
        buildDepends = [
          array base bifunctors bytestring comonad containers contravariant
          distributive exceptions filepath free ghc-prim hashable
@@ -77360,6 +79554,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv";
        buildDepends = [ base bytestring lens text ];
+       jailbreak = true;
        homepage = "http://github.com/iand675/text-lens-encoding";
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
        license = stdenv.lib.licenses.mit;
@@ -77387,6 +79582,7 @@ self: {
        homepage = "http://github.com/jvranish/Lenses/tree/master";
        description = "Simple Functional Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lensref" = callPackage
@@ -77500,8 +79696,8 @@ self: {
      }:
      mkDerivation {
        pname = "lexer-applicative";
-       version = "1.0.0.1";
-       sha256 = "14srsxw3xyhllmxlxkfid1njay5dca4zy488sa1lmsffrfdkp20z";
+       version = "1.1";
+       sha256 = "1yl4404w5pmmpa1l7j4zlm5lg24jglxff04qdc757bd1r0bklbw1";
        buildDepends = [ base regex-applicative srcloc ];
        testDepends = [
          base deepseq regex-applicative srcloc tasty tasty-hunit
@@ -77547,6 +79743,7 @@ self: {
        homepage = "https://github.com/bytbox/lha.hs";
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhae" = callPackage
@@ -77568,6 +79765,7 @@ self: {
        homepage = "http://www.imn.htwk-leipzig.de/~abau/lhae";
        description = "Simple spreadsheet program";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhc" = callPackage
@@ -77605,6 +79803,7 @@ self: {
        buildDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhs2TeX-hl" = callPackage
@@ -77672,6 +79871,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base directory filepath process regex-posix ];
+       jailbreak = true;
        homepage = "https://github.com/tvh/lhslatex";
        description = "Tool for using pdflatex with .lhs files";
        license = stdenv.lib.licenses.bsd3;
@@ -77708,6 +79908,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { archive = null;};
 
+  "libconfig" = callPackage
+    ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config
+     , deepseq, doctest, doctest-prop, hashable, lens, profunctors, text
+     , text-binary, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "libconfig";
+       version = "0.3.0.0";
+       sha256 = "152rvfyc6y9waxic9fw4hfb7w5qfcrr23hdv9jlvksg9yw8mnq12";
+       buildDepends = [
+         base binary cereal cereal-text deepseq hashable profunctors text
+         text-binary transformers transformers-compat
+       ];
+       testDepends = [ base doctest doctest-prop lens ];
+       buildTools = [ c2hs ];
+       extraLibraries = [ config ];
+       homepage = "https://github.com/peddie/libconfig-haskell";
+       description = "Haskell bindings to libconfig";
+       license = stdenv.lib.licenses.bsd3;
+     }) { config = null;};
+
   "libcspm" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, filepath, graph-wrapper, hashable, hashtables, mtl
@@ -77764,6 +79985,7 @@ self: {
        homepage = "http://github.com/vincenthz/hs-tls";
        description = "Simple Git Wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libgraph" = callPackage
@@ -78090,6 +80312,7 @@ self: {
          uniplate unix-bytestring unordered-containers uuid vector
        ];
        pkgconfigDepends = [ systemd ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
@@ -78132,6 +80355,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1rl8hqbidxj34j3m8nwy32a9fnbzand726zvyljkgpjfkg1mfb2c";
        buildDepends = [ base bytestring cpu ];
+       jailbreak = true;
        homepage = "https://github.com/the-real-blackh/libvorbis";
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
        license = stdenv.lib.licenses.bsd3;
@@ -78353,6 +80577,7 @@ self: {
        jailbreak = true;
        description = "Bindings to Lilypond";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "limp" = callPackage
@@ -78397,6 +80622,7 @@ self: {
        buildDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linda" = callPackage
@@ -78461,6 +80687,7 @@ self: {
        homepage = "http://github.com/ekmett/linear-accelerate/";
        description = "Instances to use linear vector spaces on accelerate backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-algebra-cblas" = callPackage
@@ -78504,12 +80731,11 @@ self: {
      }:
      mkDerivation {
        pname = "linear-opengl";
-       version = "0.2.0.7";
-       sha256 = "0yj98757d6z1bh3mqajn58ax2iaxnf2nl68wvbjv2pncwfn679m6";
+       version = "0.2.0.8";
+       sha256 = "18yy35pcl4jg0albh9dhngi7q4ak40fzr6ypa2piz2di4zqhfqp6";
        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;
@@ -78547,6 +80773,7 @@ self: {
        version = "0.4.0.0";
        sha256 = "170dppl4hgfrxpqix19a7nf1dv46wc46s797h8ppa2j0xvcdf4xs";
        buildDepends = [ base containers mtl transformers ];
+       jailbreak = true;
        homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
@@ -78567,9 +80794,11 @@ self: {
          base containers hoopl hspec hspec-expectations lens-family-core
          linearscan transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linebreak" = callPackage
@@ -78591,6 +80820,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0adcdxf0lxc372j12fk87klyrgr3b42sas6f1smiyza4wicjp9h3";
        buildDepends = [ base text ];
+       jailbreak = true;
        homepage = "http://github.com/argiopetech/linguistic-ordinals";
        description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)";
        license = stdenv.lib.licenses.bsd3;
@@ -78662,6 +80892,7 @@ self: {
        homepage = "https://github.com/hlian/linklater";
        description = "The fast and fun way to write Slack.com bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-blkid" = callPackage
@@ -78787,6 +81018,7 @@ self: {
        homepage = "https://github.com/bjpop/haskell-linux-perf";
        description = "Read files generated by perf on Linux";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-ptrace" = callPackage
@@ -78833,6 +81065,7 @@ self: {
          base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/kosmoskatten/linx-gateway";
        description = "Implementation of the Enea LINX gateway protocol";
        license = stdenv.lib.licenses.mit;
@@ -78971,6 +81204,7 @@ self: {
        homepage = "http://goto.ucsd.edu/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lispparser" = callPackage
@@ -79057,18 +81291,20 @@ self: {
        ];
        description = "List all remote forwards for mail accounts stored in a SQL database";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t" = callPackage
-    ({ mkDerivation, base-prelude, HTF, mmorph, monad-control
+    ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl
      , mtl-prelude, transformers, transformers-base
      }:
      mkDerivation {
        pname = "list-t";
-       version = "0.4.3";
-       sha256 = "0di3w397cib37snazjvqgfsaapcwa136xcn032p5f5s5njkn3sid";
+       version = "0.4.5.1";
+       sha256 = "0mf1dv0pcbc2sgnimjkhmivl32ivjck7arhkq679s1ba5hc6np3a";
        buildDepends = [
-         base-prelude mmorph monad-control transformers transformers-base
+         base-prelude mmorph monad-control mtl transformers
+         transformers-base
        ];
        testDepends = [ base-prelude HTF mmorph mtl-prelude ];
        homepage = "https://github.com/nikita-volkov/list-t";
@@ -79076,6 +81312,95 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "list-t-attoparsec" = callPackage
+    ({ mkDerivation, attoparsec, base-prelude, exceptions, list-t
+     , mtl-prelude, text
+     }:
+     mkDerivation {
+       pname = "list-t-attoparsec";
+       version = "0.2.0.0";
+       sha256 = "073qi17qwlic4y3vjas6ki5ws0kfixnvhnnqhs7hmj7iq6qbjm91";
+       buildDepends = [
+         attoparsec base-prelude exceptions list-t mtl-prelude text
+       ];
+       homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
+       description = "An \"attoparsec\" adapter for \"list-t\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "list-t-html-parser" = callPackage
+    ({ mkDerivation, base-prelude, case-insensitive, conversion
+     , conversion-text, either, hspec, html-entities, html-tokenizer
+     , list-t, list-t-attoparsec, list-t-text, mtl-prelude, text
+     }:
+     mkDerivation {
+       pname = "list-t-html-parser";
+       version = "0.2.2.0";
+       sha256 = "07fd7nzlhwvhzj4g84wmsm48rj1748m0cbglv0wc2w1rsbsikwl0";
+       buildDepends = [
+         base-prelude case-insensitive either html-entities html-tokenizer
+         list-t mtl-prelude text
+       ];
+       testDepends = [
+         base-prelude conversion conversion-text hspec html-tokenizer
+         list-t-attoparsec list-t-text text
+       ];
+       homepage = "https://github.com/nikita-volkov/list-t-html-parser";
+       description = "Streaming HTML parser";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "list-t-http-client" = callPackage
+    ({ mkDerivation, base-prelude, bytestring, http-client, list-t
+     , mtl-prelude
+     }:
+     mkDerivation {
+       pname = "list-t-http-client";
+       version = "0.1.0.1";
+       sha256 = "02wxqsfixzv7ccznydp3vij7maqvxhsbailakij2fcfrf2acw3g2";
+       buildDepends = [
+         base-prelude bytestring http-client list-t mtl-prelude
+       ];
+       homepage = "https://github.com/nikita-volkov/list-t-http-client";
+       description = "A streaming HTTP client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "list-t-libcurl" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, curlhs, either
+     , list-t, mtl-prelude, resource-pool, stm
+     }:
+     mkDerivation {
+       pname = "list-t-libcurl";
+       version = "0.2.0.2";
+       sha256 = "1scvspy8kdyqyv2iv0alnh9qal5dlxy3pbcz5k7ib0v02acj9jhz";
+       buildDepends = [
+         base base-prelude bytestring curlhs either list-t mtl-prelude
+         resource-pool stm
+       ];
+       homepage = "https://github.com/nikita-volkov/list-t-libcurl";
+       description = "A \"libcurl\"-based streaming HTTP client";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "list-t-text" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, hspec, list-t
+     , mtl-prelude, QuickCheck, quickcheck-instances, text, transformers
+     }:
+     mkDerivation {
+       pname = "list-t-text";
+       version = "0.2.0.1";
+       sha256 = "1ylb4fs5gbphny281gwd0j0k26ayqcqmc79qarcfpfm6j4washng";
+       buildDepends = [ base-prelude bytestring list-t mtl-prelude text ];
+       testDepends = [
+         base base-prelude bytestring hspec list-t QuickCheck
+         quickcheck-instances text transformers
+       ];
+       homepage = "https://github.com/nikita-volkov/list-t-text";
+       description = "A streaming text codec";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "list-tries" = callPackage
     ({ mkDerivation, base, binary, containers, dlist }:
      mkDerivation {
@@ -79143,6 +81468,7 @@ self: {
          base blaze-html blaze-markup cheapskate directory filepath
          highlighting-kate parsec text time unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/cdosborn/lit";
        description = "A simple tool for literate programming";
        license = "GPL";
@@ -79196,6 +81522,7 @@ self: {
        sha256 = "0393ccnlink30492aw1gyv4jzd7rsckd8ymkm1wgbpma13vkf67h";
        buildDepends = [ base ];
        extraLibraries = [ picosat ];
+       jailbreak = true;
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) picosat;};
@@ -79276,7 +81603,6 @@ self: {
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-base" = callPackage
@@ -79341,7 +81667,6 @@ self: {
        buildTools = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-extra" = callPackage
@@ -79376,6 +81701,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/LLVM";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (self.llvmPackages) llvm;};
 
   "llvm-general" = callPackage
@@ -79387,8 +81713,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general";
-       version = "3.4.5.2";
-       sha256 = "1n6c1dna2lw3z36y6pnx15qsqwdmdd0cki0snh4yhbfjvcz5lack";
+       version = "3.4.5.3";
+       sha256 = "03rps9ga20cdqfh2khqnahwrkljs714ac7yx9x7krb3dngf83zsm";
        buildDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
@@ -79403,7 +81729,6 @@ self: {
        doCheck = false;
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { llvm-config = null;};
 
   "llvm-general-pure" = callPackage
@@ -79413,8 +81738,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general-pure";
-       version = "3.4.5.2";
-       sha256 = "1ybrn3y10nz69jsmhhzv652skyd4d4xb6b89zlc4n5xvrpxxg36j";
+       version = "3.4.5.3";
+       sha256 = "1b3zh2y3b3jj5sg6421wv2qsrhyjs23qdzrk693r7mpj10rd258k";
        buildDepends = [
          base containers mtl parsec setenv template-haskell transformers
          transformers-compat
@@ -79426,7 +81751,6 @@ self: {
        doCheck = false;
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-general-quote" = callPackage
@@ -79485,6 +81809,7 @@ self: {
        buildDepends = [
          base Cabal explicit-exception process transformers utility-ht
        ];
+       jailbreak = true;
        description = "Generate Pkg-Config configuration file for LLVM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79562,7 +81887,6 @@ self: {
        jailbreak = true;
        description = "Useful tools built on llvm-analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lmdb" = callPackage
@@ -79695,6 +82019,7 @@ self: {
        homepage = "https://github.com/trskop/lock-file";
        description = "Provide exclusive access to a resource using lock file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -79773,6 +82098,7 @@ self: {
        homepage = "https://github.com/haroldl/log2json";
        description = "Turn log file records into JSON";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logfloat" = callPackage
@@ -79803,26 +82129,25 @@ self: {
        homepage = "https://github.com/wdanilo/haskell-logger";
        description = "Fast & extensible logging framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging" = callPackage
     ({ mkDerivation, base, binary, bytestring, fast-logger, hspec
      , lifted-base, monad-control, monad-logger, old-locale, pcre-light
-     , text, time, transformers, unix, vector-space
+     , text, time, transformers, unix
      }:
      mkDerivation {
        pname = "logging";
-       version = "2.1.0";
-       sha256 = "15ad4g7zkbklawd98m6x838fr5383vkvq92y75f56j1kj17g7rrh";
+       version = "2.2.0";
+       sha256 = "0awcaj88754bppjmaay6lwmrmv0n53fppn2sjrnyi876r1ibr4qp";
        buildDepends = [
          base binary bytestring fast-logger lifted-base monad-control
          monad-logger old-locale pcre-light text time transformers
-         vector-space
        ];
        testDepends = [ base hspec monad-logger unix ];
        description = "Simplified logging in IO for application writers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade" = callPackage
@@ -79872,24 +82197,26 @@ self: {
        buildTools = [ alex happy ];
        description = "Import, export etc. for TPTP, a syntax for first-order logic";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logic-classes" = callPackage
-    ({ mkDerivation, applicative-extras, base, containers, fgl, HUnit
-     , mtl, pretty, PropLogic, safecopy, set-extra, syb, syb-with-class
-     , template-haskell, text
+    ({ mkDerivation, applicative-extras, base, containers, HUnit, mtl
+     , pretty, PropLogic, safecopy, set-extra, syb, template-haskell
      }:
      mkDerivation {
        pname = "logic-classes";
-       version = "1.5";
-       sha256 = "12rdq38wga5d4d2mw21rmdmgjg7vqhap0zl2f5wzn79hl7814rwz";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.5.2";
+       sha256 = "05p291y7hw8cfp0s0pb2vm9zpfs092nr92axwz6f74bkfdhrafwj";
        buildDepends = [
-         applicative-extras base containers fgl HUnit mtl pretty PropLogic
-         safecopy set-extra syb syb-with-class template-haskell text
+         applicative-extras base containers HUnit mtl pretty PropLogic
+         safecopy set-extra syb template-haskell
+       ];
+       testDepends = [
+         applicative-extras base containers HUnit mtl pretty PropLogic
+         set-extra syb
        ];
-       homepage = "http://src.seereason.com/logic-classes";
+       homepage = "https://github.com/seereason/logic-classes";
        description = "Framework for propositional and first order logic, theorem proving";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79965,6 +82292,7 @@ self: {
        buildDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojbanXiragan" = callPackage
@@ -79978,6 +82306,7 @@ self: {
        buildDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojysamban" = callPackage
@@ -79992,6 +82321,7 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/myblog/lojysamban.html";
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loli" = callPackage
@@ -80036,6 +82366,7 @@ self: {
        homepage = "https://github.com/konn/loop-effin";
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loop-while" = callPackage
@@ -80118,6 +82449,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lorem" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "lorem";
+       version = "0.0.0.0";
+       sha256 = "1fx7z90k9y12rii0yxk58159paiix1qi8y4j0za4k4szylr8f5ni";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base ];
+       jailbreak = true;
+       homepage = "https://github.com/sfischer13/haskell-lorem";
+       description = "Library for generating filler text";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "loris" = callPackage
     ({ mkDerivation, base, c2hs, loris, vector }:
      mkDerivation {
@@ -80213,6 +82559,7 @@ self: {
        homepage = "https://github.com/roelvandijk/ls-usb";
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lscabal" = callPackage
@@ -80277,8 +82624,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.14.3.0";
-       sha256 = "0f0xm5pg98yvccxlpqvhkwy8q9miyzr6n0aznqzc4qxf05dbi4s9";
+       version = "0.15.0.0";
+       sha256 = "1hl9cbr8n2nczsz8gkd4lkcmf3bhzcji82p8ym176abzyz2i3h09";
        buildDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
@@ -80502,6 +82849,7 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/luthor";
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lvish" = callPackage
@@ -80514,9 +82862,9 @@ self: {
      mkDerivation {
        pname = "lvish";
        version = "1.1.4";
-       revision = "1";
+       revision = "2";
        sha256 = "1s7i1jxb6m7ivk4nd60dy8hn4wgfhv1gcamvv6hgjvcw6rxn4k44";
-       editedCabalFile = "38b0af7bd2ebc54b5a2b01a2c24a3832d80f76596c8a8fad621499996ce76e76";
+       editedCabalFile = "bb376e7ac0598a623c8222824a2ace2649a395be610f81912eb7193450aa3e7e";
        buildDepends = [
          async atomic-primops base bits-atomic containers deepseq ghc-prim
          lattices missing-foreign random transformers vector
@@ -80527,6 +82875,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          text time transformers vector
        ];
+       jailbreak = true;
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80548,6 +82897,7 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Lazy Virtual Machine (LVM)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lvmrun" = callPackage
@@ -80570,6 +82920,7 @@ self: {
        version = "0.3.1.1";
        sha256 = "1mksram2nlb611b81yh5smvgr3dqxyabphrrpimspixwwl8173zr";
        buildDepends = [ base bindings-lxc mtl transformers ];
+       jailbreak = true;
        homepage = "https://github.com/fizruk/lxc";
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
@@ -80663,8 +83014,10 @@ self: {
        buildDepends = [
          base Cabal containers directory ghc template-haskell text
        ];
+       jailbreak = true;
        description = "An application of the Galois Transformers framework to two example semantics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maccatcher" = callPackage
@@ -80693,6 +83046,7 @@ self: {
        homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines" = callPackage
@@ -80714,6 +83068,7 @@ self: {
        homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines-directory" = callPackage
@@ -80727,9 +83082,11 @@ self: {
        buildDepends = [
          base directory filepath machines machines-io transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/aloiscochard/machines-io";
        description = "Directory (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines-io" = callPackage
@@ -80746,6 +83103,7 @@ self: {
        homepage = "http://github.com/aloiscochard/machines-io";
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines-process" = callPackage
@@ -80759,6 +83117,7 @@ self: {
        homepage = "http://github.com/aloiscochard/machines-io";
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines-zlib" = callPackage
@@ -80769,9 +83128,11 @@ self: {
        version = "0.1.0";
        sha256 = "0ajdc7878vzam5zphdaw8zn8knzk8kq80y3yf84jwlakb6ihrv6d";
        buildDepends = [ base basic-prelude machines streaming-commons ];
+       jailbreak = true;
        homepage = "https://github.com/lshift/machines-zlib";
        description = "Decompression support for machines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "macho" = callPackage
@@ -80865,6 +83226,7 @@ self: {
        homepage = "https://github.com/cutsea110/magma";
        description = "magma is an algebraic structure consisting a set together with an binary operation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mahoro" = callPackage
@@ -80907,6 +83269,7 @@ self: {
        homepage = "https://github.com/nfjinjing/maid";
        description = "A simple static web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mailbox-count" = callPackage
@@ -80931,6 +83294,7 @@ self: {
        ];
        description = "Count mailboxes in a SQL database";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mailchimp-subscribe" = callPackage
@@ -80950,7 +83314,6 @@ self: {
        homepage = "https://github.com/mietek/mailchimp-subscribe/";
        description = "MailChimp subscription request handler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mailgun" = callPackage
@@ -81017,6 +83380,7 @@ self: {
        homepage = "https://github.com/niswegmann/majority";
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "make-hard-links" = callPackage
@@ -81054,6 +83418,7 @@ self: {
        homepage = "https://github.com/Philonous/make-package";
        description = "Make a cabalized package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "makedo" = callPackage
@@ -81484,6 +83849,7 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -81558,6 +83924,7 @@ self: {
        ];
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "map-syntax" = callPackage
@@ -81802,9 +84169,11 @@ self: {
        testDepends = [
          aeson base exceptions tasty tasty-hunit text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/lunaryorn/marmalade-upload";
        description = "Upload packages to Marmalade";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marquise" = callPackage
@@ -81835,6 +84204,7 @@ self: {
        testDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marxup" = callPackage
@@ -81854,9 +84224,9 @@ self: {
          glpk-hs graphviz labeled-tree lens mtl parsek polynomials-bernstein
          pretty process text typography-geometry vector
        ];
+       jailbreak = true;
        description = "Markup language preprocessor for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -81910,6 +84280,7 @@ self: {
        homepage = "http://www.github.com/massysett/matchers";
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
@@ -81998,24 +84369,25 @@ self: {
        sha256 = "08kalclinzqxy5l7j115hz6h9nw1g7mf9rzmpz8dblbhbwvj4l7x";
        buildDepends = [ array base Cabal filepath ];
        extraLibraries = [ eng mat mx ];
+       jailbreak = true;
        description = "Matlab bindings and interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { eng = null;  mat = null;  mx = null;};
 
   "matrices" = callPackage
-    ({ mkDerivation, base, binary, primitive, vector
-     , vector-binary-instances
+    ({ mkDerivation, base, primitive, tasty, tasty-hunit
+     , tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrices";
-       version = "0.3.2";
-       sha256 = "09d2c6b99hiw858j9llawljb0ls2biky8ddc1cjc72605aacac73";
-       buildDepends = [
-         base binary primitive vector vector-binary-instances
-       ];
+       version = "0.4.1";
+       sha256 = "16xx6cdz90an0ifpvkpmchiqhijgxmi1cn5qq4171jhi87sswm7z";
+       buildDepends = [ base primitive vector ];
+       testDepends = [ base tasty tasty-hunit tasty-quickcheck vector ];
        description = "native matrix based on vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "matrix" = callPackage
@@ -82090,6 +84462,7 @@ self: {
        homepage = "https://github.com/davidlazar/maude-hs";
        description = "An interface to the Maude rewriting system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maxent" = callPackage
@@ -82170,12 +84543,12 @@ self: {
      }) {};
 
   "mbox" = callPackage
-    ({ mkDerivation, base, old-locale, safe, text, time }:
+    ({ mkDerivation, base, safe, text, time, time-locale-compat }:
      mkDerivation {
        pname = "mbox";
-       version = "0.3";
-       sha256 = "0b4304pb3a24rziybdlkypv2l10kg1ja4zmf94zyy53ahy3kms50";
-       buildDepends = [ base old-locale safe text time ];
+       version = "0.3.1";
+       sha256 = "13hq6h280wbc9xwbvdcq4qqrhbjnnzg824lk4zxkh4bvqpabjwni";
+       buildDepends = [ base safe text time time-locale-compat ];
        description = "Read and write standard mailbox files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82443,28 +84816,49 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "memcache-conduit" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
+     , conduit, conduit-extra, containers, hashtables, memcache-haskell
+     , monad-control, mtl, network, resourcet, split, stm, transformers
+     }:
+     mkDerivation {
+       pname = "memcache-conduit";
+       version = "0.0.3";
+       sha256 = "1y1jysshvwddr3rymbzr9s6bq4pg7rd0bkk7ip4xwa8kpzf8k3pj";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         attoparsec attoparsec-binary base bytestring conduit conduit-extra
+         containers hashtables memcache-haskell monad-control mtl network
+         resourcet split stm transformers
+       ];
+       description = "Conduit library for memcache procotol";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "memcache-haskell" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, hashable
-     , hashtables, HUnit, mtl, network, network-conduit, QuickCheck
+    ({ mkDerivation, attoparsec, base, bytestring, conduit-extra
+     , containers, hashable, hashtables, HUnit, mtl, network, QuickCheck
      , resourcet, split, stm, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers
      }:
      mkDerivation {
        pname = "memcache-haskell";
-       version = "0.0.10";
-       sha256 = "1k853wc1rqwq4wrsk72qs4gravd7scdgi4cvsjzjg8w0vn0scqm2";
+       version = "0.0.10.1";
+       sha256 = "0j3fn59nz4iynlmhv3hxbfqip0rjj94fkb3kx8jax90jbnf7s6sc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         attoparsec base bytestring containers hashable hashtables mtl
-         network network-conduit resourcet split stm transformers
+         attoparsec base bytestring conduit-extra containers hashable
+         hashtables mtl network resourcet split stm transformers
        ];
        testDepends = [
          base bytestring HUnit network QuickCheck split test-framework
          test-framework-hunit test-framework-quickcheck2 test-framework-th
        ];
-       jailbreak = true;
+       description = "Memcache procotol library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memcached" = callPackage
@@ -82689,7 +85083,6 @@ self: {
        homepage = "http://github.com/cutsea110/metadata";
        description = "metadata library for semantic web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metamorphic" = callPackage
@@ -82779,6 +85172,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mfsolve" = callPackage
+    ({ mkDerivation, base, hashable, tasty, tasty-hunit
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "mfsolve";
+       version = "0.1.0";
+       sha256 = "1lvx3nlxhfmvh9xbi62hik8ypv4n28ax86nqzwkchb60k1djnagg";
+       buildDepends = [ base hashable unordered-containers ];
+       testDepends = [ base tasty tasty-hunit ];
+       description = "Equation solver and calculator à la metafont";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mgeneric" = callPackage
     ({ mkDerivation, base, containers, lens, mtl, template-haskell }:
      mkDerivation {
@@ -82836,6 +85243,54 @@ self: {
        license = "unknown";
      }) {};
 
+  "microlens" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "microlens";
+       version = "0.1.0.0";
+       sha256 = "173ak9flxdpck7q5b3r38bpgbiv9mzmiz89y3f1wn0wz3q957p44";
+       buildDepends = [ base ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "A tiny part of the ‘lens’ library which you can depend upon";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "microlens-each" = callPackage
+    ({ mkDerivation, base, microlens }:
+     mkDerivation {
+       pname = "microlens-each";
+       version = "0.1.0.0";
+       sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
+       buildDepends = [ base microlens ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "'each' for microlens";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "microlens-mtl" = callPackage
+    ({ mkDerivation, base, microlens, mtl }:
+     mkDerivation {
+       pname = "microlens-mtl";
+       version = "0.1.0.0";
+       sha256 = "0wz61g71c0w12apwziww2b6snbmyhfhm2f1304rw4gasify9q5s8";
+       buildDepends = [ base microlens mtl ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens support for Reader/Writer/State from mtl";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "microlens-th" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.1.0.0";
+       sha256 = "0balhqdlj8ighzda5g9qz8s634jlf4pjxs3hvgaqp2rw56jc4i12";
+       buildDepends = [ base containers microlens template-haskell ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Automatic generation of record lenses for 'microlens'";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "microtimer" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -82855,8 +85310,8 @@ self: {
      }:
      mkDerivation {
        pname = "midi";
-       version = "0.2.1.3";
-       sha256 = "0mqf6q7686zdxljkz3bqa2zhkgirqz5c1fkbd3n4wyipzhjc773a";
+       version = "0.2.1.5";
+       sha256 = "0vi9pslbix7wcbciv3nlk1v6v6f45xf1lq85nl8awhs488fhbl3z";
        buildDepends = [
          base binary bytestring event-list explicit-exception
          monoid-transformer non-negative QuickCheck random transformers
@@ -82891,6 +85346,7 @@ self: {
        version = "0.1.1";
        sha256 = "14apfrhahm5pniwpjgk5ckgb1y6zlfxcb91xsh4qpg1axav89cr2";
        buildDepends = [ base containers event-list midi non-negative ];
+       jailbreak = true;
        homepage = "http://github.com/mtolly/midi-util";
        description = "Utility functions for processing MIDI files";
        license = "GPL";
@@ -82913,6 +85369,7 @@ self: {
        homepage = "http://www.youtube.com/watch?v=cOlR73h2uII";
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midisurface" = callPackage
@@ -82987,6 +85444,7 @@ self: {
        version = "0.2.0.0";
        sha256 = "0wr671a7r20ysnry92qimdsdnf5gijbxzv382mb7w8fav88v5kvv";
        buildDepends = [ base bytestring ];
+       jailbreak = true;
        homepage = "https://github.com/evanrinehart/mikmod";
        description = "MikMod bindings";
        license = "LGPL";
@@ -83007,6 +85465,7 @@ self: {
        homepage = "https://github.com/nfjinjing/miku";
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "milena" = callPackage
@@ -83026,14 +85485,15 @@ self: {
        jailbreak = true;
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "mime";
-       version = "0.4.0.1";
-       sha256 = "1m987sqnns54qbsg68332mnrjkh71z6s83cma2kwavf0y305mrp0";
+       version = "0.4.0.2";
+       sha256 = "0x9qx8adradc5irfwfn4xs4j9pd228j1b3lpngap2qxabhz2iyp7";
        buildDepends = [ base text ];
        homepage = "https://github.com/GaloisInc/mime";
        description = "Working with MIME types";
@@ -83054,6 +85514,7 @@ self: {
        homepage = "http://code.haskell.org/~mboes/mime-directory.git";
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime-mail" = callPackage
@@ -83107,6 +85568,7 @@ self: {
        ];
        description = "MIME implementation for String's";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime-types" = callPackage
@@ -83185,6 +85647,7 @@ self: {
        jailbreak = true;
        description = "Miniature FORTH-like interpreter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minimal-configuration" = callPackage
@@ -83196,6 +85659,7 @@ self: {
        sha256 = "06r710l30kf5aaz2k446z9fhc6zshdsssp1zwri0572r1jryzd43";
        editedCabalFile = "12049d8491610c2789c61e4736586d3fa8b1122c5c7657647c3de8d21073ef80";
        buildDepends = [ base containers directory filepath tconfig ];
+       jailbreak = true;
        description = "Minimal ini like configuration library with a few extras";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83261,6 +85725,7 @@ self: {
        homepage = "https://github.com/fumieval/minioperational";
        description = "fast and simple operational monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniplex" = callPackage
@@ -83389,6 +85854,7 @@ self: {
        homepage = "https://github.com/mokus0/misfortune";
        description = "fortune-mod clone";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "missing-foreign" = callPackage
@@ -83487,6 +85953,7 @@ self: {
        buildDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mlist" = callPackage
@@ -83569,6 +86036,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mockery" = callPackage
+    ({ mkDerivation, base, directory, hspec, temporary }:
+     mkDerivation {
+       pname = "mockery";
+       version = "0.0.0";
+       sha256 = "0j4cpjrcgdp93mbfzfhxrmp33163rfs171pc60hppv7wx1hqb1rl";
+       buildDepends = [ base directory temporary ];
+       testDepends = [ base directory hspec temporary ];
+       description = "Support functions for automated testing";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "modbus-tcp" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, cereal
      , network
@@ -83601,6 +86080,7 @@ self: {
        jailbreak = true;
        description = "A parser for the modelica language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modsplit" = callPackage
@@ -83743,6 +86223,7 @@ self: {
        homepage = "https://github.com/nfjinjing/moe";
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mohws" = callPackage
@@ -83797,6 +86278,7 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-atom-simple" = callPackage
@@ -83808,6 +86290,7 @@ self: {
        buildDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-bool" = callPackage
@@ -83985,9 +86468,11 @@ self: {
        buildDepends = [
          base constraints transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/ivan-m/monad-levels";
        description = "Specific levels of monad transformers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger" = callPackage
@@ -84105,6 +86590,7 @@ self: {
        homepage = "https://github.com/EduardSergeev/monad-memo";
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-mersenne-random" = callPackage
@@ -84117,6 +86603,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/monad-mersenne-random";
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-open" = callPackage
@@ -84129,7 +86616,6 @@ self: {
        jailbreak = true;
        description = "Open recursion for when you need it";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-ox" = callPackage
@@ -84286,6 +86772,7 @@ self: {
        version = "0.1.1.4";
        sha256 = "0zrzxkzg6fzxiqr9k4kw6r1ivw22qwz2dhl1nd5xqr7lfsqc00zs";
        buildDepends = [ base mmorph mtl transformers ];
+       jailbreak = true;
        homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -84295,8 +86782,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim }:
      mkDerivation {
        pname = "monad-skeleton";
-       version = "0";
-       sha256 = "0niv5pd3n87d1yqn13sam2qsha0dnnkclvn7wxha5zk66km56zyq";
+       version = "0.1.1";
+       sha256 = "14rwxhjkp3msycrpxna0sdyfyy6r8v7rqrz476p07gsmd6avpsrx";
        buildDepends = [ base containers ghc-prim ];
        homepage = "https://github.com/fumieval/monad-skeleton";
        description = "An undead monad";
@@ -84355,6 +86842,7 @@ self: {
        homepage = "http://github.com/taruti/monad-stlike-io";
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-stlike-stm" = callPackage
@@ -84367,6 +86855,7 @@ self: {
        homepage = "http://github.com/taruti/monad-stlike-stm";
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-stm" = callPackage
@@ -84398,6 +86887,7 @@ self: {
        version = "0.1.0";
        sha256 = "01w3wqmsfl9w96kfpdiwfyghm2zjn70x78l436bzxfrcm1d3ayi8";
        buildDepends = [ base mtl transformers ];
+       jailbreak = true;
        homepage = "http://github.com/ninegua/monad-task";
        description = "A monad transformer that turns event processing into co-routine programming";
        license = stdenv.lib.licenses.bsd3;
@@ -84412,6 +86902,7 @@ self: {
        buildDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-unify" = callPackage
@@ -84423,6 +86914,7 @@ self: {
        buildDepends = [ base mtl unordered-containers ];
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-unlift" = callPackage
@@ -84792,6 +87284,7 @@ self: {
        homepage = "http://github.com/JohnLato/mono-foldable";
        description = "Folds for monomorphic containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable" = callPackage
@@ -84822,8 +87315,8 @@ self: {
     ({ mkDerivation, base, groups, semigroupoids, semigroups }:
      mkDerivation {
        pname = "monoid-extras";
-       version = "0.3.3.5";
-       sha256 = "07xll4pz0ijjxj75z0s0bz1lia2f65hsm61snlx0jv3aybrnw280";
+       version = "0.4.0.0";
+       sha256 = "0j8lc03zamxplyw5k8kv8qa78j5xkmf581rz4iw2v9qhbx66cfpx";
        buildDepends = [ base groups semigroupoids semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -84839,6 +87332,7 @@ self: {
        homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-record" = callPackage
@@ -84937,6 +87431,7 @@ self: {
        homepage = "http://github.com/ekmett/monoids";
        description = "Deprecated: Use 'reducers'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monomorphic" = callPackage
@@ -84949,6 +87444,7 @@ self: {
        homepage = "https://github.com/konn/monomorphic";
        description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "montage" = callPackage
@@ -85042,6 +87538,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "moonshine" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, canteven-config
+     , directory, ekg, ekg-core, filepath, hslogger, snap, text, time
+     , transformers, yaml
+     }:
+     mkDerivation {
+       pname = "moonshine";
+       version = "1.2.2.1";
+       sha256 = "0x8rck2s7a8zhclhn9n6zfyx1p4z1krfg4vyv7gm0djasmcpwdp8";
+       buildDepends = [
+         aeson base bytestring canteven-config directory ekg ekg-core
+         filepath hslogger snap text time transformers yaml
+       ];
+       homepage = "https://github.com/SumAll/moonshine";
+       description = "A web service framework for Haskell, similar in purpose to dropwizard";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "morfette" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, pretty, QuickCheck, text, utf8-string
@@ -85061,6 +87575,7 @@ self: {
        homepage = "http://sites.google.com/site/morfetteweb/";
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morfeusz" = callPackage
@@ -85176,6 +87691,7 @@ self: {
        jailbreak = true;
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpretty" = callPackage
@@ -85193,6 +87709,7 @@ self: {
        jailbreak = true;
        description = "a monadic, extensible pretty printing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mprover" = callPackage
@@ -85270,6 +87787,7 @@ self: {
        homepage = "http://github.com/k00mi/mqtt-hs";
        description = "A MQTT client library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "msgpack" = callPackage
@@ -85351,11 +87869,9 @@ self: {
          exceptions monad-control msgpack mtl network random text
        ];
        testDepends = [ async base mtl network tasty tasty-hunit ];
-       jailbreak = true;
        homepage = "http://msgpack.org/";
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mstate" = callPackage
@@ -85416,40 +87932,53 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mtl" = callPackage
+  "mtl_2_1_3_1" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mtl";
        version = "2.1.3.1";
        sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
        buildDepends = [ base transformers ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mtl_2_2_1" = callPackage
+  "mtl" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mtl";
        version = "2.2.1";
        sha256 = "1icdbj2rshzn0m1zz5wa7v3xvkf6qw811p4s7jgqwvx1ydwrvrfa";
        buildDepends = [ base transformers ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mtl-c" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "mtl-c";
+       version = "0.1";
+       sha256 = "0n91jh07v87j2rbilyrip3inixb9a95i2j61g5hz42kiq5wj71gb";
+       buildDepends = [ base mtl ];
+       homepage = "https://github.com/fumieval/mtl-c";
+       description = "Very strict CPS'd transformers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mtl-compat" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "mtl-compat";
        version = "0.2.1.3";
+       revision = "1";
        sha256 = "15388p9ybdn6digk6cpdsw6havd0yva8vvwl3p7fnc9sb59wln34";
+       editedCabalFile = "b4d1feef302a6fe59e77e822e61261eeaec449a6b56560ea8429bb1bc7dbccc6";
        buildDepends = [ base mtl ];
-       jailbreak = true;
-       homepage = "https://github.com/RyanGlScott/mtl-compat";
+       homepage = "https://github.com/haskell-compat/mtl-compat";
        description = "Backported Control.Monad.Except module from mtl";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85489,7 +88018,6 @@ self: {
        version = "2.0.2";
        sha256 = "1j42pdkiiqjkdmidgmgpfbwh2i8dwsc40labw4pm86qzsi0r8m2v";
        buildDepends = [ base mtl transformers ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
@@ -85583,7 +88111,6 @@ self: {
          http-conduit http-types process random snap-core snap-server stm
          text transformers
        ];
-       jailbreak = true;
        description = "Continuous deployment server for use with GitHub";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85607,6 +88134,7 @@ self: {
        homepage = "https://github.com/gwern/mueval";
        description = "Safely evaluate pure Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multext-east-msd" = callPackage
@@ -85675,6 +88203,7 @@ self: {
          attoparsec base base58-bytestring base64-bytestring byteable
          bytestring cryptohash hex io-streams optparse-applicative
        ];
+       jailbreak = true;
        homepage = "https://github.com/LukeHoersten/multihash";
        description = "Multihash library and CLI executable";
        license = stdenv.lib.licenses.bsd3;
@@ -85747,6 +88276,7 @@ self: {
        version = "0.0.2";
        sha256 = "02pqfkdcv4fn0pmxphg19b3fiazn4hpphfj8xgp77vpy2lczndsw";
        buildDepends = [ base transformers ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Multiplate";
        description = "Lightweight generic library for mutually recursive data types";
        license = stdenv.lib.licenses.mit;
@@ -85907,7 +88437,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "murmur-hash" = callPackage
@@ -85932,6 +88461,7 @@ self: {
        homepage = "https://github.com/niswegmann/murmurhash3";
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-articulation" = callPackage
@@ -86095,6 +88625,7 @@ self: {
        jailbreak = true;
        description = "Musical score and part representation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-sibelius" = callPackage
@@ -86150,6 +88681,7 @@ self: {
        ];
        description = "Utility for developing the Music Suite";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "musicbrainz-email" = callPackage
@@ -86233,6 +88765,7 @@ self: {
          pretty-show scientific text transformers unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/danchoi/mustache-haskell";
        description = "Straight implementation of mustache templates";
        license = stdenv.lib.licenses.mit;
@@ -86255,6 +88788,7 @@ self: {
        homepage = "http://github.com/singpolyma/mustache2hs";
        description = "Utility to generate Haskell code from Mustache templates";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mutable-containers" = callPackage
@@ -86315,18 +88849,17 @@ self: {
      }) {};
 
   "mvc" = callPackage
-    ({ mkDerivation, async, base, contravariant, managed, mmorph, pipes
-     , pipes-concurrency, transformers
+    ({ mkDerivation, async, base, contravariant, foldl, managed, mmorph
+     , pipes, pipes-concurrency, transformers
      }:
      mkDerivation {
        pname = "mvc";
-       version = "1.0.3";
-       sha256 = "1b1342qxyn2jxb3a5c9bp6ai7iwhbjxgfpbh2kjm7v75444lx78g";
+       version = "1.0.4";
+       sha256 = "0mbbcjcvd05ql76ys5fmsr57aif1bysasz91rvmp795a9wj3i83i";
        buildDepends = [
-         async base contravariant managed mmorph pipes pipes-concurrency
-         transformers
+         async base contravariant foldl managed mmorph pipes
+         pipes-concurrency transformers
        ];
-       jailbreak = true;
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86430,7 +88963,6 @@ self: {
        buildDepends = [ base cgi curl directory mtl process split ];
        description = "Binding to mybitcoin.com's Shopping Cart Interface.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysnapsession" = callPackage
@@ -86499,9 +89031,11 @@ self: {
        buildDepends = [
          base bytestring extensible-effects mysql mysql-simple
        ];
+       jailbreak = true;
        homepage = "https://github.com/ibotty/mysql-effect";
        description = "An extensible mysql effect using extensible-effects and mysql-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple" = callPackage
@@ -86535,6 +89069,7 @@ self: {
        ];
        description = "Quasi-quoter for use with mysql-simple";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple-typed" = callPackage
@@ -86562,6 +89097,7 @@ self: {
        version = "0.1.0.2";
        sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l";
        buildDepends = [ base transformers ];
+       jailbreak = true;
        homepage = "http://github.com/ifigueroap/mzv";
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
        license = stdenv.lib.licenses.bsd3;
@@ -86669,12 +89205,12 @@ self: {
      }) {};
 
   "names-th" = callPackage
-    ({ mkDerivation, base, template-haskell }:
+    ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "names-th";
-       version = "0.1.0.0";
-       sha256 = "05ghdjif8r0x8k2qqixh2wzzq356f80py1nfps6wim8g9sv1h5rc";
-       buildDepends = [ base template-haskell ];
+       version = "0.1.0.1";
+       sha256 = "1bqbh6751lmiiwvdvry796lzzbjkk8x1lhylkh61l6ycdib2qxjq";
+       buildDepends = [ base containers template-haskell ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
@@ -86784,6 +89320,7 @@ self: {
        homepage = "https://github.com/ivarnymoen/nanomsg-haskell";
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) nanomsg;};
 
   "nanoparsec" = callPackage
@@ -86835,12 +89372,11 @@ self: {
      }) {};
 
   "nats" = callPackage
-    ({ mkDerivation, base, hashable }:
+    ({ mkDerivation }:
      mkDerivation {
        pname = "nats";
        version = "1";
        sha256 = "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0";
-       buildDepends = [ base hashable ];
        homepage = "http://github.com/ekmett/nats/";
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -86864,6 +89400,7 @@ self: {
        ];
        description = "Haskell API for NATS messaging system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "natural-number" = callPackage
@@ -87002,6 +89539,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) ncurses;};
 
   "neat" = callPackage
@@ -87016,6 +89554,7 @@ self: {
        homepage = "https://github.com/ajg/neat";
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neat-interpolation" = callPackage
@@ -87027,6 +89566,7 @@ self: {
        sha256 = "0hjv33gpikfiwfhzna35bxiqh62d54776d3ahfb98dxfrjijl20c";
        buildDepends = [ base base-prelude parsec template-haskell ];
        testDepends = [ base-prelude HTF ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
        license = stdenv.lib.licenses.mit;
@@ -87048,6 +89588,7 @@ self: {
        homepage = "http://scrambledeggsontoast.github.io/2014/09/28/needle-announce/";
        description = "ASCII-fied arrow notation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nehe-tuts" = callPackage
@@ -87094,6 +89635,7 @@ self: {
        version = "0.3.1.1";
        sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf";
        buildDepends = [ base failure transformers ];
+       jailbreak = true;
        homepage = "http://github.com/snoyberg/neither";
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
@@ -87113,6 +89655,7 @@ self: {
        homepage = "http://github.com/nfjinjing/nemesis";
        description = "a task management tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nemesis-titan" = callPackage
@@ -87130,6 +89673,7 @@ self: {
        homepage = "http://github.com/nfjinjing/nemesis-titan";
        description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nerf" = callPackage
@@ -87162,35 +89706,67 @@ self: {
      }:
      mkDerivation {
        pname = "nero";
-       version = "0.2";
-       sha256 = "1jw8sji0ci4za62zgjdlxsh9rknaj3pdm7p32rxdd33i6ir6pmh0";
+       version = "0.3.1";
+       sha256 = "1nmikqdxih91xhppn72a4xsrszj4050xl9winjsm62k5wdm9ld50";
        buildDepends = [ base bifunctors bytestring containers lens text ];
        testDepends = [
          base bytestring doctest Glob lens tasty tasty-hunit text
        ];
-       homepage = "https://github.com/jdnavarro/nero";
+       homepage = "https://github.com/plutonbrb/nero";
        description = "Lens-based HTTP toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nero-wai" = callPackage
+    ({ mkDerivation, base, bytestring, http-types, lens, nero, text
+     , wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "nero-wai";
+       version = "0.3";
+       sha256 = "1jz2was51lfqiq1krrjljy7yl2z49nlj72x9dspc748dznizb8aw";
+       buildDepends = [
+         base bytestring http-types lens nero text wai wai-extra
+       ];
+       homepage = "https://github.com/plutonbrb/nero-wai";
+       description = "WAI adapter for Nero server applications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "nero-warp" = callPackage
+    ({ mkDerivation, base, nero, nero-wai, warp }:
+     mkDerivation {
+       pname = "nero-warp";
+       version = "0.3";
+       sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s";
+       buildDepends = [ base nero nero-wai warp ];
+       homepage = "https://github.com/plutonbrb/nero-warp";
+       description = "Run Nero server applications with Warp";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "nested-routes" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
-     , hspec, http-types, lucid, mtl, pseudo-trie, QuickCheck
-     , quickcheck-instances, semigroups, text, transformers, wai
-     , wai-extra
+    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+     , constraints, containers, hspec, http-types, lucid, mtl
+     , poly-arity, pred-trie, QuickCheck, quickcheck-instances
+     , semigroups, text, transformers, wai, wai-extra
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "0.1";
-       sha256 = "0fz6lshm79iy62bxgg22bgrn8irgfalp5a3dllzlhbci8q5xs02k";
+       version = "0.3";
+       sha256 = "04cgy9hvriq4r8imi23s5lpvbvvdg8a3a51ypmwwgk6vss84jz1l";
        buildDepends = [
-         aeson base blaze-html bytestring containers http-types lucid mtl
-         pseudo-trie semigroups text transformers wai wai-extra
+         aeson attoparsec base blaze-html bytestring constraints containers
+         http-types lucid mtl poly-arity pred-trie semigroups text
+         transformers wai wai-extra
        ];
        testDepends = [ base hspec QuickCheck quickcheck-instances ];
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nested-sets" = callPackage
@@ -87261,7 +89837,6 @@ self: {
        homepage = "http://frenetic-lang.org";
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlines" = callPackage
@@ -87348,7 +89923,9 @@ self: {
      mkDerivation {
        pname = "netrc";
        version = "0.2.0.0";
+       revision = "1";
        sha256 = "11iax3ick0im397jyyjkny7lax9bgrlgk90a25dp2jsglkphfpls";
+       editedCabalFile = "55e4e8785866fa2145f9b4de21522d4092a7c486845062915704b2917b8c4fbd";
        buildDepends = [ base bytestring deepseq parsec ];
        testDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
@@ -87384,6 +89961,7 @@ self: {
        version = "0.1.1";
        sha256 = "1n1g8d8507i0k4i93wb4i6yh7j7l3r0d9dfgxwl02hsk1svk5hkm";
        buildDepends = [ base bytestring enumerator transformers ];
+       jailbreak = true;
        homepage = "https://john-millikin.com/software/netstring-enumerator/";
        description = "Enumerator-based netstring parsing";
        license = stdenv.lib.licenses.gpl3;
@@ -87411,6 +89989,7 @@ self: {
        homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -87428,7 +90007,6 @@ self: {
        jailbreak = true;
        description = "FRP for controlling networks of OpenFlow switches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nettle-netkit" = callPackage
@@ -87444,7 +90022,6 @@ self: {
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nettle-openflow" = callPackage
@@ -87461,7 +90038,6 @@ self: {
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netwire" = callPackage
@@ -87490,6 +90066,7 @@ self: {
        version = "0.0.3";
        sha256 = "0c6wi1gfr0pxm8hav6ziic444a83cns3yf07kdylxbymgzgq7n7z";
        buildDepends = [ base netwire ];
+       jailbreak = true;
        homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
        license = stdenv.lib.licenses.mit;
@@ -87505,6 +90082,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers GLFW-b mtl netwire-input stm ];
+       jailbreak = true;
        homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
@@ -87578,15 +90156,16 @@ self: {
      }:
      mkDerivation {
        pname = "network-api-support";
-       version = "0.1.0";
-       sha256 = "11x9f1cbakwaqxs995vk9ardbf1h7zdg39n7nykhrr387biyq653";
+       version = "0.2.0";
+       sha256 = "01ambd53cf2n4y3c1j62wav3jz09s5vml87gkg69bl6h1g63zls1";
        buildDepends = [
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
        ];
-       homepage = "https://github.com/apiengine/network-api-support";
+       homepage = "https://github.com/markhibberd/network-api-support";
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-attoparsec" = callPackage
@@ -87671,6 +90250,7 @@ self: {
        version = "1.0.2";
        sha256 = "0r9riydwvmn8v9iih475agl4idb3z6v3djmn3pjlda28g3p0zw9h";
        buildDepends = [ base bytestring network text time vector ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
@@ -87696,8 +90276,8 @@ self: {
      }:
      mkDerivation {
        pname = "network-conduit-tls";
-       version = "1.1.1";
-       sha256 = "0wq074k6nwn3h1ww1an7n6i9zx6ii9hsm9vw6x51w22mp787dj1p";
+       version = "1.1.2";
+       sha256 = "0y3cqvakc676xdzc1hg9afv6aqzvj2pp4pci6cgs4bmm3kc3chfs";
        buildDepends = [
          base bytestring conduit conduit-extra connection cprng-aes
          data-default monad-control network streaming-commons system-fileio
@@ -87737,6 +90317,7 @@ self: {
        buildDepends = [ base bytestring cereal pretty prettyclass ];
        description = "Library for network data structures and their serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-dbus" = callPackage
@@ -87810,6 +90391,7 @@ self: {
        homepage = "https://github.com/nh2/network-house";
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-info" = callPackage
@@ -87964,6 +90546,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-xmpp/";
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-rpca" = callPackage
@@ -88011,9 +90594,11 @@ self: {
        buildDepends = [
          base base64-bytestring bytestring network network-simple
        ];
+       jailbreak = true;
        homepage = "https://github.com/angerman/network-service";
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-simple" = callPackage
@@ -88036,15 +90621,14 @@ self: {
      }:
      mkDerivation {
        pname = "network-simple-sockaddr";
-       version = "0.1";
-       sha256 = "0k54scgxwgj57vqpfshr0cr6a70nsfhrfvfjh77x17imk1795npw";
+       version = "0.2";
+       sha256 = "0c7jjdpzvbpg29njr1w0kn26m3pxa8q1z3sh7bfh933spnvqm52x";
        buildDepends = [
          base bytestring directory exceptions network transformers
        ];
        homepage = "https://github.com/jdnavarro/network-simple-sockaddr";
        description = "network-simple for resolved addresses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-simple-tls" = callPackage
@@ -88132,6 +90716,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-transport-amqp" = callPackage
+    ({ mkDerivation, amqp, async, base, bytestring, cereal, containers
+     , exceptions, lens-family, lens-family-th, network-transport
+     , network-transport-tests, stm, stm-chans, string-conv, tasty
+     , tasty-hunit, text, uuid
+     }:
+     mkDerivation {
+       pname = "network-transport-amqp";
+       version = "0.1.0.0";
+       sha256 = "1165xl5g8m423y4nvzwpihzrv6nc9y2dyr6dm4sqp6n1bw4dqqdq";
+       buildDepends = [
+         amqp async base bytestring cereal containers exceptions lens-family
+         lens-family-th network-transport stm stm-chans string-conv text
+         uuid
+       ];
+       testDepends = [
+         amqp base network-transport network-transport-tests tasty
+         tasty-hunit
+       ];
+       description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-transport-tcp" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , network, network-transport, network-transport-tests
@@ -88191,9 +90799,11 @@ self: {
          network-transport network-transport-tests stm stm-chans tasty
          tasty-hunit test-framework zeromq4-haskell
        ];
+       jailbreak = true;
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-uri" = callPackage
@@ -88252,6 +90862,7 @@ self: {
        buildDepends = [
          base binary bytestring containers network time transformers
        ];
+       jailbreak = true;
        description = "Networked-game support library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88282,6 +90893,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers fixedprec random superdoc time ];
+       jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/newsynth/";
        description = "Exact and approximate synthesis of quantum circuits";
        license = stdenv.lib.licenses.gpl3;
@@ -88328,8 +90940,8 @@ self: {
      }:
      mkDerivation {
        pname = "newtype-deriving";
-       version = "0.1.1";
-       sha256 = "16rfzkmay9gpy75l56i6ra6vjramvq8dwpq0adsh7xqpx101cd21";
+       version = "0.1.2";
+       sha256 = "15ajk0vbh4habil8339naajy7l086cryqw52ifv1agjyn9kmlixa";
        buildDepends = [
          base base-prelude monad-control template-haskell transformers
          transformers-base
@@ -88367,6 +90979,7 @@ self: {
        homepage = "http://github.com/mgsloan/newtype-th";
        description = "A template haskell deriver to create Control.Newtype instances.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtyper" = callPackage
@@ -88392,6 +91005,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nf" = callPackage
+    ({ mkDerivation, base, deepseq }:
+     mkDerivation {
+       pname = "nf";
+       version = "1.0.0.3";
+       sha256 = "0k6zlya37fhbx154z6gjrg4bbncvwgq4ra6y97l10aajyg4a4gxc";
+       buildDepends = [ base deepseq ];
+       homepage = "https://github.com/ezyang/nf";
+       description = "NF data type to statically enforce normal form";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ngrams-loader" = callPackage
     ({ mkDerivation, attoparsec, base, machines, mtl, parseargs
      , resourcet, sqlite-simple, text
@@ -88409,6 +91034,7 @@ self: {
        homepage = "http://github.com/YoEight/ngrams-loader";
        description = "Ngrams loader based on http://www.ngrams.info format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nibblestring" = callPackage
@@ -88476,6 +91102,7 @@ self: {
        homepage = "https://github.com/dahlia/nicovideo-translator";
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nikepub" = callPackage
@@ -88628,6 +91255,7 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "no-role-annots" = callPackage
@@ -88697,8 +91325,8 @@ self: {
      }:
      mkDerivation {
        pname = "nonce";
-       version = "1.0.1";
-       sha256 = "10vlm550m0hjl004rwcz70j1d89sd9g0fnxxxksvk8nxqf9fnfpr";
+       version = "1.0.2";
+       sha256 = "1l4w6bdrwa42r90n6xzwr8lz2fdrn3m763ls311pnygajr4ih10h";
        buildDepends = [
          base base64-bytestring bytestring cprng-aes crypto-random text
          transformers
@@ -88717,6 +91345,7 @@ self: {
        buildDepends = [ base containers mtl ];
        description = "A monad and monad transformer for nondeterministic computations";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonfree" = callPackage
@@ -88769,6 +91398,7 @@ self: {
        homepage = "https://github.com/jessopher/noodle";
        description = "the noodle programming language";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "normaldistribution" = callPackage
@@ -88785,14 +91415,16 @@ self: {
 
   "not-gloss" = callPackage
     ({ mkDerivation, base, binary, bmp, bytestring, cereal, GLUT
-     , OpenGLRaw, spatial-math, time
+     , OpenGL, OpenGLRaw, spatial-math, time, vector
+     , vector-binary-instances
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.2.1";
-       sha256 = "0jkdfkkacb4qsf9f229z79ihrzm9xsgc7pnw96ainmnhjgvfmihj";
+       version = "0.7.3.0";
+       sha256 = "0c5i2c8z15ibdhq9czacazm8wzmngchnbw2hjyypq8vj7y8bhjs2";
        buildDepends = [
-         base binary bmp bytestring cereal GLUT OpenGLRaw spatial-math time
+         base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
+         spatial-math time vector vector-binary-instances
        ];
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
@@ -88832,35 +91464,32 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "notcpp";
-       version = "0.2.0.2";
-       sha256 = "1qdqwwy16n43djgrynzn8xv64vv450my6z2xddypafxwhvp7jaqy";
+       version = "0.2.0.3";
+       sha256 = "15aa96zdz60x9wc9k8ad5qkc4bs5rbgm9xvsykf3ppyys2z449ca";
        buildDepends = [ base template-haskell ];
        testDepends = [ base template-haskell ];
-       jailbreak = true;
        description = "Avoiding the C preprocessor via cunning use of Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "notmuch-haskell" = callPackage
-    ({ mkDerivation, base, containers, filepath, glib, gmime, haskell98
-     , notmuch, nsl, old-locale, parseargs, talloc, time, xapian, zlib
+    ({ mkDerivation, base, containers, filepath, notmuch, old-locale
+     , parseargs, time
      }:
      mkDerivation {
        pname = "notmuch-haskell";
-       version = "0.2.2";
-       sha256 = "1i86cwwvisgyc89nmd7drwszmq4cqrwgci9zqwh50zg9cgq5qhz5";
+       version = "1.0.0.3";
+       sha256 = "0znbsvbjj3995mn04zaxgv0q90qplwjkwhwjkmz1k5jxajxgwwzj";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base containers filepath haskell98 old-locale parseargs time
+         base containers filepath old-locale parseargs time
        ];
-       extraLibraries = [ glib gmime notmuch nsl talloc xapian zlib ];
+       extraLibraries = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) glib;  inherit (pkgs) gmime;
-          inherit (pkgs) notmuch;  nsl = null;  inherit (pkgs) talloc;
-          inherit (pkgs) xapian;  inherit (pkgs) zlib;};
+     }) { inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
@@ -88904,10 +91533,9 @@ self: {
     ({ mkDerivation, base, containers, numeric-prelude, primes }:
      mkDerivation {
        pname = "np-extras";
-       version = "0.3";
-       sha256 = "14lphbssmcvabg1rqzhy4bwvssfyzb69b2g9n45vd22xnvf9q0il";
+       version = "0.3.0.1";
+       sha256 = "19mj868qpvaqmv8j83hcfyrspbg24bc2vdad3gp1wcrrpbj7ib0m";
        buildDepends = [ base containers numeric-prelude primes ];
-       jailbreak = true;
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88945,6 +91573,7 @@ self: {
        ];
        description = "A collection of random tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nsis" = callPackage
@@ -89060,6 +91689,7 @@ self: {
        homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numerals-base" = callPackage
@@ -89138,6 +91768,7 @@ self: {
        sha256 = "0zxiaiqzcg4z354wyvxl672ffswvhbqk6h6nvpgmydw84akpimcm";
        buildDepends = [ base loch-th placeholders template-haskell ];
        testDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/numeric-qq";
        description = "Quasi-quoters for numbers of different bases";
        license = stdenv.lib.licenses.mit;
@@ -89229,6 +91860,7 @@ self: {
        buildDepends = [ base bytestring mtl ncurses text ];
        description = "Bored? Nyan cat!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nymphaea" = callPackage
@@ -89247,6 +91879,7 @@ self: {
        jailbreak = true;
        description = "An interactive GUI for manipulating L-systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oauthenticated" = callPackage
@@ -89265,6 +91898,7 @@ self: {
          http-client http-types mtl network network-uri text time
          transformers
        ];
+       jailbreak = true;
        description = "Simple OAuth for http-client";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -89299,7 +91933,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "Oberon0 Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "obj" = callPackage
@@ -89336,6 +91969,7 @@ self: {
          base bytestring bytestring-arbitrary cereal QuickCheck tasty
          tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/tsuraan/objectid";
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
@@ -89343,38 +91977,43 @@ self: {
 
   "objective" = callPackage
     ({ mkDerivation, base, containers, either, exceptions, free
-     , hashable, monad-stm, profunctors, stm, transformers
+     , hashable, monad-skeleton, monad-stm, mtl, profunctors, stm
+     , template-haskell, transformers, transformers-compat
      , unordered-containers, void, witherable
      }:
      mkDerivation {
        pname = "objective";
-       version = "1.0.3";
-       sha256 = "1b6062isdmy5v6diqsgd8bigkmk4xy83hjglqrfns4n1a5c3fgzg";
+       version = "1.0.4";
+       sha256 = "0wadqf19nd7ldh92nv20q20j6zdk7jfafvi3zr06i2jlm8gq9dsn";
        buildDepends = [
-         base containers either exceptions free hashable monad-stm
-         profunctors stm transformers unordered-containers void witherable
+         base containers either exceptions free hashable monad-skeleton
+         monad-stm mtl profunctors stm template-haskell transformers
+         transformers-compat unordered-containers void witherable
        ];
        homepage = "https://github.com/fumieval/objective";
-       description = "Extensible objects";
+       description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
-     , either, errors, hspec, hspec-expectations, http-client
-     , http-types, lens, mtl, text, time, transformers
-     , unordered-containers, wreq, xmlhtml
+     , either, errors, ghc-prim, hspec, hspec-expectations, http-client
+     , http-types, lens, mtl, optparse-applicative, text, time
+     , transformers, unordered-containers, utf8-string, wreq-sb, xmlhtml
+     , yaml
      }:
      mkDerivation {
        pname = "octohat";
-       version = "0.1.2";
-       sha256 = "1mqakxvi2rh4w8bvd1galpcj33yjabj5c3kz1baw75p7sw2b081r";
+       version = "0.1.4.2";
+       sha256 = "0say5682zqv4ss6q9v4p171vprdl6aa7aaack1y0526qq7gj05l2";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
          aeson base base-compat base16-bytestring base64-bytestring
-         bytestring containers cryptohash dotenv either errors http-client
-         http-types lens mtl text time transformers unordered-containers
-         wreq xmlhtml
+         bytestring containers cryptohash dotenv either errors ghc-prim
+         http-client http-types lens mtl optparse-applicative text time
+         transformers unordered-containers utf8-string wreq-sb xmlhtml yaml
        ];
        testDepends = [
          base base-compat dotenv hspec hspec-expectations text transformers
@@ -89383,6 +92022,7 @@ self: {
        homepage = "https://github.com/stackbuilders/octohat";
        description = "A tested, minimal wrapper around GitHub's API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "octopus" = callPackage
@@ -89463,6 +92103,7 @@ self: {
        homepage = "http://www.github.com/massysett/ofx";
        description = "Parser for OFX data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ohloh-hs" = callPackage
@@ -89502,6 +92143,7 @@ self: {
        ];
        description = "Library for purely functional lazy interactions with the outer world";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ois-input-manager" = callPackage
@@ -89518,7 +92160,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { OIS = null;};
 
-  "old-locale_1_0_0_7" = callPackage
+  "old-locale" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "old-locale";
@@ -89529,7 +92171,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "old-time_1_1_0_3" = callPackage
+  "old-time" = callPackage
     ({ mkDerivation, base, old-locale }:
      mkDerivation {
        pname = "old-time";
@@ -89558,6 +92200,7 @@ self: {
        jailbreak = true;
        description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omaketex" = callPackage
@@ -89596,6 +92239,7 @@ self: {
        homepage = "http://code.google.com/p/omega/";
        description = "A purely functional programming language and a proof system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omnicodec" = callPackage
@@ -89665,6 +92309,24 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "one-time-password" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, cereal, cryptohash
+     , tasty, tasty-hunit, time
+     }:
+     mkDerivation {
+       pname = "one-time-password";
+       version = "1.0.0.1";
+       sha256 = "1kpwx8lpk764qva536v9x7xskjy94rj8xwwnhsqakps6r29c7qa0";
+       buildDepends = [ base byteable bytestring cereal cryptohash time ];
+       testDepends = [
+         base bytestring cryptohash tasty tasty-hunit time
+       ];
+       homepage = "https://github.com/s9gf4ult/one-time-password";
+       description = "HMAC-Based and Time-Based One-Time Passwords";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "oneOfN" = callPackage
@@ -89686,9 +92348,11 @@ self: {
        version = "0.1.0.3";
        sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/thinkpad20/oneormore";
        description = "A never-empty list type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "only" = callPackage
@@ -89776,16 +92440,17 @@ self: {
      }) {};
 
   "open-typerep" = callPackage
-    ({ mkDerivation, base, constraints, syntactic, tagged }:
+    ({ mkDerivation, base, constraints, mtl, syntactic, tagged }:
      mkDerivation {
        pname = "open-typerep";
-       version = "0.2";
-       sha256 = "0z1bp7hansv2zzvwq3n8yqln9pi9vlby5s9mlb7v8wrj99w563lp";
-       buildDepends = [ base constraints syntactic tagged ];
+       version = "0.3.1";
+       sha256 = "1wx3rh7fzq5d4g45k4fjwv0yh5grcqpvzlf2ixkni20d9rhb0yzs";
+       buildDepends = [ base constraints mtl syntactic tagged ];
        testDepends = [ base ];
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-union" = callPackage
@@ -90007,23 +92672,26 @@ self: {
      }) {};
 
   "openssh-github-keys" = callPackage
-    ({ mkDerivation, base, directory, dotenv, filepath, hspec, octohat
-     , optparse-applicative, text, unix
+    ({ mkDerivation, base, directory, dotenv, filepath, hspec
+     , keyword-args, octohat, optparse-applicative, parsec, text, unix
      }:
      mkDerivation {
        pname = "openssh-github-keys";
-       version = "0.1.0.0";
-       sha256 = "0zm7rypr2lsvidl8sl64nh7zc3r0m1yz606n9g7n3gr2dya4c032";
+       version = "0.1.1.0";
+       sha256 = "0a7vfbw84p3iyggq92yhw2dcsmk1cycxaq3v1104i7ipr2kdm36a";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base directory dotenv filepath octohat optparse-applicative text
-         unix
+         base directory dotenv filepath keyword-args octohat
+         optparse-applicative parsec text unix
+       ];
+       testDepends = [
+         base hspec keyword-args octohat optparse-applicative parsec text
        ];
-       testDepends = [ base hspec octohat text ];
        homepage = "https://github.com/stackbuilders/openssh-github-keys";
-       description = "Fetch OpenSSH keys from a Github team";
+       description = "Fetch OpenSSH keys from a GitHub team";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openssl-createkey" = callPackage
@@ -90195,6 +92863,7 @@ self: {
        testDepends = [
          base bytestring bytestring-arbitrary deepseq QuickCheck vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/tsuraan/optimal-blocks";
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
@@ -90235,7 +92904,6 @@ self: {
        homepage = "http://optimusprime.posterous.com/";
        description = "A supercompiler for f-lite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optional" = callPackage
@@ -90269,12 +92937,12 @@ self: {
      }) {};
 
   "options-time" = callPackage
-    ({ mkDerivation, base, chell, old-locale, options, time }:
+    ({ mkDerivation, base, chell, options, time }:
      mkDerivation {
        pname = "options-time";
        version = "1.0.1";
        sha256 = "0rsmwalmnry71w23k6sg0a307xgb2s71j9s12zqqq380fw6c1bhm";
-       buildDepends = [ base old-locale options time ];
+       buildDepends = [ base options time ];
        testDepends = [ base chell options time ];
        homepage = "https://john-millikin.com/software/haskell-options/";
        description = "Command-line option types for dates and times";
@@ -90316,6 +92984,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optparse-simple" = callPackage
+    ({ mkDerivation, base, either, gitrev, optparse-applicative
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "optparse-simple";
+       version = "0.0.2";
+       sha256 = "07zq89bhkfm08mq4wnnxafgvcv5y53fmjiamfj50mqskzv21i9i7";
+       buildDepends = [
+         base either gitrev optparse-applicative template-haskell
+         transformers
+       ];
+       description = "Simple interface to optparse-applicative";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "orc" = callPackage
     ({ mkDerivation, base, deepseq, monadIO, mtl, process, random, stm
      }:
@@ -90338,8 +93022,8 @@ self: {
      }:
      mkDerivation {
        pname = "orchestrate";
-       version = "0.2.0.0";
-       sha256 = "0d9p6b4ficxbsxmig7zjm130v2k60q8jskcm2gvjlg7z8xsqmhzl";
+       version = "0.2.0.2";
+       sha256 = "09h9jqni25ysalw747xbf532m0gvy8najjwbn3jj7d3z50s0vf8z";
        buildDepends = [
          aeson base bytestring case-insensitive data-default either errors
          http-client http-types lens mtl text transformers
@@ -90494,8 +93178,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.1.0";
-       sha256 = "1n1azp4ymsc9z89x39ycxx45hax8h2pqyr18q9sc88rawr31k4f8";
+       version = "0.1.0.4";
+       sha256 = "098zl8nyph459zyla0y2mkqiy78zp74yzadrnwa6xv07i5zs125h";
        buildDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
@@ -90504,8 +93188,7 @@ self: {
          aeson attoparsec base bytestring containers hashable HUnit
          old-locale tasty tasty-hunit text thyme unordered-containers
        ];
-       jailbreak = true;
-       description = "A parser and writer for org-mode flavored documents";
+       description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -90525,6 +93208,7 @@ self: {
        homepage = "http://github.com/nedervold/origami";
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "os-release" = callPackage
@@ -90653,6 +93337,7 @@ self: {
        version = "0.4.0";
        sha256 = "19ps1dk855br5h9x72f26sjx8xnh4gmqb0cf5mi65jpp5zvp0zj9";
        buildDepends = [ array base bytestring lens transformers vector ];
+       jailbreak = true;
        homepage = "https://github.com/capsjac/pack";
        description = "Bidirectional fast ByteString packer/unpacker";
        license = stdenv.lib.licenses.bsd3;
@@ -90716,8 +93401,8 @@ self: {
      }:
      mkDerivation {
        pname = "packed-dawg";
-       version = "0.2.0.4";
-       sha256 = "0lvn1kj5mqy22lkm3h5yhsqw83kv6nwdwm6yvgia3xr0c8nnvx4c";
+       version = "0.2.0.5";
+       sha256 = "1b8lhigpzj1zvah6f4ra7pczhpm8dxcwaqna8p1ifbbx2ys6x59p";
        buildDepends = [
          base binary deepseq mtl unordered-containers vector
          vector-binary-instances
@@ -90828,9 +93513,11 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ aeson base bytestring containers lens text wreq ];
+       jailbreak = true;
        homepage = "https://github.com/diogob/pagarme_haskell";
        description = "Pagarme API wrapper";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagerduty" = callPackage
@@ -90861,8 +93548,8 @@ self: {
     ({ mkDerivation, array, base, colour, containers }:
      mkDerivation {
        pname = "palette";
-       version = "0.1.0.1";
-       sha256 = "0065b83qrmlqrm96399p3hqqd5psmvxawhwqnwkjm7gid4qgiaha";
+       version = "0.1.0.2";
+       sha256 = "1snhn4mz58ax5sd77kh1m4jicwdmlrf89j612rkz5bkavvks6rrr";
        buildDepends = [ array base colour containers ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
@@ -90924,18 +93611,15 @@ self: {
      , executable-path, extensible-exceptions, filepath, haddock-library
      , happy, highlighting-kate, hslua, HTTP, http-client
      , http-client-tls, http-types, HUnit, JuicyPixels, mtl, network
-     , network-uri, old-locale, old-time, pandoc-types, parsec, process
-     , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , texmath, text, time, unordered-containers, vector, xml, yaml
-     , zip-archive, zlib
+     , network-uri, old-time, pandoc-types, parsec, process, QuickCheck
+     , random, scientific, SHA, syb, tagsoup, temporary, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, texmath, text
+     , time, unordered-containers, vector, xml, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.13.2";
-       revision = "2";
-       sha256 = "12kd71g70d1wzz19p5yq7f00hw8d4ra8ghn83g7yzsal8igl8p76";
-       editedCabalFile = "1b9479a2579d76c43089283b6fb7a060e16050fd62fe0da896a722db815671d6";
+       version = "1.13.2.1";
+       sha256 = "0pvqi52sh3ldnszrvxlcq1s4v19haqb0wqh5rzn43pmqj2v6xnk6";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -90943,10 +93627,9 @@ self: {
          blaze-markup bytestring containers data-default deepseq-generics
          directory extensible-exceptions filepath haddock-library happy
          highlighting-kate hslua HTTP http-client http-client-tls http-types
-         JuicyPixels mtl network network-uri old-locale old-time
-         pandoc-types parsec process random scientific SHA syb tagsoup
-         temporary texmath text time unordered-containers vector xml yaml
-         zip-archive zlib
+         JuicyPixels mtl network network-uri old-time pandoc-types parsec
+         process random scientific SHA syb tagsoup temporary texmath text
+         time unordered-containers vector xml yaml zip-archive zlib
        ];
        testDepends = [
          ansi-terminal base bytestring containers Diff directory
@@ -90955,7 +93638,6 @@ self: {
          test-framework-quickcheck2 text zip-archive
        ];
        configureFlags = [ "-fhttps" "-fmake-pandoc-man-pages" ];
-       jailbreak = true;
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Conversion between markup formats";
        license = "GPL";
@@ -90969,8 +93651,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc";
-       version = "0.6";
-       sha256 = "1whi8mrbhfi8wr3qbj1lkgc1pngn8151jjri409hshl1mng4aq5b";
+       version = "0.6.0.1";
+       sha256 = "05w6djrgpgf68shhbiv42gl0lvjiv8n9rrn0cd959dl3zdznssdg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -90985,6 +93667,31 @@ self: {
        ];
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pandoc-crossref" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default, hspec
+     , mtl, pandoc, pandoc-types, process, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-crossref";
+       version = "0.1.0.1";
+       revision = "1";
+       sha256 = "06ij62dc07pr4ky7xyhdvp40a0nz79vg24dydhmcqi6qda8k6s2l";
+       editedCabalFile = "ad80b7dc6a76fa094a3748d076cd03bda219109ccf7db345a12884f63d810054";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base bytestring containers data-default mtl pandoc pandoc-types
+         yaml
+       ];
+       testDepends = [
+         base bytestring containers data-default hspec mtl pandoc
+         pandoc-types process yaml
+       ];
+       description = "Pandoc filter for cross-references";
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "pandoc-lens" = callPackage
@@ -91079,6 +93786,7 @@ self: {
        homepage = "http://pdos.csail.mit.edu/~baford/packrat/thesis/";
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "para" = callPackage
@@ -91166,7 +93874,9 @@ self: {
          base bytestring cereal deepseq here old-locale stm time
          transformers vector vector-algorithms
        ];
+       jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parallel-tree-search" = callPackage
@@ -91439,6 +94149,7 @@ self: {
        homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsec3" = callPackage
@@ -91480,8 +94191,8 @@ self: {
     ({ mkDerivation, base, hspec, parsec }:
      mkDerivation {
        pname = "parseerror-eq";
-       version = "0.1.0.0";
-       sha256 = "1vyghahkmsvd6nj5armf2i3plnzp7mkcnx4a999c3yzxpic71vic";
+       version = "0.1.0.1";
+       sha256 = "1w5hn50gwyq2qcax869nplmhrclpsxfy0ckij6ydlhmq22zh0l03";
        buildDepends = [ base parsec ];
        testDepends = [ base hspec parsec ];
        homepage = "https://github.com/stackbuilders/parseerror-eq";
@@ -91498,6 +94209,7 @@ self: {
        buildDepends = [ base ];
        description = "Parallel Parsing Processes";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsely" = callPackage
@@ -91586,8 +94298,10 @@ self: {
          bytestring-show containers deepseq derive mtl zlib
        ];
        buildTools = [ happy ];
+       jailbreak = true;
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsimony" = callPackage
@@ -91619,8 +94333,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "partial-handler";
-       version = "0.1.0";
-       sha256 = "07dhsm2r89iviz481r9wxw0scq40dgfzw0mi6klky78xn8r9x4ds";
+       version = "1.0.0.0";
+       sha256 = "1fmfiw38v77anh20xh5zzqxm2dcryyyismsagn09sc27jdgnnrzl";
        buildDepends = [ base ];
        homepage = "https://github.com/nikita-volkov/partial-handler";
        description = "A composable exception handler";
@@ -91706,14 +94420,15 @@ self: {
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "passwords" = callPackage
     ({ mkDerivation, base, containers, MonadRandom, random }:
      mkDerivation {
        pname = "passwords";
-       version = "0.1.0.5";
-       sha256 = "0m0ks6wpj800fxqry7gz69ki9bfpnix4zfqrc3sca2k88yl53miv";
+       version = "0.1.0.6";
+       sha256 = "0x345pfa28abj152kkr1afnaraf4r8pj0216ack79brxvdhlk6li";
        buildDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
@@ -91791,6 +94506,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pathfinding" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "pathfinding";
+       version = "0.1.0.0";
+       sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80";
+       buildDepends = [ base containers ];
+       homepage = "https://github.com/rvion/pathfinding";
+       description = "pathfinding in grid and graphs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pathfindingcore" = callPackage
     ({ mkDerivation, array, base, HUnit, split, tasty, tasty-hunit }:
      mkDerivation {
@@ -91839,6 +94566,7 @@ self: {
        buildDepends = [ base HandsomeSoup hxt ];
        description = "A webpage scraper for Patreon which dumps a list of patrons to a text file";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pattern-arrows" = callPackage
@@ -91891,8 +94619,8 @@ self: {
      }:
      mkDerivation {
        pname = "paypal-adaptive-hoops";
-       version = "0.10.0.1";
-       sha256 = "0h4dq8p91jbzgr19jwmvmvk9agi3id226qdm46lxpnz3w6hrh5p6";
+       version = "0.10.0.2";
+       sha256 = "1kriijissnxnid088via7gvb9gz09nvl7mw7x8qph623kpbvxxkd";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -91903,10 +94631,10 @@ self: {
          aeson base bytestring data-default HUnit test-framework
          test-framework-hunit text unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paypal-api" = callPackage
@@ -92140,8 +94868,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-content";
-       version = "0.0.3.2";
-       sha256 = "09nscaska3jpc0kkz4fgiyini8g6pk9b5p6kw5yp5nx984f8579a";
+       version = "0.0.3.3";
+       sha256 = "03kyp3nnbg4gchc4g9biavlf0hdjv77pc66jqngzjzmk8rh03k9c";
        buildDepends = [
          attoparsec base base16-bytestring bytestring containers io-streams
          pdf-toolbox-core text
@@ -92149,6 +94877,7 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-core" = callPackage
@@ -92157,8 +94886,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-core";
-       version = "0.0.3.2";
-       sha256 = "0wz9khfymnsyjrcvj2dgav1a1sjira481gx9ks7sz23h5pj69bds";
+       version = "0.0.3.3";
+       sha256 = "006fp7cvq8r4l0iif2ihi0cq8pxl5mm8vf7ny4zhaniyyf52g68m";
        buildDepends = [
          attoparsec base bytestring containers errors io-streams scientific
          transformers zlib-bindings
@@ -92166,6 +94895,7 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-document" = callPackage
@@ -92175,8 +94905,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-document";
-       version = "0.0.5.0";
-       sha256 = "0ilgbwmv2qvzbji79ybam5f2aghlqhq1jgchq39xxwrs2i40vrxz";
+       version = "0.0.5.1";
+       sha256 = "0qcnhdhxvrj9ypwyb3h7q7w6yn9jpzzrqrlhnas40lvjb9rc2yws";
        buildDepends = [
          base bytestring cipher-aes cipher-rc4 containers crypto-api
          cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
@@ -92185,6 +94915,7 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -92194,8 +94925,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-viewer";
-       version = "0.0.3.2";
-       sha256 = "14245lv0jfmvmsldrhnp9n0fk7x2wjzsamwqjphbcxw70h9hw9s8";
+       version = "0.0.3.3";
+       sha256 = "02nnxvbd5l2wni9djqmdmqagb5k10dnc1k4crlkvrc8fa9rlajz2";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -92206,6 +94937,7 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf2line" = callPackage
@@ -92227,12 +94959,15 @@ self: {
 
   "pdfinfo" = callPackage
     ({ mkDerivation, base, mtl, old-locale, process-extras, text, time
+     , time-locale-compat
      }:
      mkDerivation {
        pname = "pdfinfo";
-       version = "1.5.2";
-       sha256 = "1s2hhmcqsg57fppqjvrkp77bms1npblysjvfl37fgn0jafn0mhjq";
-       buildDepends = [ base mtl old-locale process-extras text time ];
+       version = "1.5.4";
+       sha256 = "04894cwvcn910j2b0j95dc6i9v6xriqa0v97z3vyi9dhi9yiysls";
+       buildDepends = [
+         base mtl old-locale process-extras text time time-locale-compat
+       ];
        homepage = "https://github.com/chrisdone/pdfinfo";
        description = "Wrapper around the pdfinfo command";
        license = stdenv.lib.licenses.bsd3;
@@ -92355,6 +95090,7 @@ self: {
        homepage = "http://github.com/HackerFoo/peg";
        description = "a lazy non-deterministic concatenative programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peggy" = callPackage
@@ -92377,6 +95113,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pell" = callPackage
+    ({ mkDerivation, arithmoi, base, Cabal, cabal-test-quickcheck
+     , containers, primes, QuickCheck
+     }:
+     mkDerivation {
+       pname = "pell";
+       version = "0.1.0.0";
+       sha256 = "0sxgliwhd0iplv3xd44a40vz8i2kmzvsq1a3zvbz4j77611hmnxd";
+       buildDepends = [ arithmoi base containers ];
+       testDepends = [
+         arithmoi base Cabal cabal-test-quickcheck containers primes
+         QuickCheck
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/brunjlar/pell";
+       description = "Package to solve the Generalized Pell Equation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pem" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, HUnit, mtl
      , QuickCheck, test-framework, test-framework-hunit
@@ -92502,6 +95257,7 @@ self: {
        version = "0.1.0.3";
        sha256 = "0w1vrsv43z92y6vsv9nzs2pjlqkhrxvzh53r2722530lzff34m78";
        buildDepends = [ base ];
+       jailbreak = true;
        description = "The perceptron learning algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92545,6 +95301,7 @@ self: {
        testDepends = [
          base HUnit mtl test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/sonyandy/perm";
        description = "permutation Applicative and Monad with many mtl instances";
        license = stdenv.lib.licenses.bsd3;
@@ -92602,8 +95359,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent";
-       version = "2.1.2";
-       sha256 = "17p81s1w7wqs2hm5zcwncvidd808gm4zlha7mqv9wwpf6ql1b359";
+       version = "2.1.3";
+       sha256 = "1rw160icdny4jrbymbck2gah3ca21f49yp6zkkjq8sv5mn83dbxy";
        buildDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers exceptions fast-logger lifted-base
@@ -92752,8 +95509,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-postgresql";
-       version = "2.1.3";
-       sha256 = "0hgvpfgbwb1q0zkl5g9hxdz1wh4xbl0hx26j5944qcll5f6298is";
+       version = "2.1.4";
+       sha256 = "1x9mpvc8b4rj4pc2f3d7c0720zh2f8qrqg77x19q099ycag70pmg";
        buildDepends = [
          aeson base blaze-builder bytestring conduit containers
          monad-control monad-logger persistent postgresql-libpq
@@ -92790,6 +95547,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "00kvmqisi6y8r8vpfa61kzxr0iyy6varj8920kjwsd2jk2i7q8wl";
        buildDepends = [ base time yesod ];
+       jailbreak = true;
        homepage = "https://github.com/jprider63/persistent-ratelimit";
        description = "A library for rate limiting activities with a persistent backend";
        license = stdenv.lib.licenses.mit;
@@ -92824,13 +95582,12 @@ self: {
     ({ mkDerivation, base, containers, mtl, ref-fd, transformers }:
      mkDerivation {
        pname = "persistent-refs";
-       version = "0.3";
-       sha256 = "0575lg2fd5qnfb0p7y1gg2aqdg39435nkab8291x642cdz1jbg6s";
+       version = "0.4";
+       sha256 = "1lyhz0cywls91a6crjq5v8x4h4740s73h3blvbkr6fg26kh11cs6";
        buildDepends = [ base containers mtl ref-fd transformers ];
        homepage = "https://github.com/acfoltzer/persistent-refs";
        description = "Haskell references backed by an IntMap for persistence and reversibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-sqlite" = callPackage
@@ -92864,8 +95621,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-template";
-       version = "2.1.1";
-       sha256 = "1bvmxpx8dqqsq87v079sw8wy795iykkz0fknrlpxhywja2j40dxc";
+       version = "2.1.3";
+       sha256 = "1b0li6hkir2rnya8ci1wcn77vxmg26i6blmxcvkdgc4jph23ca2p";
        buildDepends = [
          aeson base bytestring containers ghc-prim monad-control
          monad-logger path-pieces persistent tagged template-haskell text
@@ -92885,8 +95642,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-vector";
-       version = "0.1.0.1";
-       sha256 = "0a2ck5q9cz8q1hplqrqcanrvlgl001vfb8cyl7rcag2bgxlj29r4";
+       version = "0.1.1";
+       sha256 = "1l5v02pjb24gk4hw28knjp55l7z6jzcfiklfikd2nqbl7866c2j2";
        buildDepends = [ base deepseq ];
        testDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
@@ -92922,6 +95679,7 @@ self: {
          template-haskell text time transformers transformers-base
          utf8-string
        ];
+       jailbreak = true;
        description = "Backend for persistent library using Zookeeper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92941,6 +95699,7 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-persona";
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persona-idp" = callPackage
@@ -92963,6 +95722,7 @@ self: {
        homepage = "https://github.com/frasertweedale/hs-persona-idp";
        description = "Persona (BrowserID) Identity Provider";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pesca" = callPackage
@@ -93052,8 +95812,8 @@ self: {
      }:
      mkDerivation {
        pname = "pgdl";
-       version = "8.0";
-       sha256 = "1pll0zr16f1h53vcsbbd69x8kkim165mvlgmlgdpf4p9gll01pra";
+       version = "8.1";
+       sha256 = "1zzxgap0ipr4l63fc2rf7wxda03ss0f3wxpz6mlh066p7h9wfhyj";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -93062,6 +95822,7 @@ self: {
        ];
        description = "pgdownloader";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgm" = callPackage
@@ -93076,6 +95837,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pgp-wordlist" = callPackage
+    ({ mkDerivation, base, bytestring, containers, HUnit, tasty
+     , tasty-hunit, tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "pgp-wordlist";
+       version = "0.1.0.1";
+       sha256 = "123d8fh1bd78iq4n00xc873zsnizczzdl372vkl87z4lpivfkpd3";
+       buildDepends = [ base bytestring containers text vector ];
+       testDepends = [
+         base bytestring HUnit tasty tasty-hunit tasty-quickcheck text
+       ];
+       homepage = "https://github.com/quchen/pgp-wordlist";
+       description = "Translate between binary data and a human-readable collection of words";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pgsql-simple" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, binary
      , blaze-builder, blaze-textual, bytestring, containers
@@ -93095,6 +95873,7 @@ self: {
        homepage = "https://github.com/chrisdone/pgsql-simple";
        description = "A mid-level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phantom-state" = callPackage
@@ -93137,6 +95916,7 @@ self: {
          tasty-smallcheck
        ];
        extraLibraries = [ pHash ];
+       jailbreak = true;
        homepage = "http://github.com/michaelxavier/phash";
        description = "Haskell bindings to pHash, the open source perceptual hash library";
        license = stdenv.lib.licenses.gpl3;
@@ -93256,7 +96036,6 @@ self: {
        homepage = "http://www.cs.indiana.edu/~rrnewton/projects/phybin/";
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pi-calculus" = callPackage
@@ -93281,6 +96060,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pia-forward" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, directory
+     , filepath, http-client, http-client-tls, network-info, process
+     , random, text, text-format, time, xdg-basedir
+     }:
+     mkDerivation {
+       pname = "pia-forward";
+       version = "0.1.0.1";
+       sha256 = "02ryfiibkbfx6zg1n0h8kvb4mkiai57cvllqcwp815x50rsrpd2r";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring data-default directory filepath http-client
+         http-client-tls network-info process random text text-format time
+         xdg-basedir
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/enolan/pia-forward";
+       description = "Set up port forwarding with the Private Internet Access VPN service";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "pianola" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-iteratee, base, bytestring
      , comonad, comonad-transformers, containers, either, errors
@@ -93313,6 +96114,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers mtl parsec picosat pretty ];
+       jailbreak = true;
        homepage = "https://github.com/sdiehl/picologic";
        description = "Utilities for symbolic predicate logic expressions";
        license = stdenv.lib.licenses.mit;
@@ -93327,8 +96129,8 @@ self: {
      }:
      mkDerivation {
        pname = "picoparsec";
-       version = "0.1.2.1";
-       sha256 = "1nlklprhnr0cgmzfp9vnyv9knn3qz5dlhpxr036fygaad67950ci";
+       version = "0.1.2.2";
+       sha256 = "1gf51clsfllfpmpm4bfzyicwk1zz3kymyi8zcdfm5y5rhg1yjcg9";
        buildDepends = [
          array base bytestring containers deepseq monoid-subclasses
          scientific text
@@ -93350,6 +96152,7 @@ self: {
        version = "0.1.2";
        sha256 = "0x43fbhlinqflrvv548bxjrslnnsprklqig6iv9l8q9xv83scrvg";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/sdiehl/haskell-picosat";
        description = "Bindings to the PicoSAT solver";
        license = stdenv.lib.licenses.mit;
@@ -93402,6 +96205,7 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes" = callPackage
@@ -93524,6 +96328,7 @@ self: {
        buildDepends = [
          base bytestring cereal-plus errors mtl pipes pipes-bytestring text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/pipes-cereal-plus";
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
        license = stdenv.lib.licenses.mit;
@@ -93536,8 +96341,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-cliff";
-       version = "0.10.0.0";
-       sha256 = "1xzjw7bd96q7fg7q43rvcxv29p6ziknp6z08qzrnx5i4w9gjnk8s";
+       version = "0.10.0.2";
+       sha256 = "1j912dshjf2pdj87rlib4nqd00i99hz74cxhrf2ddlaabml9fs98";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -93598,6 +96403,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf";
        buildDepends = [ base courier pipes ];
+       jailbreak = true;
        homepage = "http://github.com/kvanberendonck/pipes-courier";
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
@@ -93628,8 +96434,8 @@ self: {
     ({ mkDerivation, base, errors, pipes }:
      mkDerivation {
        pname = "pipes-errors";
-       version = "0.2";
-       sha256 = "1lnb8pgp4a8rcsnz2kc34zzpbf781vw7cvphs7birsnb2r2w6waw";
+       version = "0.2.1";
+       sha256 = "08i3rzqz7r5vkjfry0bdw3gpxjzhni8xmwwa6p8hdkixznjq7539";
        buildDepends = [ base errors pipes ];
        homepage = "https://github.com/jdnavarro/pipes-errors";
        description = "Integration between pipes and errors";
@@ -93670,6 +96476,7 @@ self: {
        testDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
        ];
+       jailbreak = true;
        description = "Extra utilities for pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93756,8 +96563,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-p2p";
-       version = "0.3";
-       sha256 = "0iig35b2m30dqc0f9p9n3cfz2f21ac2rkqw6cvaydfvh31vbh4iw";
+       version = "0.4";
+       sha256 = "1ls89dnz0aibmyy4mky7jl4ibirpfrs12yxmflarghv3j6rn0wnc";
        buildDepends = [
          async base binary bytestring errors exceptions mtl network
          network-simple-sockaddr pipes pipes-concurrency pipes-network
@@ -93765,7 +96572,6 @@ self: {
        homepage = "https://github.com/jdnavarro/pipes-p2p";
        description = "P2P network nodes with pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-p2p-examples" = callPackage
@@ -93782,6 +96588,7 @@ self: {
          base binary bytestring containers errors mtl network
          network-simple-sockaddr pipes pipes-network pipes-p2p
        ];
+       jailbreak = true;
        homepage = "https://github.com/jdnavarro/pipes-p2p-examples";
        description = "Examples using pipes-p2p";
        license = stdenv.lib.licenses.bsd3;
@@ -93895,6 +96702,7 @@ self: {
        jailbreak = true;
        description = "Various proxies for streaming data into vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-wai" = callPackage
@@ -94001,6 +96809,7 @@ self: {
          base bytestring directory filepath optparse-applicative process
          temporary text unordered-containers yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/chiro/haskell-pit";
        description = "Account management tool";
        license = stdenv.lib.licenses.mit;
@@ -94068,7 +96877,6 @@ self: {
        homepage = "https://secure.plaimi.net/works/plailude";
        description = "plaimi's prelude";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "planar-graph" = callPackage
@@ -94086,6 +96894,7 @@ self: {
        jailbreak = true;
        description = "A representation of planar graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plat" = callPackage
@@ -94097,6 +96906,7 @@ self: {
        buildDepends = [ base bytestring containers mtl utf8-string ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "playlists" = callPackage
@@ -94185,8 +96995,8 @@ self: {
      }:
      mkDerivation {
        pname = "plot-gtk-ui";
-       version = "0.0.3.0";
-       sha256 = "12slwfhhrzjyscxbs5f8nqayqcbk1lh7b4cla419lbwixhbs3zbg";
+       version = "0.1.0.0";
+       sha256 = "0q3f1rm1s22vrk19yzbflr1pwbl094lx5j8zbyhqqjvhpz491dx7";
        buildDepends = [
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
@@ -94216,6 +97026,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base colour gtk hmatrix plot text vector ];
+       jailbreak = true;
        homepage = "https://github.com/sumitsahrawat/plot-lab";
        description = "A plotting tool with Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
@@ -94247,6 +97058,7 @@ self: {
        homepage = "http://hub.darcs.net/stepcut/plugins";
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plugins-auto" = callPackage
@@ -94267,12 +97079,12 @@ self: {
      }) {};
 
   "plugins-multistage" = callPackage
-    ({ mkDerivation, base, template-haskell, th-expand-syns }:
+    ({ mkDerivation, base, template-haskell, th-desugar }:
      mkDerivation {
        pname = "plugins-multistage";
-       version = "0.5.2";
-       sha256 = "0ij2yyf7kw0a3hhcih1fc96vsjxy7bd6ny0rbnikildydld5842g";
-       buildDepends = [ base template-haskell th-expand-syns ];
+       version = "0.5.3";
+       sha256 = "1k07i4djm5givxwvh1a5h4nlhj8w71n7ajd15av534gnky0njzwc";
+       buildDepends = [ base template-haskell th-desugar ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94286,6 +97098,7 @@ self: {
        buildDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ply-loader" = callPackage
@@ -94424,9 +97237,9 @@ self: {
      }:
      mkDerivation {
        pname = "pointfree";
-       version = "1.0.4.8";
-       sha256 = "0nb3mqp6zwnnq6fs27xhcqv4w8h6sr5k01hldkqnkgwz0yyy7ljy";
-       isLibrary = false;
+       version = "1.1";
+       sha256 = "0lkwan8vi86jl72wfpdi0saac6rbx8z270r2nf3vp0468dqk25cf";
+       isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base containers haskell-src-exts transformers
@@ -94479,6 +97292,7 @@ self: {
        homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Haskell";
        description = "Pointless Haskell library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointless-lenses" = callPackage
@@ -94539,6 +97353,7 @@ self: {
          aeson base base64-string bytestring case-insensitive directory hex
          HTTP http-client http-conduit http-types strict text time
        ];
+       jailbreak = true;
        homepage = "https://platform.pokitdok.com";
        description = "PokitDok Platform API Client for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -94600,6 +97415,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "poly-arity" = callPackage
+    ({ mkDerivation, base, constraints, HList, hspec, QuickCheck
+     , quickcheck-instances
+     }:
+     mkDerivation {
+       pname = "poly-arity";
+       version = "0.0.3";
+       sha256 = "1laywdj9bifh4mqb6farlzvp4cp3f4vgbvd9dnnhyndzh3sp3p5b";
+       buildDepends = [ base constraints HList ];
+       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       description = "Tools for working with functions of undetermined arity";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "polyToMonoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -94612,19 +97441,20 @@ self: {
      }) {};
 
   "polynomial" = callPackage
-    ({ mkDerivation, base, deepseq, pretty, prettyclass, vector
-     , vector-space, vector-th-unbox
+    ({ mkDerivation, base, deepseq, pretty, vector, vector-space
+     , vector-th-unbox
      }:
      mkDerivation {
        pname = "polynomial";
-       version = "0.7.1";
-       sha256 = "0jnqx4w9f99ynmrc5r05f5sfl2wrxnns3l67c2bnqh1sxw5hnbdp";
+       version = "0.7.2";
+       sha256 = "1w1zpa2l7l7yzqdgr142mqhf73mq8kiz7h3ydpd84n4vawjzz7z1";
        buildDepends = [
-         base deepseq pretty prettyclass vector vector-space vector-th-unbox
+         base deepseq pretty vector vector-space vector-th-unbox
        ];
        homepage = "https://github.com/mokus0/polynomial";
        description = "Polynomials";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polynomials-bernstein" = callPackage
@@ -94743,34 +97573,37 @@ self: {
 
   "pontarius-xmpp" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary
-     , bytestring, Cabal, conduit, containers, crypto-api, crypto-random
-     , cryptohash, cryptohash-cryptoapi, data-default, derive, directory
-     , dns, doctest, filepath, hslogger, hspec, hspec-expectations
-     , iproute, lens, lifted-base, mtl, network, pureMD5, QuickCheck
+     , bytestring, Cabal, conduit, configurator, containers, crypto-api
+     , crypto-random, cryptohash, cryptohash-cryptoapi, data-default
+     , derive, directory, dns, doctest, exceptions, filepath, hslogger
+     , hspec, hspec-expectations, HUnit, iproute, lens, lens-family
+     , lifted-base, mtl, network, profunctors, pureMD5, QuickCheck
      , quickcheck-instances, random, ranges, resourcet, smallcheck
      , split, stm, stringprep, tasty, tasty-hspec, tasty-hunit
      , tasty-quickcheck, tasty-th, template-haskell, text, tls
-     , transformers, unbounded-delays, void, xml-conduit, xml-picklers
-     , xml-types
+     , transformers, unbounded-delays, void, x509-system, xml-conduit
+     , xml-picklers, xml-types
      }:
      mkDerivation {
        pname = "pontarius-xmpp";
-       version = "0.4.0.2";
-       sha256 = "0s633z93qw1k0rs5bx85slmk40rlzlacr2fyxfp5qs3b74k93m7d";
+       version = "0.4.1.0";
+       sha256 = "183c69v3540gm54clxd2kizrhsiy4xwdjgaakpqkvlk47s4rj89i";
        buildDepends = [
          attoparsec base base64-bytestring binary bytestring conduit
          containers crypto-api crypto-random cryptohash cryptohash-cryptoapi
-         data-default dns hslogger iproute lifted-base mtl network pureMD5
-         random resourcet split stm stringprep template-haskell text tls
-         transformers unbounded-delays void xml-conduit xml-picklers
+         data-default dns exceptions hslogger iproute lens-family
+         lifted-base mtl network profunctors pureMD5 random resourcet split
+         stm stringprep template-haskell text tls transformers
+         unbounded-delays void x509-system xml-conduit xml-picklers
          xml-types
        ];
        testDepends = [
-         async base Cabal conduit containers data-default derive directory
-         doctest filepath hslogger hspec hspec-expectations lens network
-         QuickCheck quickcheck-instances ranges smallcheck stm stringprep
-         tasty tasty-hspec tasty-hunit tasty-quickcheck tasty-th text
-         transformers xml-picklers xml-types
+         async base Cabal conduit configurator containers data-default
+         derive directory doctest filepath hslogger hspec hspec-expectations
+         HUnit lens mtl network QuickCheck quickcheck-instances ranges
+         smallcheck stm stringprep tasty tasty-hspec tasty-hunit
+         tasty-quickcheck tasty-th text tls transformers xml-picklers
+         xml-types
        ];
        jailbreak = true;
        homepage = "https://github.com/pontarius/pontarius-xmpp/";
@@ -94845,14 +97678,19 @@ self: {
      }) {};
 
   "pooled-io" = callPackage
-    ({ mkDerivation, base, deepseq, transformers, unsafe, utility-ht }:
+    ({ mkDerivation, base, concurrent-split, containers, deepseq
+     , transformers, unsafe, utility-ht
+     }:
      mkDerivation {
        pname = "pooled-io";
-       version = "0.0.0.1";
-       sha256 = "1phk5mqyyjvlrf3fknhzrwzjmx3inwrs8hs328p8jpwwig8zfpv7";
+       version = "0.0.2";
+       sha256 = "0v7l0jvk2acqslb1inw6lgwbjraj73s396r160hw56slqxh5sgxl";
        isLibrary = true;
        isExecutable = true;
-       buildDepends = [ base deepseq transformers unsafe utility-ht ];
+       buildDepends = [
+         base concurrent-split containers deepseq transformers unsafe
+         utility-ht
+       ];
        homepage = "http://code.haskell.org/~thielema/pooled-io/";
        description = "Run jobs on a limited number of threads and support data dependencies";
        license = stdenv.lib.licenses.bsd3;
@@ -94899,6 +97737,7 @@ self: {
        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;
           inherit (pkgs) poppler;};
 
@@ -94953,6 +97792,7 @@ self: {
        ];
        description = "FreeBSD ports index search and analysis tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "porter" = callPackage
@@ -94964,6 +97804,7 @@ self: {
        buildDepends = [ haskell2010 ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ports" = callPackage
@@ -95178,6 +98019,7 @@ self: {
          aeson base bytestring monad-control mtl postgresql-simple
          resource-pool time
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/postgresql-config";
        description = "Types for easy adding postgresql configuration to your program";
        license = stdenv.lib.licenses.bsd3;
@@ -95226,32 +98068,35 @@ self: {
        ];
        description = "An ORM (Object Relational Mapping) and migrations DSL for PostgreSQL";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "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
+     , containers, data-default, 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";
+       version = "1.1.1";
+       sha256 = "0c6ns1zwqanqxd45zly2ms6zg3wx0lzr690pvq1prmf676vw2fj1";
        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
+         aeson attoparsec base blaze-builder bytestring containers
+         data-default either exceptions file-embed haskell-src-meta
+         monad-control monad-logger mtl postgresql-simple resource-pool
+         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
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/s9gf4ult/postgresql-query";
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
@@ -95326,6 +98171,7 @@ self: {
          base haskell-src-meta postgresql-libpq postgresql-simple
          template-haskell typedquery utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/tolysz/postgresql-simple-typed";
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
@@ -95348,6 +98194,7 @@ self: {
          template-haskell text time utf8-string uuid
        ];
        testDepends = [ base network time ];
+       jailbreak = true;
        homepage = "https://github.com/dylex/postgresql-typed";
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.bsd3;
@@ -95393,6 +98240,7 @@ self: {
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postie" = callPackage
@@ -95432,6 +98280,7 @@ self: {
        homepage = "https://github.com/apiengine/postmark";
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postmaster" = callPackage
@@ -95479,6 +98328,7 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ppm" = callPackage
@@ -95516,6 +98366,7 @@ self: {
        buildDepends = [ base deepseq ];
        description = "Reliable, persistent, fast priority queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue-mtl" = callPackage
@@ -95573,6 +98424,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pred-trie" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, quickcheck-instances
+     , semigroups
+     }:
+     mkDerivation {
+       pname = "pred-trie";
+       version = "0.0.12";
+       sha256 = "0hyghjp1zcprgzq2szkpfpkihr1hhgf70901wm5hfgs6bfvgw2sb";
+       buildDepends = [ base semigroups ];
+       testDepends = [ base hspec QuickCheck quickcheck-instances ];
+       description = "Predicative tries";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "predicates" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -95591,10 +98456,8 @@ self: {
      }:
      mkDerivation {
        pname = "prednote";
-       version = "0.32.0.6";
-       sha256 = "0ammlm2dfhjmgy2ackrk4gvwgxz8sph8d2n4pwk2vl17hy024dbj";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.36.0.2";
+       sha256 = "1nm6r448vzl1gkkasjihaf31i57lx7pi627dxwf73slwxfz4j0wb";
        buildDepends = [
          base bytestring containers contravariant rainbow split text
          transformers
@@ -95687,9 +98550,11 @@ self: {
          base bytestring cmdargs containers data-default lens mtl parallel
          safe stm text transformers tuple vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/jxv/pregame";
        description = "Prelude counterpart";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-extras" = callPackage
@@ -95714,6 +98579,7 @@ self: {
        jailbreak = true;
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-plus" = callPackage
@@ -95727,6 +98593,7 @@ self: {
        buildDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-prime" = callPackage
@@ -95767,8 +98634,10 @@ self: {
          cpphs deepseq directory file-embed foldl haskell-src-exts here
          system-filepath temporary text turtle unix
        ];
+       jailbreak = true;
        description = "Preprocess Haskell Repositories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "preprocessor-tools" = callPackage
@@ -95809,6 +98678,7 @@ self: {
        ];
        description = "Make presentations for data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "press" = callPackage
@@ -95978,6 +98848,7 @@ self: {
        sha256 = "0a8mf8k62xga5r5dd0fna1swqbx2r94c0mvqnc4mfq640zrsa5w8";
        editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec";
        buildDepends = [ base ghc-prim ];
+       jailbreak = true;
        homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
@@ -96149,6 +99020,7 @@ self: {
        version = "0.2.4.1";
        sha256 = "0nh73l03d7niz3a3h2y4i80mlp64ilfkx7krn57skzfi8drwnjvc";
        buildDepends = [ base containers random transformers utility-ht ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
        description = "Probabilistic Functional Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -96165,6 +99037,7 @@ self: {
        buildDepends = [
          base mtl mwc-random primitive statistics transformers vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/alpmestan/probable";
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
@@ -96184,6 +99057,7 @@ self: {
        ];
        description = "Parse process information for Linux";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process_1_2_3_0" = callPackage
@@ -96276,6 +99150,7 @@ self: {
        homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-progress" = callPackage
@@ -96325,8 +99200,8 @@ self: {
      }:
      mkDerivation {
        pname = "process-streaming";
-       version = "0.7.1.0";
-       sha256 = "07f3qykiqf3a2al2dj72fm2mlpl263vgvb4n3m9a32lf7mw6243d";
+       version = "0.7.2.0";
+       sha256 = "1wlrinx5v0k26jdkmbb8k313p3nyjrn2r9nag3hryl1wfdkbr1bl";
        buildDepends = [
          base bifunctors bytestring conceit containers contravariant foldl
          free pipes pipes-bytestring pipes-concurrency pipes-parse
@@ -96359,6 +99234,7 @@ self: {
          multiset QuickCheck quickcheck-instances template-haskell text
          transformers
        ];
+       jailbreak = true;
        description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96441,10 +99317,10 @@ self: {
      }:
      mkDerivation {
        pname = "product-profunctors";
-       version = "0.6";
-       revision = "4";
-       sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4";
-       editedCabalFile = "84407dc2bb4ba0fab1d21463e367149586a67758f2f6bba8eaa86b0cb1f07ac0";
+       version = "0.6.1";
+       revision = "1";
+       sha256 = "0phwjngndgsggw2f74k6q43cnnw5w4nvfrfrmkwyz6hgah2zv562";
+       editedCabalFile = "98cd3c6ac3f78d4097bd1b8c7c1782b85bd05497938ce86d70cb0eb27b09359c";
        buildDepends = [ base contravariant profunctors template-haskell ];
        testDepends = [ base profunctors ];
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
@@ -96665,6 +99541,7 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "A Prolog interpreter written in Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prolog-graph" = callPackage
@@ -96684,7 +99561,6 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "A command line tool to visualize query resolution in Prolog";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prolog-graph-lib" = callPackage
@@ -96697,7 +99573,6 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "promise" = callPackage
@@ -96707,6 +99582,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg";
        buildDepends = [ async base ];
+       jailbreak = true;
        homepage = "http://github.com/jfischoff/promise";
        description = "A monadic interface for async";
        license = stdenv.lib.licenses.bsd3;
@@ -96736,8 +99612,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.2.1";
-       sha256 = "0dc1km96k58m98ww7z2n8d167ihr5b7vws4y2va4nl30ghpfga56";
+       version = "2.3.0";
+       sha256 = "0k8yi4dh00985gb1k3l8saaf8h9q1jbw2mcr1svn7xdhnd16r1y1";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -96779,6 +99655,7 @@ self: {
        homepage = "https://github.com/mokus0/property-list";
        description = "Apple property list parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proplang" = callPackage
@@ -96805,6 +99682,26 @@ self: {
        homepage = "http://github.com/deviant-logic/props";
        description = "Reusable quickcheck properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "prosper" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, containers
+     , HsOpenSSL, http-streams, io-streams, mtl, text, transformers
+     , vector
+     }:
+     mkDerivation {
+       pname = "prosper";
+       version = "0.1.1";
+       sha256 = "006h3i316s85f3d6qmwm9kajbxil1xcnqp11jfvv5ypnx2gdyhgb";
+       buildDepends = [
+         aeson base bytestring cereal containers HsOpenSSL http-streams
+         io-streams mtl text transformers vector
+       ];
+       homepage = "https://api.prosper.com";
+       description = "Bindings to the Prosper marketplace API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proteaaudio" = callPackage
@@ -96883,6 +99780,7 @@ self: {
        homepage = "http://code.haskell.org/protocol-buffers/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
@@ -96895,6 +99793,7 @@ self: {
        homepage = "http://code.haskell.org/protocol-buffers/";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -96911,6 +99810,7 @@ self: {
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-fork" = callPackage
@@ -96928,6 +99828,7 @@ self: {
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prototype" = callPackage
@@ -96982,22 +99883,23 @@ self: {
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
        pname = "pseudo-trie";
-       version = "0.0.4.2";
-       sha256 = "0b09qxgxv86wmcsns2rl00pna0a3jfngddyzk9dfjk1xjaq8cb59";
+       version = "0.0.4.3";
+       sha256 = "020jkgr6h1f4z14xbrl6zsqjqflkps03lh5102742bfsd58d9hvb";
        buildDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pseudomacros" = callPackage
-    ({ mkDerivation, base, old-locale, template-haskell, time }:
+    ({ mkDerivation, base, template-haskell, time }:
      mkDerivation {
        pname = "pseudomacros";
-       version = "0.0.1";
-       sha256 = "168vqim5m72yl51w6pi9vxzp324i1gnawrl2zlsayw81s7lf1jp4";
-       buildDepends = [ base old-locale template-haskell time ];
+       version = "0.0.2";
+       sha256 = "112g7qxn7vl5702gzx2kdg55rvvp9g0gc50dvcwlrgvrsvsdy6c9";
+       buildDepends = [ base template-haskell time ];
        description = "cpp-style built-in macros using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "psqueues" = callPackage
@@ -97109,6 +100011,7 @@ self: {
        homepage = "http://github.com/pubnub/haskell";
        description = "PubNub Haskell SDK";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pubsub" = callPackage
@@ -97151,9 +100054,11 @@ self: {
          aeson base bytestring QuickCheck test-framework
          test-framework-quickcheck2 text time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/pharpend/puffytools";
        description = "A CLI assistant";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugixml" = callPackage
@@ -97419,8 +100324,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.6.9.3";
-       sha256 = "1hdxj1qxxvkjacm8msfn1xjbgwhmg0kx5ha1fxv11nks0m0h4wcr";
+       version = "0.6.9.5";
+       sha256 = "196iq0jaryna4cgg7f07axccbnl5h82fvrjlry6839q05ndl83vf";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -97541,6 +100446,7 @@ self: {
          base containers ghc-prim lens mtl QuickCheck random safe split
          template-haskell transformers
        ];
+       jailbreak = true;
        description = "Put-based lens library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97691,6 +100597,7 @@ self: {
          aeson base bytestring containers pureMD5 template-haskell
        ];
        pkgconfigDepends = [ python ];
+       jailbreak = true;
        homepage = "http://github.com/Russell91/json-python";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
@@ -97708,6 +100615,7 @@ self: {
          aeson base bytestring containers pureMD5 template-haskell
        ];
        pkgconfigDepends = [ python ];
+       jailbreak = true;
        homepage = "http://github.com/Russell91/pyfi";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
@@ -97729,6 +100637,7 @@ self: {
        jailbreak = true;
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qc-oi-testgenerator" = callPackage
@@ -97830,6 +100739,7 @@ self: {
        homepage = "https://github.com/pvdbrand/quandl-api";
        description = "Quandl.com API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quantfin" = callPackage
@@ -97844,6 +100754,7 @@ self: {
          base containers mersenne-random-pure64 mtl random-fu rvar
          transformers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/boundedvariation/quantfin";
        description = "Quant finance library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -97879,6 +100790,7 @@ self: {
        homepage = "http://github.com/luqui/quantum-arrow";
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qudb" = callPackage
@@ -97915,6 +100827,7 @@ self: {
          MissingH network safe scotty text transformers wai wai-extra
          wai-middleware-static warp
        ];
+       jailbreak = true;
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -98078,6 +100991,7 @@ self: {
        sha256 = "12vg14xwhhsqwygrs5lylsg514am5sslqc15nbl8mwzzxix1w8xb";
        buildDepends = [ base either QuickCheck transformers ];
        testDepends = [ base directory doctest filepath QuickCheck ];
+       jailbreak = true;
        homepage = "http://github.com/bennofs/quickcheck-property-monad/";
        description = "quickcheck-property-monad";
        license = stdenv.lib.licenses.bsd3;
@@ -98165,8 +101079,10 @@ self: {
        version = "0.1.0.7";
        sha256 = "12jkj8jy4f0mix658pd8jfgwx268fs3bbqz90mac1vvag4c72i0h";
        buildDepends = [ base QuickCheck transformers webdriver ];
+       jailbreak = true;
        description = "Utilities for using WebDriver with QuickCheck";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quicklz" = callPackage
@@ -98198,6 +101114,7 @@ self: {
        isExecutable = true;
        buildDepends = [ barecheck base directory filepath QuickCheck ];
        testDepends = [ base directory filepath QuickCheck ];
+       jailbreak = true;
        homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
@@ -98253,6 +101170,7 @@ self: {
        version = "2.1.0.0";
        sha256 = "0zwqfwwna1d588yk2i20nzryl56k2bh4nyg03ljszyhna16iclij";
        buildDepends = [ base bytestring http-types scotty text ];
+       jailbreak = true;
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -98279,6 +101197,7 @@ self: {
        homepage = "https://github.com/talw/quoridor-hs";
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -98292,6 +101211,7 @@ self: {
        buildDepends = [ base old-locale split time ];
        description = "A library and program to create QIF files from Rabobank CSV exports";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rad" = callPackage
@@ -98305,6 +101225,7 @@ self: {
        homepage = "http://comonad.com/reader/";
        description = "Reverse Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radian" = callPackage
@@ -98365,6 +101286,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base filepath ];
+       jailbreak = true;
        homepage = "https://github.com/thomaseding/radix";
        description = "Command-line tool for emitting numbers in various bases";
        license = stdenv.lib.licenses.bsd3;
@@ -98410,15 +101332,14 @@ self: {
      }) {};
 
   "rainbow" = callPackage
-    ({ mkDerivation, base, bytestring, process, QuickCheck, text }:
+    ({ mkDerivation, base, bytestring, lens, process, QuickCheck, text
+     }:
      mkDerivation {
        pname = "rainbow";
-       version = "0.22.0.2";
-       sha256 = "0bzjh7j0ckdzvmfb29pi1l7h28hg77rykwj4bndzi55mbqkabrs9";
-       isLibrary = true;
-       isExecutable = true;
-       buildDepends = [ base bytestring process text ];
-       testDepends = [ base bytestring process QuickCheck text ];
+       version = "0.26.0.2";
+       sha256 = "1v94dd9y38ayslii6bjg720dbrjg37wwm13v08g9clbazf122901";
+       buildDepends = [ base bytestring lens process text ];
+       testDepends = [ base bytestring lens process QuickCheck text ];
        homepage = "https://www.github.com/massysett/rainbow";
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
@@ -98437,22 +101358,21 @@ self: {
        homepage = "http://www.github.com/massysett/rainbow";
        description = "Tests and QuickCheck generators to accompany rainbow";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rainbox" = callPackage
-    ({ mkDerivation, array, base, bytestring, ChasingBottoms
-     , QuickCheck, rainbow, tasty, tasty-quickcheck, text, transformers
+    ({ mkDerivation, base, bytestring, containers, QuickCheck, rainbow
+     , tasty, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "rainbox";
-       version = "0.10.0.2";
-       sha256 = "1s08p7ckni17q15p059nccpyq19iw5chfy28m1k8c6vm4fcrkjyw";
-       isLibrary = true;
-       isExecutable = true;
-       buildDepends = [ array base bytestring rainbow text transformers ];
+       version = "0.16.0.0";
+       sha256 = "0aihr386m1n5p0d4iym5rvg74ihdm180sm6b4mqmiihhl00lr1p2";
+       buildDepends = [ base bytestring containers rainbow text ];
        testDepends = [
-         array base bytestring ChasingBottoms QuickCheck rainbow tasty
-         tasty-quickcheck text transformers
+         base bytestring containers QuickCheck rainbow tasty
+         tasty-quickcheck text
        ];
        homepage = "http://www.github.com/massysett/rainbox";
        description = "Two-dimensional box pretty printing, with colors";
@@ -98487,6 +101407,7 @@ self: {
        buildDepends = [ base ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rallod" = callPackage
@@ -98511,6 +101432,7 @@ self: {
        buildDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "randfile" = callPackage
@@ -98552,6 +101474,7 @@ self: {
        buildDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-eff" = callPackage
@@ -98577,6 +101500,7 @@ self: {
        jailbreak = true;
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-extras" = callPackage
@@ -98623,6 +101547,7 @@ self: {
          base Cabal cabal-test-quickcheck math-functions mwc-random
          QuickCheck random-fu vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/srijs/random-hypergeometric";
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
@@ -98803,9 +101728,11 @@ self: {
        testDepends = [
          base constraints HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rascal" = callPackage
@@ -98842,8 +101769,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasterific-svg";
-       version = "0.1.1";
-       sha256 = "16nnvy3vvks4bc6nbm7m5cc0z195z2xk2qbnlar06axv7kqvwps6";
+       version = "0.2";
+       sha256 = "1m8mmvnfvpddbyllrjlv9nxm458ikdxyhf68pr9xf18fxaxsipsb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -98896,6 +101823,7 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/raven-haskell";
        description = "Haskell client for Sentry logging service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raven-haskell-scotty" = callPackage
@@ -99066,6 +101994,7 @@ self: {
        homepage = "https://github.com/joelburget/react-haskell";
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reaction-logic" = callPackage
@@ -99080,6 +102009,7 @@ self: {
        homepage = "http://wiki.github.com/paolino/realogic";
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive" = callPackage
@@ -99144,8 +102074,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana";
-       version = "0.8.1.0";
-       sha256 = "166bw6lr3jd0m7b9hfr45lwyvyrggkz0xqh6ybqwvcpmc5h99dcg";
+       version = "0.8.1.1";
+       sha256 = "1fgfcpn5zapygixygz69cfmqg872ixa3nlakvgj5dd53qgkzq9s7";
        buildDepends = [
          base containers hashable pqueue transformers unordered-containers
          vault
@@ -99154,9 +102084,10 @@ self: {
          base containers hashable HUnit pqueue test-framework
          test-framework-hunit transformers unordered-containers vault
        ];
-       homepage = "http://haskell.org/haskellwiki/Reactive-banana";
+       homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Library for functional reactive programming (FRP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -99206,6 +102137,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -99378,12 +102310,13 @@ self: {
     ({ mkDerivation, base, mtl, split, template-haskell }:
      mkDerivation {
        pname = "reasonable-lens";
-       version = "0.2.1.0";
-       sha256 = "1qlcvhxgzi1pf4k2apa0fh5927bd132rbnnhyf9yf6qa9hz3d28f";
+       version = "0.2.1.1";
+       sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam";
        buildDepends = [ base mtl split template-haskell ];
        homepage = "https://github.com/tokiwoousaka/reasonable-lens";
        description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reasonable-operational" = callPackage
@@ -99424,6 +102357,7 @@ self: {
          attoparsec base base-prelude template-haskell text transformers
        ];
        testDepends = [ base base-prelude directory doctest filepath ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record";
        description = "First class records implemented with quasi-quotation";
        license = stdenv.lib.licenses.mit;
@@ -99462,6 +102396,7 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records";
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records-th" = callPackage
@@ -99493,6 +102428,7 @@ self: {
        homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursive-line-count" = callPackage
@@ -99534,15 +102470,15 @@ self: {
 
   "redis" = callPackage
     ({ mkDerivation, base, bytestring, concurrent-extra, containers
-     , MonadCatchIO-mtl, mtl, network, old-time, utf8-string
+     , exceptions, mtl, network, old-time, utf8-string
      }:
      mkDerivation {
        pname = "redis";
-       version = "0.13.0.1";
-       sha256 = "0djwih122pp7y0c1lx7ab7n80ra1488hrwgf0iq20gywk8an9wfq";
+       version = "0.14";
+       sha256 = "0mnjx62q3nlgzspk75xg4zsyq5w8jxgh8gd32mc26xvyr0r02094";
        buildDepends = [
-         base bytestring concurrent-extra containers MonadCatchIO-mtl mtl
-         network old-time utf8-string
+         base bytestring concurrent-extra containers exceptions mtl network
+         old-time utf8-string
        ];
        homepage = "http://hub.darcs.net/ganesh/redis";
        description = "A driver for Redis key-value database";
@@ -99797,6 +102733,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "refined" = callPackage
+    ({ mkDerivation, base, base-prelude, template-haskell }:
+     mkDerivation {
+       pname = "refined";
+       version = "0.1.0.0";
+       sha256 = "0072zc4x8v6b8vdfgxnm1k6hbhzvf1m4cdb65v8df3qngb603r5n";
+       buildDepends = [ base base-prelude template-haskell ];
+       homepage = "https://github.com/nikita-volkov/refined";
+       description = "Refinement types with static and runtime checking";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "reflection" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -99842,13 +102790,12 @@ self: {
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.1.0";
-       sha256 = "1l64kz1haicq4qfw5nrn93jrv37c93zz6z0xkhjnm5rxff7qrdns";
+       version = "0.1.1";
+       sha256 = "071pv72l1iynl8jmnjdx121f1pzp1pj4kr1jcbmzx4v60zhfwpns";
        buildDepends = [
          base containers dependent-map dependent-sum mtl primitive
          semigroups template-haskell these
        ];
-       jailbreak = true;
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -100170,6 +103117,7 @@ self: {
        buildDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tdfa-unittest" = callPackage
@@ -100202,6 +103150,7 @@ self: {
        ];
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tre" = callPackage
@@ -100238,15 +103187,14 @@ self: {
      }:
      mkDerivation {
        pname = "regexchar";
-       version = "0.9.0.10";
-       sha256 = "1nj43gvhm233609rc0pj183bciiz4nafi6ypq06rs3sb8sin3frj";
+       version = "0.9.0.12";
+       sha256 = "1f1yb3h43pr38c7j3zs2jmph33arc828q1hbsmlz2xh4krdrc0vc";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base Cabal containers parallel parsec QuickCheck regex-base
          regex-posix regexdot toolshed
        ];
-       jailbreak = true;
        homepage = "http://functionalley.eu";
        description = "A POSIX, extended regex-engine";
        license = "GPL";
@@ -100256,8 +103204,8 @@ self: {
     ({ mkDerivation, base, deepseq, parallel, parsec, toolshed }:
      mkDerivation {
        pname = "regexdot";
-       version = "0.11.1.0";
-       sha256 = "0hxqhfamy98ygnbh0ajhdab1zqnx4qnkwclnn5x5f9ra5iqj0rrq";
+       version = "0.11.1.1";
+       sha256 = "1nrbqlxlkppi6q7w7ypq47saskxdx9a127dcwkl2azzz5082yf8j";
        buildDepends = [ base deepseq parallel parsec toolshed ];
        homepage = "http://functionalley.eu";
        description = "A polymorphic, POSIX, extended regex-engine";
@@ -100497,9 +103445,11 @@ self: {
        version = "0.2.2";
        sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a";
        buildDepends = [ base containers mtl ];
+       jailbreak = true;
        homepage = "http://bitbucket.org/jozefg/reified-records";
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reify" = callPackage
@@ -100680,6 +103630,7 @@ self: {
        jailbreak = true;
        description = "Durations and generalized time parsing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relit" = callPackage
@@ -100732,6 +103683,7 @@ self: {
        ];
        description = "Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remote-debugger" = callPackage
@@ -100747,6 +103699,7 @@ self: {
        homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remotion" = callPackage
@@ -100837,7 +103790,6 @@ self: {
        sha256 = "0q8jwp1msg5icvcqxszh5c1190llwz17gxc7nmd1bkyca59j8w0l";
        buildDepends = [ base repa vector ];
        extraLibraries = [ llvm ];
-       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
@@ -100882,6 +103834,7 @@ self: {
        version = "4.1.0.1";
        sha256 = "197lqlyvljbngnckw742kij7frsx1rwakfa13xwaij6gxmyz9zx6";
        buildDepends = [ base primitive vector ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Packing and unpacking binary data";
        license = stdenv.lib.licenses.bsd3;
@@ -100891,8 +103844,8 @@ self: {
     ({ mkDerivation, base, libdevil, repa, transformers }:
      mkDerivation {
        pname = "repa-devil";
-       version = "0.3.2.2";
-       sha256 = "0p46ni9z8wymyk4qmcy04kwycxb31yyprd8ddxsxpjilhbw848lh";
+       version = "0.3.2.6";
+       sha256 = "0f7xawg4qlfbf24lrjbpqzl3f3zf63f8g5b2gi17h0rpyw3cxhzy";
        buildDepends = [ base repa transformers ];
        extraLibraries = [ libdevil ];
        homepage = "https://github.com/RaphaelJ/repa-devil";
@@ -100907,6 +103860,7 @@ self: {
        version = "4.0.0.1";
        sha256 = "0vng0y835gma937q1996qghfzx06wabxf7ln8ckrwy5djzza8h9y";
        buildDepends = [ base ghc-prim ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Low-level parallel operators on bulk random-accessble arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -100960,9 +103914,11 @@ self: {
          base bytestring containers directory filepath primitive repa-array
          repa-eval repa-stream text vector
        ];
+       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Data-parallel data flows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-io" = callPackage
@@ -100974,7 +103930,6 @@ self: {
        version = "3.4.0.1";
        sha256 = "06ks4gxsajnalxh9mpnl4pckxnyfc59823war3m74anb0pqcrbbl";
        buildDepends = [ base binary bmp bytestring old-time repa vector ];
-       jailbreak = true;
        homepage = "http://repa.ouroborus.net";
        description = "Read and write Repa arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
@@ -101079,18 +104034,18 @@ self: {
   "repl-toolkit" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , exceptions, functor-monadic, ListLike, listsafe, monad-loops, mtl
-     , numericpeano, parsec, system-filepath, text, transformers
+     , numericpeano, parsec, semigroupoids, system-filepath, text
+     , transformers
      }:
      mkDerivation {
        pname = "repl-toolkit";
-       version = "0.3.1.0";
-       sha256 = "1bf2cigrn0frxprp8lgd78pv0ahk4zln9qyv15pwhmirvbbppgvn";
+       version = "0.4.0.0";
+       sha256 = "1r4gyj3jjm9sv597zlksckg5cl9r2k633hz5avzczf92b0j4ikr3";
        buildDepends = [
          aeson base bytestring data-default directory exceptions
          functor-monadic ListLike listsafe monad-loops mtl numericpeano
-         parsec system-filepath text transformers
+         parsec semigroupoids system-filepath text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/ombocomp/repl-toolkit";
        description = "Toolkit for quickly whipping up config files and command-line interfaces";
        license = stdenv.lib.licenses.asl20;
@@ -101133,6 +104088,7 @@ self: {
        homepage = "https://github.com/saep/repo-based-blog";
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repr" = callPackage
@@ -101214,6 +104170,7 @@ self: {
          distributive keys mtl representable-functors semigroupoids
          semigroups transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/representable-tries/";
        description = "Tries from representations of polynomial functors";
        license = stdenv.lib.licenses.bsd3;
@@ -101231,7 +104188,6 @@ self: {
        homepage = "http://github.com/nahiluhmot/request-monad";
        description = "A transformer for generic requests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reroute" = callPackage
@@ -101241,8 +104197,8 @@ self: {
      }:
      mkDerivation {
        pname = "reroute";
-       version = "0.2.2.1";
-       sha256 = "1hrzbjvsdkz3c27lksxzxlhhdrwqbvq90xyawwsc8zh3fp1nzqpn";
+       version = "0.2.3.0";
+       sha256 = "1wyr54kllh3cfwl9i291ymmpmmk8vv8y4i3k1kwa8b0zv5kky1px";
        buildDepends = [
          base deepseq graph-core hashable mtl path-pieces regex-compat text
          transformers unordered-containers vector
@@ -101289,6 +104245,7 @@ self: {
        buildDepends = [
          ansi-terminal base Diff directory filepath mtl process unix
        ];
+       jailbreak = true;
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
@@ -101312,6 +104269,7 @@ self: {
        homepage = "https://github.com/wowus/resource-effect/";
        description = "A port of the package 'resourcet' for extensible effects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resource-embed" = callPackage
@@ -101326,6 +104284,7 @@ self: {
        homepage = "https://bitbucket.org/tdammers/resource-embed";
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resource-pool" = callPackage
@@ -101424,7 +104383,6 @@ self: {
        homepage = "https://github.com/raptros/respond";
        description = "process and route HTTP requests and generate responses on top of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-client" = callPackage
@@ -101675,6 +104633,7 @@ self: {
        jailbreak = true;
        description = "A monad transformer for resumable exceptions";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb" = callPackage
@@ -101694,9 +104653,11 @@ self: {
          unordered-containers utf8-string vector
        ];
        testDepends = [ base doctest ];
+       jailbreak = true;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 1.16";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb-client-driver" = callPackage
@@ -101707,8 +104668,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.16";
-       sha256 = "1x4kw64mjp4900qnmvakrd7vfqg14h35k0jzai5qh6y88rr3qaf1";
+       version = "0.0.17";
+       sha256 = "01jz3bg6zjrvkrs7mvwvyyzq94j57cgmghzp9rsdlia2r6bd6lcz";
        buildDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -101723,6 +104684,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rethinkdb-model" = callPackage
+    ({ mkDerivation, aeson, base, mtl, rethinkdb, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "rethinkdb-model";
+       version = "0.1.0.2";
+       sha256 = "15993912bw3v09c6fiqnjcjcpd77px61kq276v1aaqdbahzpzw2q";
+       buildDepends = [
+         aeson base mtl rethinkdb text transformers unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/seanhess/rethinkdb-model";
+       description = "Useful tools for modeling data with rethinkdb";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rethinkdb-wereHamster" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , data-default, ghc-prim, mtl, network, protocol-buffers
@@ -101741,6 +104720,7 @@ self: {
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "retry" = callPackage
@@ -101770,6 +104750,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base optparse-applicative process ];
+       jailbreak = true;
        homepage = "https://github.com/dgonyeo/retryer";
        description = "Retry failed commands";
        license = stdenv.lib.licenses.mpl20;
@@ -101826,6 +104807,7 @@ self: {
        homepage = "https://github.com/jcristovao/reverse-geocoding";
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reversi" = callPackage
@@ -101867,6 +104849,7 @@ self: {
        buildDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rex" = callPackage
@@ -101906,13 +104889,13 @@ self: {
      }) {};
 
   "rfc3339" = callPackage
-    ({ mkDerivation, base, old-locale, time }:
+    ({ mkDerivation, base, timerep }:
      mkDerivation {
        pname = "rfc3339";
-       version = "1.0.4";
-       sha256 = "0vrcfmkfikszcalcpa59rzwrjk2dlbwrqgpy2jx0z4kbiaalbg6j";
-       buildDepends = [ base old-locale time ];
-       description = "Parse and display time according to RFC3339";
+       version = "1.0.5";
+       sha256 = "1p3nahcmsikrc5maf7qz45042h80m6xszx70154yq169rsqkvav0";
+       buildDepends = [ base timerep ];
+       description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -101969,6 +104952,7 @@ self: {
        homepage = "http://github.com/markhibberd/riak-haskell-client";
        description = "A Haskell client for the Riak decentralized data store";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riak-protobuf" = callPackage
@@ -101986,6 +104970,7 @@ self: {
        homepage = "http://github.com/markhibberd/riak-haskell-client";
        description = "Haskell types for the Riak protocol buffer API";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "richreports" = callPackage
@@ -102005,8 +104990,8 @@ self: {
      }:
      mkDerivation {
        pname = "riff";
-       version = "0.3.0.0";
-       sha256 = "1gmvmid0cja2ip4f6y0ciynbxw5li5v25xcbnnsbkvj3yk79cdpa";
+       version = "0.3.0.1";
+       sha256 = "1970bsg1ngc6mzsyj8mapzar0h1wkdb4skfz64d0ccdfpipp5hdb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -102025,7 +105010,6 @@ self: {
        version = "0.1.1";
        sha256 = "03v2xxj1gd35738qrhxcl0d3bx6pps4l1singb0yg1smrx5nkpp7";
        buildDepends = [ base mtl primitive vector ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/ring-buffer";
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
@@ -102121,6 +105105,7 @@ self: {
        homepage = "https://github.com/d-rive/rivers";
        description = "Rivers are like Streams, but different";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rmonad" = callPackage
@@ -102181,6 +105166,7 @@ self: {
        homepage = "https://github.com/lfairy/robot";
        description = "Simulate keyboard and mouse events";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "robots-txt" = callPackage
@@ -102196,6 +105182,7 @@ self: {
          attoparsec base bytestring directory heredoc hspec QuickCheck
          transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/meanpath/robots";
        description = "Parser for robots.txt";
        license = stdenv.lib.licenses.bsd3;
@@ -102217,7 +105204,7 @@ self: {
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { rocksdb = null;};
+     }) { inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-time
@@ -102235,6 +105222,7 @@ self: {
        homepage = "http://roguestar.downstairspeople.org/";
        description = "Sci-fi roguelike game. Client application.";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roguestar-engine" = callPackage
@@ -102397,6 +105385,7 @@ self: {
        homepage = "http://github.com/ekmett/rope";
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rosa" = callPackage
@@ -102405,8 +105394,8 @@ self: {
      }:
      mkDerivation {
        pname = "rosa";
-       version = "0.1.3.0";
-       sha256 = "1wyjcmr3a7lljksiq45ch3ng15dd7sk40bbb2l8yvvjgyk12990a";
+       version = "0.2.0.0";
+       sha256 = "198xzbzkalg7xlngrl52mh1iinipk6b00gnhmh6fnjrj1s61nqq6";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -102470,7 +105459,6 @@ self: {
          attoparsec base bytestring containers data-default-generics
          filepath mtl pureMD5 tasty tasty-hunit testpack transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/acowley/roshask";
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
@@ -102517,6 +105505,7 @@ self: {
          base bytestring directory filepath old-locale time
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rounding" = callPackage
@@ -102546,6 +105535,7 @@ self: {
        ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -102557,6 +105547,7 @@ self: {
        buildDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -102764,6 +105755,7 @@ self: {
        version = "3000.2.0.4";
        sha256 = "1kq7bk3kl48699n2ri15im5ds8cd2pmcjglh06br1knxkli80kbq";
        buildDepends = [ base HaXml network network-uri old-locale time ];
+       jailbreak = true;
        homepage = "https://github.com/basvandijk/rss";
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
@@ -102810,8 +105802,8 @@ self: {
     ({ mkDerivation, base, c2hs, rtlsdr }:
      mkDerivation {
        pname = "rtlsdr";
-       version = "0.1.0.3";
-       sha256 = "0v1vm73f1wn3lcxqlih5c7cj50g8ffbz8fcya0zvs1ab4kxxnrnv";
+       version = "0.1.0.4";
+       sha256 = "090m8qsj9g0xr8ybyiik6vrc9j7bvgmgp42vznank3nklrmkxbgz";
        buildDepends = [ base ];
        buildTools = [ c2hs ];
        extraLibraries = [ rtlsdr ];
@@ -102833,6 +105825,7 @@ self: {
          attoparsec base blaze-builder blaze-textual bytestring deepseq haxr
          mtl network split utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/megantti/rtorrent-rpc";
        description = "A library for communicating with RTorrent over its XML-RPC interface";
        license = stdenv.lib.licenses.mit;
@@ -102868,6 +105861,7 @@ self: {
        buildDepends = [ base vector ];
        extraLibraries = [ rubberband ];
        pkgconfigDepends = [ rubberband ];
+       jailbreak = true;
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
@@ -102902,6 +105896,7 @@ self: {
        homepage = "https://gitorious.org/ruff";
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ruler" = callPackage
@@ -102920,6 +105915,7 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/ruler";
        description = "Ruler tool for UHC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ruler-core" = callPackage
@@ -103041,6 +106037,7 @@ self: {
        buildDepends = [
          base base64-bytestring cryptohash http-types time utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/dmjio/s3-signer";
        description = "Pre-signed Amazon S3 URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -103069,7 +106066,6 @@ self: {
        homepage = "http://hub.darcs.net/thoferon/safe-access";
        description = "A simple environment to control access to data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-failure" = callPackage
@@ -103157,8 +106153,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy";
-       version = "0.8.4";
-       sha256 = "0zwgbaigvysxf5zqdzkfsf0rqdwjq76hp207lchqgvx5rv8wda8h";
+       version = "0.8.5";
+       sha256 = "1r0v2276hynxkysyrdmy2334gwxgaz2v6j8g0hd5jzfj2kmnnmk9";
        buildDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -103270,6 +106266,7 @@ self: {
        homepage = "http://fremissant.net/shape-syb";
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "saltine" = callPackage
@@ -103286,6 +106283,7 @@ self: {
          test-framework-quickcheck2 vector
        ];
        extraLibraries = [ libsodium ];
+       jailbreak = true;
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
      }) { inherit (pkgs) libsodium;};
@@ -103305,6 +106303,7 @@ self: {
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
        extraLibraries = [ sodium ];
+       jailbreak = true;
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
@@ -103539,6 +106538,7 @@ self: {
        testDepends = [
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
        ];
+       jailbreak = true;
        homepage = "http://hackage.haskell.org/package/sandi";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
@@ -103571,6 +106571,7 @@ self: {
          base Cabal containers directory filepath optparse-applicative
          process text unix-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/abhinav/sandman";
        description = "Manages Cabal sandboxes to avoid rebuilding packages";
        license = stdenv.lib.licenses.mit;
@@ -103655,6 +106656,7 @@ self: {
        homepage = "https://github.com/jwaldmann/satchmo";
        description = "SAT encoding monad";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-backends" = callPackage
@@ -103734,22 +106736,24 @@ self: {
        homepage = "https://github.com/msakai/satchmo-toysat";
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbv" = callPackage
-    ({ mkDerivation, array, async, base, containers, deepseq, directory
-     , filepath, HUnit, mtl, old-time, pretty, process, QuickCheck
-     , random, syb
+    ({ mkDerivation, array, async, base, containers, crackNum
+     , data-binary-ieee754, deepseq, directory, filepath, HUnit, mtl
+     , old-time, pretty, process, QuickCheck, random, syb
      }:
      mkDerivation {
        pname = "sbv";
-       version = "4.2";
-       sha256 = "1q62fa2wi8sxkbx93qpxqr6sivs5q028kdbs35j3ym9mb3pa8y8q";
+       version = "4.4";
+       sha256 = "1914695yxyd3ag1z56dd88kz0p0zvl63255psd4bilzvdwlys6ls";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         array async base containers deepseq directory filepath HUnit mtl
-         old-time pretty process QuickCheck random syb
+         array async base containers crackNum data-binary-ieee754 deepseq
+         directory filepath HUnit mtl old-time pretty process QuickCheck
+         random syb
        ];
        testDepends = [ base directory filepath HUnit syb ];
        homepage = "http://leventerkok.github.com/sbv/";
@@ -103800,26 +106804,21 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/scaleimage";
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scalpel" = callPackage
-    ({ mkDerivation, base, bytestring, curl, download-curl, HUnit
-     , regex-base, regex-tdfa, tagsoup, text
+    ({ mkDerivation, base, bytestring, curl, HUnit, regex-base
+     , regex-tdfa, tagsoup, text
      }:
      mkDerivation {
        pname = "scalpel";
-       version = "0.1.2";
-       revision = "1";
-       sha256 = "1h0fj56a3mppcc2pfjs7philm2jy1yb3vvzbvswsans5x4xvh8dv";
-       editedCabalFile = "5062d07770eb7d265cd5c76dc7e3c90c36a2a4f6a7bc3e688d139cd8114a8f5c";
+       version = "0.2.0";
+       sha256 = "0bqnjnyjvhhj2lh8jr6cris5l4crwyql95rfzrvc95wvkb75jwzv";
        buildDepends = [
-         base bytestring curl download-curl regex-base regex-tdfa tagsoup
-         text
-       ];
-       testDepends = [
-         base bytestring curl download-curl HUnit regex-base regex-tdfa
-         tagsoup text
+         base bytestring curl regex-base regex-tdfa tagsoup text
        ];
+       testDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
@@ -103938,7 +106937,6 @@ self: {
        ];
        description = "A Haskell library for writing SCGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "schedevr" = callPackage
@@ -103955,6 +106953,7 @@ self: {
        jailbreak = true;
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "schedyield" = callPackage
@@ -104007,6 +107006,7 @@ self: {
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scholdoc-citeproc" = callPackage
@@ -104037,6 +107037,7 @@ self: {
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scholdoc-texmath" = callPackage
@@ -104197,6 +107198,7 @@ self: {
        homepage = "http://github.com/JPMoresmau/scion-class-browser";
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scons2dot" = callPackage
@@ -104338,7 +107340,6 @@ self: {
          base blaze-builder bytestring containers cookie scotty text time
          transformers
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/wniare/scotty-cookie";
        description = "Cookie management helper functions for Scotty framework";
        license = stdenv.lib.licenses.bsd3;
@@ -104387,21 +107388,22 @@ self: {
 
   "scotty-session" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
-     , crypto-api, http-types, old-locale, scotty, stm, text, time
-     , transformers, unordered-containers, wai
+     , crypto-api, http-types, scotty, stm, text, time, transformers
+     , unordered-containers, wai
      }:
      mkDerivation {
        pname = "scotty-session";
-       version = "0.0.4";
-       sha256 = "0dacj58d78alfpqfn8ibnwxqk1yddf5y14sh1csqqnhra8k2pn4j";
+       version = "0.0.5";
+       sha256 = "1jvxzsnprfp2k9svkzxykmpc3qs6dvzc0wnnircyimha4gca6qh7";
        buildDepends = [
          base base64-bytestring blaze-builder bytestring crypto-api
-         http-types old-locale scotty stm text time transformers
-         unordered-containers wai
+         http-types scotty stm text time transformers unordered-containers
+         wai
        ];
        homepage = "https://github.com/agrafix/scotty-session";
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-tls" = callPackage
@@ -104473,6 +107475,7 @@ self: {
        ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scroll" = callPackage
@@ -104494,6 +107497,7 @@ self: {
        homepage = "https://joeyh.name/code/scroll/";
        description = "scroll(6), a roguelike game";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scrypt" = callPackage
@@ -104559,6 +107563,7 @@ self: {
        jailbreak = true;
        description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sde-solver" = callPackage
@@ -104630,10 +107635,8 @@ self: {
     ({ mkDerivation, base, SDL2, sdl2, SDL2_ttf }:
      mkDerivation {
        pname = "sdl2-ttf";
-       version = "0.2.0";
-       revision = "1";
-       sha256 = "0ikdkzzzh3wwzypas5bd6wcm17cckxj2qyqkw6y76v0k2kpnzc35";
-       editedCabalFile = "25cb57affc8ad5bb0ff533037512a39803f4fcd961cb2aca3632f0ab7dc2540b";
+       version = "0.2.1";
+       sha256 = "0w760xsb02n0j4bv7iigc810mwasgjf8lckrjqbipqvvq1am3l56";
        buildDepends = [ base sdl2 ];
        testDepends = [ base sdl2 ];
        extraLibraries = [ SDL2 SDL2_ttf ];
@@ -104705,6 +107708,7 @@ self: {
        homepage = "http://github.com/ekmett/search/";
        description = "Infinite search in finite time with Hilbert's epsilon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sec" = callPackage
@@ -104742,30 +107746,33 @@ self: {
        version = "1.1.0.2";
        sha256 = "0jbgdd3mh126c3n0sblvd7rbcnnzrfyfajrj9xcsj7zi7jqvs8nw";
        buildDepends = [ base ];
+       jailbreak = true;
        description = "A simple library for static information-flow security in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "second-transfer" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
-     , conduit, containers, hashable, hashtables, hslogger, http2, lens
-     , network, network-uri, openssl, text, transformers
+     , conduit, containers, exceptions, hashable, hashtables, hslogger
+     , http2, HUnit, lens, network, network-uri, openssl, text
+     , transformers
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.1.0.0";
-       sha256 = "0y6wjni3sj0mkjwc6mbx9majc91aw51vwyqki603dggjfbp78b0x";
+       version = "0.2.0.0";
+       sha256 = "0lgb938i3f4yb4j5dxa4j4vn7wckl7kjhz0qd8yx1hpzi9k3y70g";
        buildDepends = [
          base base16-bytestring binary bytestring conduit containers
-         hashable hashtables hslogger http2 lens network network-uri text
-         transformers
+         exceptions hashable hashtables hslogger http2 lens network
+         network-uri text transformers
        ];
-       testDepends = [ base conduit ];
+       testDepends = [ base bytestring conduit http2 HUnit lens ];
        extraLibraries = [ openssl ];
        jailbreak = true;
-       homepage = "www.zunzun.se";
+       homepage = "https://github.com/alcidesv/second-transfer";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) openssl;};
 
   "secret-santa" = callPackage
@@ -105092,6 +108099,7 @@ self: {
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semiring-simple" = callPackage
@@ -105132,6 +108140,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sendgrid-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, exceptions
+     , http-conduit, monad-control, text, transformers
+     }:
+     mkDerivation {
+       pname = "sendgrid-haskell";
+       version = "1.0";
+       sha256 = "0k5sbc4j9palfsp7ryap79scb50jhm0kzzq0lfa0r7py1pkx2ylp";
+       buildDepends = [
+         aeson base bytestring containers exceptions http-conduit
+         monad-control text transformers
+       ];
+       homepage = "https://owainlewis.com";
+       description = "Sengrid API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "sensenet" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, process, stm
      , zeromq3-haskell
@@ -105245,7 +108270,6 @@ self: {
        version = "0.3.2";
        sha256 = "03xyvjflas8sfnsxzpcnm0k3kf8x72y9hwfayxn8zn3gjmwl3b3y";
        buildDepends = [ base transformers ];
-       jailbreak = true;
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105266,9 +108290,10 @@ self: {
     ({ mkDerivation, base, io-streams, seqid }:
      mkDerivation {
        pname = "seqid-streams";
-       version = "0.3.2";
-       sha256 = "0v2d5125zyldr7f50zdhvgm1wcp7zbrnas9i2chqsq3s17qkrkm5";
+       version = "0.3.3";
+       sha256 = "0jddjsvkc2fdnz9yny44ikrqwwx500rd0cgh8fz1894c6p6qfgkm";
        buildDepends = [ base io-streams seqid ];
+       jailbreak = true;
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105348,6 +108373,7 @@ self: {
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sequential-index" = callPackage
@@ -105379,6 +108405,7 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/sequor";
        description = "A sequence labeler based on Collins's sequence perceptron";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serf" = callPackage
@@ -105536,6 +108563,7 @@ self: {
        buildDepends = [
          base bytestring pandoc-types servant-docs text unordered-containers
        ];
+       jailbreak = true;
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -105666,8 +108694,10 @@ self: {
          base base64-bytestring blaze-html byteable bytestring cryptohash
          HsOpenSSL http-streams old-locale tagsoup time
        ];
+       jailbreak = true;
        description = "Send HTML formatted emails using Amazon's SES REST API with blaze";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ses-html-snaplet" = callPackage
@@ -105682,8 +108712,10 @@ self: {
          base blaze-html bytestring configurator ses-html snap text
          transformers
        ];
+       jailbreak = true;
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sessions" = callPackage
@@ -105826,6 +108858,7 @@ self: {
        homepage = "https://github.com/scvalex/sexp";
        description = "S-Expression parsing/printing made fun and easy";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-show" = callPackage
@@ -105862,15 +108895,17 @@ self: {
      }) {};
 
   "sext" = callPackage
-    ({ mkDerivation, base, bytestring, template-haskell }:
+    ({ mkDerivation, base, bytestring, template-haskell, text }:
      mkDerivation {
        pname = "sext";
        version = "0.1.0.0";
        sha256 = "0vq7fbm8gm7fym9qjaxsy2mk89rn2pjfkbhv3ym94xslcybwrwpy";
-       buildDepends = [ base bytestring template-haskell ];
+       buildDepends = [ base bytestring template-haskell text ];
+       jailbreak = true;
        homepage = "http://github.com/dzhus/sext/";
        description = "Lists, Texts and ByteStrings with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sfml-audio" = callPackage
@@ -105890,10 +108925,8 @@ self: {
     ({ mkDerivation, base, bytestring, entropy, primitive }:
      mkDerivation {
        pname = "sfmt";
-       version = "0.1.0";
-       revision = "1";
-       sha256 = "1amfcnh3jrb54zpl6vrdmngqvmjiczzinhq3r9gx9hb1r635v04x";
-       editedCabalFile = "e0b52289bb67a211186ecaa0f45275870e792430d71929cf4f1a66f29da071a4";
+       version = "0.1.1";
+       sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6";
        buildDepends = [ base bytestring entropy primitive ];
        homepage = "https://github.com/philopon/sfmt-hs";
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
@@ -105931,11 +108964,9 @@ self: {
          base containers encoding extensible-exceptions mtl parsec split
          time transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/tonicebrian/sgf";
        description = "SGF (Smart Game Format) parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sgrep" = callPackage
@@ -105950,6 +108981,7 @@ self: {
        homepage = "http://blog.malde.org/";
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sha-streams" = callPackage
@@ -106059,8 +109091,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake";
-       version = "0.15";
-       sha256 = "02zqkm248fvv6nh10nj6rw7ks5w832q2zrzzk9z9gp1zrqnbhxhk";
+       version = "0.15.1";
+       sha256 = "0bdx2pclcnqbkdwv8jw6v7w21hn29dp9xbvsbfrnqjvb9f6p1my9";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -106073,7 +109105,7 @@ self: {
          js-flot js-jquery old-time process QuickCheck random time
          transformers unix unordered-containers utf8-string
        ];
-       homepage = "http://www.shakebuild.com/";
+       homepage = "http://shakebuild.com";
        description = "Build system library, like Make, but more accurate dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106087,6 +109119,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base Cabal directory filepath process ];
+       jailbreak = true;
        homepage = "https://github.com/samplecount/shake-cabal-build";
        description = "Utility for building Shake build systems using Cabal sandboxes";
        license = stdenv.lib.licenses.asl20;
@@ -106126,6 +109159,7 @@ self: {
        homepage = "https://github.com/samplecount/shake-language-c";
        description = "Utilities for cross-compiling with Shake";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-minify" = callPackage
@@ -106398,6 +109432,7 @@ self: {
        buildDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-pipe" = callPackage
@@ -106430,6 +109465,7 @@ self: {
        homepage = "http://repos.mornfall.net/shellish";
        description = "shell-/perl- like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shellmate" = callPackage
@@ -106613,6 +109649,7 @@ self: {
        homepage = "http://github.com/ozataman/shpider";
        description = "Web automation library in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shplit" = callPackage
@@ -106651,8 +109688,8 @@ self: {
      }:
      mkDerivation {
        pname = "shuffle";
-       version = "0.1.3.1";
-       sha256 = "120rc9gzdhad4nqich1mwixzax9bhsm3vv87qkvyarcz0qf80qcx";
+       version = "0.1.3.2";
+       sha256 = "07amjk5l9apxs90klq3ii8gxmywnxqhx4fk2yapmm8l75l8b6kfg";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -106763,6 +109800,7 @@ self: {
        version = "0.4";
        sha256 = "0pxi6g095axf9x6hsiqf0ilsjlws4zvl0pjfjamjyyl1wj82h747";
        buildDepends = [ base containers ];
+       jailbreak = true;
        description = "Multisets with negative membership";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106787,6 +109825,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m";
        buildDepends = [ base ghc-prim primitive vector ];
+       jailbreak = true;
        homepage = "http://github.com/mikeizbicki/simd";
        description = "simple interface to GHC's SIMD instructions";
        license = stdenv.lib.licenses.bsd3;
@@ -106969,6 +110008,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base parsec text transformers ];
+       jailbreak = true;
        homepage = "https://github.com/gitfoxi/Language.Eval";
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
        license = stdenv.lib.licenses.gpl2;
@@ -107002,6 +110042,7 @@ self: {
        homepage = "https://github.com/singpolyma/simple-form-haskell";
        description = "Forms that configure themselves based on type";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-genetic-algorithm" = callPackage
@@ -107059,7 +110100,6 @@ self: {
          base containers deepseq directory filepath
          MonadCatchIO-transformers mtl SafeSemaphore text time transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -107122,6 +110162,7 @@ self: {
        ];
        description = "Simplified Pascal language to SSVM compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-pipe" = callPackage
@@ -107489,8 +110530,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "simtreelo";
-       version = "0.1.0.2";
-       sha256 = "0r985v4159hnz371g1fxvn6x3x91c0xyymjnfnj2iaya5nmds6qp";
+       version = "0.1.1.0";
+       sha256 = "1j7q2mld8np16nmq8w3lx87j1f530jpxv4jlpf038k42pf4p23l2";
        buildDepends = [ base containers ];
        description = "Loader for data organized in a tree";
        license = stdenv.lib.licenses.gpl3;
@@ -107520,6 +110561,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs.xlibs) libXft;};
 
+  "singleton-nats" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "singleton-nats";
+       version = "0.1.1.0";
+       sha256 = "154jzdxhq5nvr78wlk26fzjs9n2piw8h92dq4n1rqz4wqjkhyg9s";
+       buildDepends = [ base singletons ];
+       description = "Unary natural numbers relying on the singletons infrastructure";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "singletons" = callPackage
     ({ mkDerivation, base, Cabal, constraints, containers, filepath
      , mtl, process, tasty, tasty-golden, template-haskell, th-desugar
@@ -107535,6 +110587,7 @@ self: {
        homepage = "http://www.cis.upenn.edu/~eir/packages/singletons";
        description = "A framework for generating singleton types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sink" = callPackage
@@ -107594,6 +110647,7 @@ self: {
        homepage = "http://github.com/alpmestan/sitemap";
        description = "Sitemap parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized" = callPackage
@@ -107608,8 +110662,10 @@ self: {
          base constraints containers ListLike monomorphic type-natural
          vector
        ];
+       jailbreak = true;
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized-types" = callPackage
@@ -107625,6 +110681,7 @@ self: {
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized-vector" = callPackage
@@ -107642,6 +110699,7 @@ self: {
        homepage = "https://github.com/konn/sized-vector";
        description = "Size-parameterized vector types and functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sizes" = callPackage
@@ -107670,10 +110728,8 @@ self: {
      }:
      mkDerivation {
        pname = "skein";
-       version = "1.0.9.2";
-       revision = "1";
-       sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw";
-       editedCabalFile = "824638ce2aaf27614e10fe56fe886e486969fb9483e722a025b38fff3fb099ab";
+       version = "1.0.9.3";
+       sha256 = "0k7ibm4ykvypz6dm6jgqx0aj7qlg34cg841vipyjkbykp8nv3fn7";
        buildDepends = [ base bytestring cereal crypto-api tagged ];
        testDepends = [
          base bytestring cereal crypto-api filepath hspec tagged
@@ -107756,6 +110812,7 @@ self: {
        jailbreak = true;
        description = "Haskell API for interacting with Slack";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slack-api" = callPackage
@@ -107776,6 +110833,7 @@ self: {
        testDepends = [ base ];
        description = "Bindings to the Slack RTM API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slack-notify-haskell" = callPackage
@@ -107804,8 +110862,8 @@ self: {
      }:
      mkDerivation {
        pname = "slave-thread";
-       version = "0.1.5";
-       sha256 = "0qw4c6406hbdnv6i55sh8ps8739szm7rnqjzk6ynm7dfbf3vxhw4";
+       version = "1.0.0.0";
+       sha256 = "0snk0v126a79q2blddbznz50l89jfap4y4xs9i76pk0b0dcik319";
        buildDepends = [
          base base-prelude list-t mmorph partial-handler stm-containers
          transformers
@@ -107878,6 +110936,7 @@ self: {
        homepage = "http://github.com/akc/sloane";
        description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slot-lambda" = callPackage
@@ -107906,6 +110965,7 @@ self: {
        buildDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallarray" = callPackage
@@ -107939,6 +110999,7 @@ self: {
        testDepends = [
          attoparsec base containers data-default parsec text
        ];
+       jailbreak = true;
        description = "Flatten camel case text in LaTeX files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107955,6 +111016,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck-series" = callPackage
+    ({ mkDerivation, base, bytestring, doctest, Glob, smallcheck, text
+     }:
+     mkDerivation {
+       pname = "smallcheck-series";
+       version = "0.2";
+       sha256 = "1666pf3ki46w3zi01c3lzih7jh0jgqx9jyc1ykrjs056mlnbxp3v";
+       buildDepends = [ base bytestring smallcheck text ];
+       testDepends = [ base doctest Glob ];
+       homepage = "https://github.com/jdnavarro/smallcheck-series";
+       description = "Extra SmallCheck series";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smallpt-hs" = callPackage
     ({ mkDerivation, base, vector }:
      mkDerivation {
@@ -108056,6 +111131,7 @@ self: {
        buildDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smoothie" = callPackage
@@ -108111,6 +111187,7 @@ self: {
        ];
        description = "A type-safe interface to communicate with an SMT solver";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtp-mail" = callPackage
@@ -108146,6 +111223,7 @@ self: {
          stringsearch text tls transformers transformers-compat x509-store
          x509-system
        ];
+       jailbreak = true;
        homepage = "https://github.com/avieth/smtp-mail-ng";
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -108195,6 +111273,7 @@ self: {
        buildDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap" = callPackage
@@ -108277,8 +111356,8 @@ self: {
     ({ mkDerivation, base, blaze-html, snap-core }:
      mkDerivation {
        pname = "snap-blaze";
-       version = "0.2.1.2";
-       sha256 = "136i5q9ipfqrh7fw8rgn1ws6zkjdrfwfq9wpccrm8dg3l61380wh";
+       version = "0.2.1.3";
+       sha256 = "0jpiykqgvdbhk1wk37qgfxmyrnx8553wnnmn7a4b3mq8zx8fzmlm";
        buildDepends = [ base blaze-html snap-core ];
        homepage = "http://github.com/jaspervdj/snap-blaze";
        description = "blaze-html integration for Snap";
@@ -108305,6 +111384,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "07cm60v7bz585fawfc8mml178z54zqfg8kb7ldln5bsa0ggpha2z";
        buildDepends = [ base configurator text unordered-containers ];
+       jailbreak = true;
        description = "Methods to manipulate Configurator objects for Snap & Snaplets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108340,13 +111420,12 @@ self: {
      }:
      mkDerivation {
        pname = "snap-cors";
-       version = "1.2.7";
-       sha256 = "0yvy27fvcryc17k24y0z84zvi5b65x1zn36gz0277b3fp2dqfskc";
+       version = "1.2.8";
+       sha256 = "1ycqfx4qv00cxjrddch1wxadrffq55zbv6bhcahan93wq3a5lb7w";
        buildDepends = [
          attoparsec base bytestring case-insensitive hashable network
          network-uri snap text transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
@@ -108426,6 +111505,7 @@ self: {
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
        ];
+       jailbreak = true;
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework: dynamic loader";
        license = stdenv.lib.licenses.bsd3;
@@ -108436,7 +111516,9 @@ self: {
      mkDerivation {
        pname = "snap-loader-static";
        version = "0.9.0.2";
+       revision = "1";
        sha256 = "0d6s7n6yryfs2jkw0hxvhvc79fhbj256askb1c6ksqhscxxxwz1m";
+       editedCabalFile = "c927448783c28f56bd57c7b09d147965b96e7b4c7320524b26c83bf10ab89c21";
        buildDepends = [ base template-haskell ];
        homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework: static loader";
@@ -108464,6 +111546,7 @@ self: {
        ];
        description = "Declarative routing for Snap";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-server" = callPackage
@@ -108512,6 +111595,7 @@ self: {
        homepage = "https://github.com/dbp/snap-testing";
        description = "A library for BDD-style testing with the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-utils" = callPackage
@@ -108660,6 +111744,7 @@ self: {
        homepage = "https://github.com/zmthy/snaplet-css-min";
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-environments" = callPackage
@@ -108687,7 +111772,9 @@ self: {
      mkDerivation {
        pname = "snaplet-fay";
        version = "0.3.3.11";
+       revision = "1";
        sha256 = "18g61qivc49g37zmb4qv2piwlgs572fmngdpsjdhjmrgqn049fjr";
+       editedCabalFile = "754ad06e1c8e6fd26f362bdc3f83f0863e7f2e941ffcf8b753310aee2c1aad26";
        buildDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -108695,6 +111782,7 @@ self: {
        homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hasql" = callPackage
@@ -108724,6 +111812,7 @@ self: {
        homepage = "https://github.com/ChristopherBiscardi/snaplet-haxl";
        description = "Snaplet for Facebook's Haxl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hdbc" = callPackage
@@ -108818,6 +111907,7 @@ self: {
          base directory filepath heist lss snap text xmlhtml
        ];
        testDepends = [ base hspec-snap hspec2 lens snap text ];
+       jailbreak = true;
        homepage = "https://github.com/dbp/lss";
        description = "Lexical Style Sheets - Snap Web Framework adaptor";
        license = stdenv.lib.licenses.bsd3;
@@ -108838,6 +111928,7 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-mandrill";
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-mongoDB" = callPackage
@@ -108895,6 +111986,7 @@ self: {
        homepage = "https://github.com/ibotty/snaplet-mysql-simple";
        description = "mysql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-oauth" = callPackage
@@ -108956,8 +112048,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-postgresql-simple";
-       version = "0.6.0.1";
-       sha256 = "0njs0nlznq0yh7gmihwjvxbngw3r0f7csw26pynyi3q0daccsgxg";
+       version = "0.6.0.2";
+       sha256 = "0xx69x9mkv6xyd7arnip12zzyq7hdcqbypgypalgsj6vcjb8i4mp";
        buildDepends = [
          base bytestring clientsession configurator errors lens
          MonadCatchIO-transformers mtl postgresql-simple
@@ -108984,6 +112076,7 @@ self: {
        homepage = "https://github.com/LukeHoersten/snaplet-postmark";
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-purescript" = callPackage
@@ -109000,6 +112093,7 @@ self: {
        jailbreak = true;
        description = "Automatic (re)compilation of purescript projects";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-recaptcha" = callPackage
@@ -109096,6 +112190,7 @@ self: {
        homepage = "http://github.com/statusfailed/snaplet-riak";
        description = "A Snaplet for the Riak database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-sass" = callPackage
@@ -109146,8 +112241,10 @@ self: {
          base blaze-html bytestring configurator ses-html snap text
          transformers
        ];
+       jailbreak = true;
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-sqlite-simple" = callPackage
@@ -109177,6 +112274,7 @@ self: {
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -109232,6 +112330,7 @@ self: {
        jailbreak = true;
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snappy" = callPackage
@@ -109260,6 +112359,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi";
        buildDepends = [ base bytestring conduit snappy ];
+       jailbreak = true;
        homepage = "http://github.com/tatac1/snappy-conduit/";
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
@@ -109284,6 +112384,7 @@ self: {
        version = "0.1";
        sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk";
        buildDepends = [ base bytestring iteratee snappy ];
+       jailbreak = true;
        homepage = "http://github.com/iand675/snappy-iteratee";
        description = "An enumeratee that uses Google's snappy compression library";
        license = stdenv.lib.licenses.bsd3;
@@ -109352,8 +112453,8 @@ self: {
      }:
      mkDerivation {
        pname = "snmp";
-       version = "0.1.0.2";
-       sha256 = "0w7fzkbbfdn5kkkvr0i06bk34mbwscxph38l2l3xxn2ggn8xwkfs";
+       version = "0.1.0.3";
+       sha256 = "1zncgn3i6xbvxrwdf6s6vhbmsf6sqncf2rbllx26dz1bmxh4gr33";
        buildDepends = [
          asn1-encoding asn1-parse asn1-types async base binary bytestring
          cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl
@@ -109447,6 +112548,7 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "SOAP client tools";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-openssl" = callPackage
@@ -109464,6 +112566,7 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using openssl bindings)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-tls" = callPackage
@@ -109482,6 +112585,7 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using tls package)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sock2stream" = callPackage
@@ -109532,8 +112636,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.0";
-       sha256 = "10zza904qrbj65bgi5n0mcf41s7imwfc0qrq7cykb5la7anb2k4q";
+       version = "1.3.1";
+       sha256 = "0ylb05lcgprvfdvhc71dqhh9azsp12vwx8zihdvcim0ax0ylrb20";
        buildDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -109614,8 +112718,8 @@ self: {
      }:
      mkDerivation {
        pname = "som";
-       version = "8.0.0";
-       sha256 = "030vb8blgcbky6yrxmlgrjq68mm95x91cg2yqk0vd5c412rrnwwl";
+       version = "8.0.3";
+       sha256 = "0pb4hdcs9pfs12nflbnvp5ja1nxbrijjjqvybzg4pn81kaps897m";
        buildDepends = [ base containers grid MonadRandom ];
        testDepends = [
          base containers grid MonadRandom QuickCheck random test-framework
@@ -109676,6 +112780,7 @@ self: {
        homepage = "https://github.com/nfjinjing/sort-by-pinyin";
        description = "Sort simplified Chinese by PinYin";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sorted" = callPackage
@@ -109691,6 +112796,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sorting" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "sorting";
+       version = "1.0.0.1";
+       sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n";
+       buildDepends = [ base ];
+       homepage = "https://github.com/joneshf/sorting";
+       description = "Utils for sorting";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sorty" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -109723,6 +112840,7 @@ self: {
          storablevector-carray synthesizer-core temporary transformers
          utility-ht
        ];
+       jailbreak = true;
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109960,6 +113078,7 @@ self: {
        homepage = "http://www.cs.york.ac.uk/~mfn/sparsecheck/";
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparser" = callPackage
@@ -109994,8 +113113,8 @@ self: {
     ({ mkDerivation, base, binary, cereal, doctest, ghc-prim, linear }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.1.2";
-       sha256 = "18b6q3dmw7xnl53ckhcsj831b98m3vx3nk9p16sjzh10zdpb0nk8";
+       version = "0.2.3.0";
+       sha256 = "0170v4wjdpwf5s1bil9jj6magaa3fv05zz8b6zd4s6ca8cgw4lc4";
        buildDepends = [ base binary cereal ghc-prim linear ];
        testDepends = [ base doctest ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
@@ -110090,14 +113209,12 @@ self: {
      }:
      mkDerivation {
        pname = "species";
-       version = "0.3.2.3";
-       sha256 = "1ip6q92l95jgqa2vbws4440n4qqn2cf785pbwd9g58zpx9wvi9ai";
+       version = "0.3.2.4";
+       sha256 = "1ka5pd876iddaah9ay2ihcifhfh0f5rd19bn6yh42wlx6mdarfbq";
        buildDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
        ];
-       jailbreak = true;
-       homepage = "http://www.cis.upenn.edu/~byorgey/species";
        description = "Computational combinatorial species";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110144,6 +113261,7 @@ self: {
        homepage = "https://github.com/gregwebs/haskell-spell-suggest";
        description = "Spelling suggestion tool with library and command-line interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sphero" = callPackage
@@ -110210,6 +113328,7 @@ self: {
        homepage = "http://github.com/crockeo/spice";
        description = "An FRP-based game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spike" = callPackage
@@ -110254,6 +113373,7 @@ self: {
        version = "0.0.0.1";
        sha256 = "1aazv418dd4kgpm8kq7n1cfm0gwcr0amsfdks0n1d9mn1rvz7b9p";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/expipiplus1/spir-v";
        description = "Some utilities for reading and writing SPIR-V files";
        license = stdenv.lib.licenses.mit;
@@ -110275,6 +113395,7 @@ self: {
        homepage = "http://github.com/JohnLato/splaytree";
        description = "Provides an annotated splay tree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "splice" = callPackage
@@ -110289,6 +113410,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spline3" = callPackage
+    ({ mkDerivation, base, cmdargs, doctest, filepath, MissingH, repa
+     , repa-algorithms, repa-io, tasty, tasty-hunit, tasty-quickcheck
+     , vector
+     }:
+     mkDerivation {
+       pname = "spline3";
+       version = "0.0.2";
+       sha256 = "112agbhn11wpy4dn0g3j9mrqcja5hhql55swmwh3lbm26hcvwjpq";
+       isLibrary = false;
+       isExecutable = true;
+       buildDepends = [
+         base cmdargs filepath MissingH repa repa-algorithms repa-io tasty
+         tasty-hunit tasty-quickcheck vector
+       ];
+       testDepends = [
+         base cmdargs doctest filepath MissingH repa repa-algorithms repa-io
+         tasty tasty-hunit tasty-quickcheck vector
+       ];
+       jailbreak = true;
+       homepage = "http://michael.orlitzky.com/code/spline3.php";
+       description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "splines" = callPackage
     ({ mkDerivation, base, containers, polynomial, QuickCheck
      , test-framework, test-framework-quickcheck2, vector, vector-space
@@ -110385,6 +113531,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base directory filepath parsec range ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/robertmassaioli/splitter";
        description = "Use numerical ranges to split out certain lines from a file";
        license = stdenv.lib.licenses.mit;
@@ -110409,6 +113556,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Splot";
        description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spool" = callPackage
@@ -110470,6 +113618,7 @@ self: {
        homepage = "https://github.com/davnils/spoty";
        description = "Spotify web API wrapper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spreadsheet" = callPackage
@@ -110494,7 +113643,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk";
        buildDepends = [ base lens mtl vector ];
-       jailbreak = true;
        homepage = "https://github.com/relrod/spritz";
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
@@ -110625,6 +113773,7 @@ self: {
        version = "0.3.0";
        sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1";
        buildDepends = [ base sql-simple sqlite-simple ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/sql-simple";
        description = "sqlite backend for sql-simple";
        license = stdenv.lib.licenses.mit;
@@ -110694,6 +113843,7 @@ self: {
          base haskell-src-meta sqlite sqlite-simple template-haskell
          typedquery utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/tolysz/sqlite-simple-typed";
        description = "Typed extension to sqlite simple";
        license = stdenv.lib.licenses.bsd3;
@@ -110717,8 +113867,8 @@ self: {
      }:
      mkDerivation {
        pname = "squeeze";
-       version = "1.0.4.2";
-       sha256 = "0p39ibms8c2gk1m8v2cysqsd06pvy1mkjvmbvgpfqhkax89lqzak";
+       version = "1.0.4.4";
+       sha256 = "18nia9c5zvcwd3sbj1h53kfcfa2ihfmff74ab2lfi97dgrq5p1n4";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -110728,7 +113878,26 @@ self: {
        homepage = "http://functionalley.eu";
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "sr-extra" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib, containers, directory
+     , filepath, HUnit, mtl, network-uri, old-locale, old-time, pretty
+     , process, pureMD5, QuickCheck, random, regex-compat, time, unix
+     , Unixutils, zlib
+     }:
+     mkDerivation {
+       pname = "sr-extra";
+       version = "1.46.3.1";
+       sha256 = "0ssrv6h50kycxzb84s5j61mg78xyb4hyda2zxshnlqz0gbq134sr";
+       buildDepends = [
+         base bytestring bzlib containers directory filepath HUnit mtl
+         network-uri old-locale old-time pretty process pureMD5 QuickCheck
+         random regex-compat time unix Unixutils zlib
+       ];
+       homepage = "https://github.com/seereason/sr-extra";
+       description = "A grab bag of modules";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "srcinst" = callPackage
@@ -110790,25 +113959,35 @@ self: {
        homepage = "https://github.com/jekor/haskell-sscgi";
        description = "Simple SCGI Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ssh" = callPackage
-    ({ mkDerivation, asn1-data, base, base64-string, binary, bytestring
-     , cereal, containers, crypto-api, crypto-pubkey-types
-     , cryptohash-cryptoapi, HsOpenSSL, network, process, random, RSA
-     , SHA, SimpleAES, split, transformers
+    ({ mkDerivation, asn1-encoding, asn1-types, base, base64-string
+     , binary, bytestring, cereal, containers, crypto-api
+     , crypto-pubkey-types, cryptohash-cryptoapi, directory, filepath
+     , HsOpenSSL, HUnit, integer-gmp, libssh2, network, process
+     , pseudomacros, QuickCheck, random, RSA, SHA, SimpleAES, split
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , th-lift-instances, transformers
      }:
      mkDerivation {
        pname = "ssh";
-       version = "0.2.13.1";
-       sha256 = "05bz4six0bffv6n2il4rzr6rbj4ym5ijqvpkrjdw2xdb7cfqs09i";
+       version = "0.3.1";
+       sha256 = "1v4xrnc7h5r0nlcv3m129phf6qpp48fvkgv9yxf0fy1i3lp52krj";
        buildDepends = [
-         asn1-data base base64-string binary bytestring cereal containers
-         crypto-api crypto-pubkey-types cryptohash-cryptoapi HsOpenSSL
-         network process random RSA SHA SimpleAES split transformers
+         asn1-encoding asn1-types base base64-string binary bytestring
+         cereal containers crypto-api crypto-pubkey-types
+         cryptohash-cryptoapi HsOpenSSL integer-gmp network process random
+         RSA SHA SimpleAES split transformers
+       ];
+       testDepends = [
+         base bytestring containers directory filepath HUnit libssh2
+         pseudomacros QuickCheck tasty tasty-hunit tasty-quickcheck
+         template-haskell th-lift-instances
        ];
        jailbreak = true;
-       homepage = "http://hub.darcs.net/simon/ssh";
+       homepage = "http://hub.darcs.net/ganesh/ssh";
        description = "A pure-Haskell SSH server library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110830,6 +114009,7 @@ self: {
        testDepends = [
          base containers hspec keyword-args nagios-check parsec
        ];
+       jailbreak = true;
        description = "Check sshd configuration for adherence to best practices";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -110918,6 +114098,7 @@ self: {
        version = "0.0.5";
        sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w";
        buildDepends = [ base containers ghc-prim ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/stable-maps";
        description = "Heterogeneous maps keyed by StableNames";
        license = stdenv.lib.licenses.bsd3;
@@ -110975,38 +114156,47 @@ self: {
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, Cabal
-     , classy-prelude-conduit, conduit, conduit-extra, containers
-     , data-default-class, directory, filepath, hspec, http-client
-     , http-client-tls, http-conduit, mono-traversable, mtl, old-locale
-     , optparse-applicative, process, QuickCheck, semigroups, stm
-     , streaming-commons, system-fileio, system-filepath, tar, temporary
-     , text, time, transformers, unix-compat, utf8-string, xml-conduit
-     , yaml, zlib
+    ({ mkDerivation, base, stackage-cli, stackage-install
+     , stackage-update, stackage-upload
      }:
      mkDerivation {
        pname = "stackage";
-       version = "0.6.0.1";
-       sha256 = "0y785cc71rw5g6jlbrljabing0dpizqyid36hp97r3kwa1bc5x2m";
+       version = "0.7.1.0";
+       sha256 = "02z5gkhymgiz7n0mm7j3p10ysi58d9rcz9d2pxakf0hmdsc37xx7";
+       buildDepends = [
+         base stackage-cli stackage-install stackage-update stackage-upload
+       ];
+       homepage = "https://www.stackage.org/";
+       description = "Dummy package forcing installation of other Stackage packages";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "stackage-cli" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, directory, either
+     , exceptions, filepath, hashable, http-client, http-client-tls
+     , http-types, optparse-applicative, optparse-simple, parsec
+     , process, split, system-fileio, system-filepath, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "stackage-cli";
+       version = "0.0.0.4";
+       sha256 = "1ygsy9ms89prs693x9gw5dv7gyhaxl3q74wbd5c2p9138gp1zykq";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         aeson async base bytestring Cabal classy-prelude-conduit conduit
-         conduit-extra containers data-default-class directory filepath
-         http-client http-client-tls http-conduit mono-traversable mtl
-         old-locale optparse-applicative process semigroups stm
-         streaming-commons system-fileio system-filepath tar temporary text
-         time transformers unix-compat utf8-string xml-conduit yaml zlib
-       ];
-       testDepends = [
-         base Cabal classy-prelude-conduit containers hspec http-client
-         http-client-tls QuickCheck text yaml
+         base bytestring conduit directory either exceptions filepath
+         hashable http-client http-client-tls http-types
+         optparse-applicative optparse-simple parsec process split
+         system-fileio system-filepath text transformers
+         unordered-containers
        ];
-       homepage = "https://github.com/fpco/stackage";
-       description = "\"Stable Hackage,\" tools for creating a vetted set of packages from Hackage";
+       homepage = "https://www.stackage.org/package/stackage-cli";
+       description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -111014,26 +114204,28 @@ self: {
     ({ mkDerivation, aeson, async, base, bytestring, Cabal
      , classy-prelude-conduit, conduit, conduit-extra, containers
      , data-default-class, directory, filepath, hspec, http-client
-     , http-client-tls, http-conduit, mono-traversable, mtl, old-locale
-     , optparse-applicative, process, QuickCheck, semigroups
-     , stackage-types, stm, streaming-commons, system-fileio
+     , http-client-tls, http-conduit, monad-unlift, mono-traversable
+     , mtl, old-locale, optparse-applicative, optparse-simple, process
+     , QuickCheck, semigroups, stackage-cli, stackage-types
+     , stackage-update, stm, streaming-commons, system-fileio
      , system-filepath, tar, temporary, text, time, transformers
      , unix-compat, utf8-string, xml-conduit, yaml, zlib
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.7.4";
-       sha256 = "181wdsrwr0dlgp969zkqyg231kz3xh8mzii8ikcxx5z0yharn3gk";
+       version = "0.8.0";
+       sha256 = "1nzbx22y90llcbfv37v119s7psp70rh7gyszar6zfg7wr4plcimb";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          aeson async base bytestring Cabal classy-prelude-conduit conduit
          conduit-extra containers data-default-class directory filepath
-         http-client http-client-tls http-conduit mono-traversable mtl
-         old-locale optparse-applicative process semigroups stackage-types
-         stm streaming-commons system-fileio system-filepath tar temporary
-         text time transformers unix-compat utf8-string xml-conduit yaml
-         zlib
+         http-client http-client-tls http-conduit monad-unlift
+         mono-traversable mtl old-locale optparse-applicative
+         optparse-simple process semigroups stackage-cli stackage-types
+         stackage-update stm streaming-commons system-fileio system-filepath
+         tar temporary text time transformers unix-compat utf8-string
+         xml-conduit yaml zlib
        ];
        testDepends = [
          base Cabal classy-prelude-conduit containers hspec http-client
@@ -111045,6 +114237,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stackage-install" = callPackage
+    ({ mkDerivation, async, base, bytestring, directory, filepath
+     , http-client, http-client-tls, process, stm
+     }:
+     mkDerivation {
+       pname = "stackage-install";
+       version = "0.1.0.1";
+       sha256 = "1ryl2b3hd4kbrn4k1brsqqwq14sv0dhsl89zskgmzwrxg32p2m94";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         async base bytestring directory filepath http-client
+         http-client-tls process stm
+       ];
+       homepage = "https://github.com/fpco/stackage-install";
+       description = "Secure download of packages for cabal-install";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "stackage-types" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
      , hashable, semigroups, text, unordered-containers, vector
@@ -111062,24 +114273,57 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-update" = callPackage
+    ({ mkDerivation, base, directory, filepath, process }:
+     mkDerivation {
+       pname = "stackage-update";
+       version = "0.1.0.3";
+       sha256 = "1d5l44cphrd9kcvhlbyk2yq0qm7i6f5s91yaa2258bhsj09rm5wk";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [ base directory filepath process ];
+       homepage = "https://github.com/fpco/stackage-update";
+       description = "Update your package index incrementally (requires git)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "stackage-upload" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, filepath
+     , http-client, http-client-tls, http-types, optparse-applicative
+     , process, stackage-cli, temporary, text
+     }:
+     mkDerivation {
+       pname = "stackage-upload";
+       version = "0.1.0.3";
+       sha256 = "0bg08nmcm9jg4pamsm41y1vw2fy2dy9pxxs36nmbrkn1622x7dkc";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson base bytestring directory filepath http-client
+         http-client-tls http-types optparse-applicative process
+         stackage-cli temporary text
+       ];
+       homepage = "https://github.com/fpco/stackage-upload";
+       description = "A more secure version of cabal upload which uses HTTPS";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "standalone-haddock" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath
      , optparse-applicative
      }:
      mkDerivation {
        pname = "standalone-haddock";
-       version = "1.1.4.3";
-       sha256 = "0kzgd4c2zashhcg9pblayvzwnkzhkkmdvbkx5yc9a7rcjaqzh40j";
+       version = "1.1.4.4";
+       sha256 = "02j10ws9n7xc2gvmpd146vrg7khawll9y3904h28k5d6ffk6qr14";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
          base Cabal containers directory filepath optparse-applicative
        ];
-       jailbreak = true;
        homepage = "http://documentup.com/feuerbach/standalone-haddock";
        description = "Generate standalone haddock documentation for a set of packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "star-to-star" = callPackage
@@ -111178,8 +114422,8 @@ self: {
      }:
      mkDerivation {
        pname = "stateWriter";
-       version = "0.2.2";
-       sha256 = "0vs9l59ka2knalarkdibhl4bjrwsj70pxl1lkrz4hmz2qzg7bi94";
+       version = "0.2.3";
+       sha256 = "19rhkl39mlkyrj0i1qsmncnlj5nsvp8vp1vjhl43qmcbxfxflc0l";
        buildDepends = [ base mtl transformers ];
        testDepends = [ base free hspec mtl QuickCheck ];
        description = "A faster variant of the RWS monad transformers";
@@ -111209,6 +114453,7 @@ self: {
        buildDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stateref" = callPackage
@@ -111224,12 +114469,12 @@ self: {
      }) {};
 
   "statestack" = callPackage
-    ({ mkDerivation, base, mtl, transformers }:
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
        pname = "statestack";
-       version = "0.2.0.3";
-       sha256 = "0w5vw8jmnwbfyma4a3ggdm9jvxf3c18kpwbvcmvr5szifaqv9sgx";
-       buildDepends = [ base mtl transformers ];
+       version = "0.2.0.4";
+       sha256 = "0swj3f2vc56a5y2qxp2pq8nxkwngcw2lm87dmaikymchbqb832hd";
+       buildDepends = [ base mtl transformers transformers-compat ];
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111267,10 +114512,9 @@ self: {
     ({ mkDerivation, base, double-conversion, free, mtl, text }:
      mkDerivation {
        pname = "static-canvas";
-       version = "0.2.0.0";
-       sha256 = "10fk8kjzksym7qz9xc8pcglcn24rzi6ry03rnhxiy0mc6d6dsrb4";
+       version = "0.2.0.1";
+       sha256 = "14zglnvlra4p85zc4vkgwrpfjf7mrz9dw4ppi369vsfwnw2sgwkq";
        buildDepends = [ base double-conversion free mtl text ];
-       jailbreak = true;
        homepage = "https://github.com/jeffreyrosenbluth/static-canvas";
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
@@ -111384,6 +114628,7 @@ self: {
        buildDepends = [
          base math-functions mwc-random primitive statistics
        ];
+       jailbreak = true;
        homepage = "https://github.com/srijs/statistics-hypergeometric-genvar";
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
@@ -111474,6 +114719,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-truetype" = callPackage
@@ -111531,6 +114777,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base directory parsec transformers ];
+       jailbreak = true;
        description = "List and launch steam games from the cli";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -111565,6 +114812,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "step-function" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }:
+     mkDerivation {
+       pname = "step-function";
+       version = "0.1.0.0";
+       sha256 = "0v7mpi680zl5ihzrdda7di790br5jm563kf0r46z40b63lbzzv01";
+       buildDepends = [ base ];
+       testDepends = [ base Cabal cabal-test-quickcheck QuickCheck ];
+       homepage = "https://github.com/jonpetterbergman/step-function";
+       description = "Step functions, staircase functions or piecewise constant functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stepwise" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -111589,6 +114849,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stitch" = callPackage
+    ({ mkDerivation, base, Cabal, containers, hspec, text, transformers
+     }:
+     mkDerivation {
+       pname = "stitch";
+       version = "0.3.0.0";
+       sha256 = "0h0n6xyi4fi7jcy2j0yzspfla65zmv3c54d88xynv6sw305rd1kz";
+       buildDepends = [ base containers text transformers ];
+       testDepends = [ base Cabal hspec text ];
+       description = "lightweight CSS DSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stm" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -111738,6 +115011,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1x3yxxyik0vyh3p530msxh2a1aylmh8zab05qpq7nfl5m9v6v090";
        buildDepends = [ base stm transformers ];
+       jailbreak = true;
        description = "Software Transactional Memory lifted to MonadIO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111782,10 +115056,8 @@ self: {
     ({ mkDerivation, base, stm, stm-chans }:
      mkDerivation {
        pname = "stm-queue-extras";
-       version = "0.2.0.0";
-       revision = "1";
-       sha256 = "1qd6zsr2lkkg5yxp72l38h00b2xj40jn38qx9sfvgpss6rkda40s";
-       editedCabalFile = "0c90122c2c5998a0b60d00506effde335dbd71ad60bc1b798759a05d4fb3193b";
+       version = "0.2.0.0.1";
+       sha256 = "1zb6i8dg11pshvb6rm5sqdsbq547h4ys6wlmh2ywcmks2ss7q100";
        buildDepends = [ base stm stm-chans ];
        description = "Extra queue utilities for STM";
        license = stdenv.lib.licenses.asl20;
@@ -111895,7 +115167,6 @@ self: {
          attoparsec base bytestring conduit conduit-extra mime mtl
          network-conduit-tls split stompl time utf8-string
        ];
-       jailbreak = true;
        homepage = "http://github.com/toschoo/mom";
        description = "Stompl Client Library";
        license = "LGPL";
@@ -112092,6 +115363,7 @@ self: {
        homepage = "http://hackage.haskell.org/trac/ghc/ticket/915";
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stream-monad" = callPackage
@@ -112137,8 +115409,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-commons";
-       version = "0.1.10.0";
-       sha256 = "15bsjprj3xr7bcqskgjs9c1pgy1yq56579qj4r4wk1ccg3kqfw8q";
+       version = "0.1.12";
+       sha256 = "1scqajmi3zp1088kc8nfzmzm8831idc4m0d5sck5mhav9xcmx7sy";
        buildDepends = [
          array base blaze-builder bytestring directory network process
          random stm text transformers unix zlib
@@ -112193,6 +115465,7 @@ self: {
        homepage = "http://github.com/ekmett/streams/issues";
        description = "Various Haskell 2010 stream comonads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict" = callPackage
@@ -112256,6 +115529,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "1fzcim7baycdb60z5icdw5flj1a3dfn6xscpyif6l94c1538g3i1";
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/cartazio/strict-identity";
        description = "Strict Identity Monad, handy for writing fast code!";
        license = stdenv.lib.licenses.bsd3;
@@ -112268,6 +115542,7 @@ self: {
        version = "0.2.1";
        sha256 = "003pfzjixa04qyx4db0rgk7y72nk2xwlb29aigmdmfn80xbmw9md";
        buildDepends = [ base deepseq extensible-exceptions ];
+       jailbreak = true;
        description = "A library wrapping standard IO modules to provide strict IO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -112512,6 +115787,7 @@ self: {
          aeson base bytestring http-conduit http-types mtl text time
          unordered-containers utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/michaelschade/hs-stripe";
        description = "A Haskell implementation of the Stripe API";
        license = stdenv.lib.licenses.bsd3;
@@ -112547,8 +115823,8 @@ self: {
      }:
      mkDerivation {
        pname = "strive";
-       version = "1.0.0";
-       sha256 = "02nfwi2h40cq393p1f43rrlx635v8fmgs4ww8jx7bl36nsrcjvwg";
+       version = "1.0.1";
+       sha256 = "0c9zwgsy1s64c2kl1agirm8616rjpp2z9r73ch0ixrf200l6rw0d";
        buildDepends = [
          aeson base bytestring data-default gpolyline http-conduit
          http-types template-haskell text time transformers
@@ -112557,6 +115833,7 @@ self: {
        homepage = "http://taylor.fausak.me/strive/";
        description = "A Haskell client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strptime" = callPackage
@@ -112577,13 +115854,14 @@ self: {
      }:
      mkDerivation {
        pname = "structural-induction";
-       version = "0.1.2";
-       sha256 = "153w6p4xn3fv13kdq3cf4jwiikplnyiaczw30dy9mwyb2i8fp7r5";
+       version = "0.2";
+       sha256 = "1lr91wc1m655pi3ljw3n89svfazrb16785s9mfx361jgn335m8rd";
        buildDepends = [ base containers genifunctors mtl pretty safe ];
        testDepends = [
          base geniplate language-haskell-extract mtl pretty QuickCheck safe
          testing-feat
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/danr/structural-induction";
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.gpl3;
@@ -112656,9 +115934,11 @@ self: {
          QuickCheck semigroups tasty tasty-quickcheck tasty-th
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/structures";
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stunclient" = callPackage
@@ -112712,8 +115992,8 @@ self: {
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.5.11.2";
-       sha256 = "1rbr1vkrlbvqijhrqq3f1dq8vn0q12832rlkbynmnknn6a682n8x";
+       version = "0.5.13.0";
+       sha256 = "1284x4g6k24v3k2ii5jfyly6b788477qih3lq81x72x22d36d168";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -112861,6 +116141,7 @@ self: {
        homepage = "http://www.github.com/massysett/sunlight";
        description = "Test Cabalized package against multiple dependency versions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sunroof-compiler" = callPackage
@@ -112876,6 +116157,7 @@ self: {
          base Boolean containers data-default data-reify mtl operational
          semigroups tagged template-haskell transformers vector-space
        ];
+       jailbreak = true;
        homepage = "https://github.com/ku-fpg/sunroof-compiler";
        description = "Monadic Javascript Compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -112981,6 +116263,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base Cabal containers directory filepath ];
+       jailbreak = true;
        homepage = "http://www.mathstat.dal.ca/~selinger/superdoc/";
        description = "Additional documentation markup and Unicode support";
        license = stdenv.lib.licenses.bsd3;
@@ -113018,6 +116301,7 @@ self: {
        homepage = "http://github.com/agocorona/supervisor";
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suspend" = callPackage
@@ -113038,8 +116322,8 @@ self: {
      }:
      mkDerivation {
        pname = "svg-tree";
-       version = "0.2";
-       sha256 = "1qn1xq1lbbqpy0jpw67gq9f8ng46hyxm43lvb8q0ifn5ll2grn36";
+       version = "0.3";
+       sha256 = "0r83c5422bk50k0s5sbcbzw808r9am1zy35dlny4y28hvljm1pad";
        buildDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -113159,6 +116443,7 @@ self: {
        homepage = "http://github.com/jwiegley/svndump/";
        description = "Library for reading Subversion dump files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger" = callPackage
@@ -113214,6 +116499,7 @@ self: {
        homepage = "http://www.swearjure.com";
        description = "Clojure without alphanumerics";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swf" = callPackage
@@ -113243,6 +116529,7 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Online sampler for Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swish" = callPackage
@@ -113277,8 +116564,8 @@ self: {
      }:
      mkDerivation {
        pname = "sws";
-       version = "0.3.1.0";
-       sha256 = "1ph0a7n4kch5as703jildijkwn6ivmv82jcmdsh9nzbx3fifra9b";
+       version = "0.3.1.1";
+       sha256 = "0anl5h5lwc6b7whkg83ziyizq5w2mlcpv0akcl0ahgjl4mxnmiwd";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -113329,6 +116616,7 @@ self: {
        buildDepends = [
          array base bytestring containers template-haskell
        ];
+       jailbreak = true;
        description = "Scrap Your Boilerplate With Class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113458,6 +116746,7 @@ self: {
        homepage = "https://github.com/jetho/syncthing-hs";
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synt" = callPackage
@@ -113482,16 +116771,17 @@ self: {
      }) { Synt = null;};
 
   "syntactic" = callPackage
-    ({ mkDerivation, base, constraints, containers, data-hash, mtl
-     , QuickCheck, safe, tagged, tasty, tasty-golden, tasty-quickcheck
-     , tasty-th, template-haskell, tree-view, utf8-string
+    ({ mkDerivation, base, constraints, containers, data-hash, deepseq
+     , mtl, QuickCheck, safe, tagged, tasty, tasty-golden
+     , tasty-quickcheck, tasty-th, template-haskell, tree-view
+     , utf8-string
      }:
      mkDerivation {
        pname = "syntactic";
-       version = "2.0";
-       sha256 = "0b90afdfymsbgllk8np3xfkgrn2b5ry3n2wbpkn660rknsayw94x";
+       version = "2.1";
+       sha256 = "1r2b11xw235qsv6z6qqssrmgd1wcbr28vmlqs7vlb4h0yhpkd1i3";
        buildDepends = [
-         base constraints containers data-hash mtl safe tagged
+         base constraints containers data-hash deepseq mtl safe tagged
          template-haskell tree-view
        ];
        testDepends = [
@@ -113501,6 +116791,7 @@ self: {
        homepage = "https://github.com/emilaxelsson/syntactic";
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntactical" = callPackage
@@ -113592,7 +116883,6 @@ self: {
        buildDepends = [ base pretty scientific semi-iso syntax text ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-printer" = callPackage
@@ -113607,6 +116897,7 @@ self: {
          base bifunctors bytestring scientific semi-iso semigroupoids syntax
          text vector
        ];
+       jailbreak = true;
        description = "Text and ByteString printers for 'syntax'";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -113640,6 +116931,7 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees. Bairyn's fork.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer" = callPackage
@@ -113812,6 +117104,7 @@ self: {
          storable-record storablevector synthesizer-core
          synthesizer-dimensional transformers utility-ht
        ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Render audio signals from MIDI files or realtime messages";
        license = "GPL";
@@ -113899,8 +117192,8 @@ self: {
      }:
      mkDerivation {
        pname = "system-filepath";
-       version = "0.4.13.2";
-       sha256 = "0nmzahybk7mijq6dxcp2hr5mh5hlmz3q1dg1d31b5saazfnsicsj";
+       version = "0.4.13.3";
+       sha256 = "1j6fk1d3qrc2dn4kzwar9z3malrhx2mc6jjvlq9wiqyyx5gs3yyj";
        buildDepends = [ base bytestring deepseq text ];
        testDepends = [
          base bytestring chell chell-quickcheck QuickCheck text
@@ -113948,6 +117241,7 @@ self: {
          base directory either haskell-src-meta template-haskell text time
          transformers unix
        ];
+       jailbreak = true;
        homepage = "https://github.com/jcristovao/system-lifted";
        description = "Lifted versions of System functions";
        license = stdenv.lib.licenses.bsd3;
@@ -114055,6 +117349,7 @@ self: {
        sha256 = "10iyiw0m543bx9j9vdnz2lpnc3944i7ff9vbpdivvgv5z7gd17yn";
        buildDepends = [ base bytestring network transformers unix ];
        testDepends = [ base ];
+       jailbreak = true;
        homepage = "https://github.com/erebe/systemd";
        description = "Systemd facilities (Socket activation, Notify)";
        license = stdenv.lib.licenses.bsd3;
@@ -114087,6 +117382,7 @@ self: {
        ];
        description = "Matchers and grammars using tree regular expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ta" = callPackage
@@ -114116,6 +117412,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base csv optparse-applicative process split ];
+       jailbreak = true;
        homepage = "https://github.com/danchoi/table";
        description = "Simple tool to generate tables from DSV input";
        license = stdenv.lib.licenses.mit;
@@ -114128,6 +117425,7 @@ self: {
        version = "0.1.0.3";
        sha256 = "1v5g4fbbspgm4smjxk499a0grh5xsr18688kmivql8knhxh1351k";
        buildDepends = [ base ];
+       jailbreak = true;
        description = "A table tennis game tracking engine";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114145,7 +117443,6 @@ self: {
        buildDepends = [ base cgi containers html mtl parsec QuickCheck ];
        description = "An interactive theorem prover based on semantic tableaux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tables" = callPackage
@@ -114257,6 +117554,7 @@ self: {
        version = "0.1.1.2";
        sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65";
        buildDepends = [ base ghc-prim ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/tag-bits";
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
        license = stdenv.lib.licenses.bsd3;
@@ -114284,8 +117582,8 @@ self: {
      }:
      mkDerivation {
        pname = "tagchup";
-       version = "0.4.0.3";
-       sha256 = "1wjins7kmmmq9s8gawibnk7sr46jblclzxyj9xqxabj3vs8j6l76";
+       version = "0.4.0.4";
+       sha256 = "143bnz73fyy8swm37p0pjg9zagpgzi8mcvixvswla6fiszgc203p";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -114339,6 +117637,7 @@ self: {
        homepage = "https://github.com/trskop/tagged-exception";
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-list" = callPackage
@@ -114426,6 +117725,7 @@ self: {
        homepage = "http://github.com/alpmestan/taggy";
        description = "Efficient and simple HTML/XML parsing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taggy-lens" = callPackage
@@ -114443,6 +117743,7 @@ self: {
        homepage = "http://github.com/alpmestan/taggy-lens";
        description = "Lenses for the taggy html/xml parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taglib" = callPackage
@@ -114546,6 +117847,7 @@ self: {
        homepage = "http://www.killersmurf.com";
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagstream-conduit" = callPackage
@@ -114581,6 +117883,7 @@ self: {
        buildDepends = [ base mtl reasonable-lens reasonable-operational ];
        description = "create slide for presentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "takusen-oracle" = callPackage
@@ -114708,6 +118011,7 @@ self: {
        jailbreak = true;
        description = "An HTML templating system similar to Blaze, implemented as a monad transformer of sorts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tar" = callPackage
@@ -114802,8 +118106,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty";
-       version = "0.10.1";
-       sha256 = "1l8ah7018f3m8css56h59fcly1jhanm5wd0hbgm8mg6pn7rrjml5";
+       version = "0.10.1.1";
+       sha256 = "1gbxml5lr17x54zm44cxcjd0zgiqgdx5yj5yrrwn58wlmb9683rn";
        buildDepends = [
          ansi-terminal async base containers deepseq mtl
          optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays
@@ -114904,6 +118208,7 @@ self: {
        version = "1.0";
        sha256 = "0626islqqkncdma8790z2z47r8x90y9v7fj0p5nhkw6mpy6p0ifg";
        buildDepends = [ base HUnit tasty tasty-hunit ];
+       jailbreak = true;
        homepage = "https://github.com/jstolarek/tasty-hunit-adapter";
        description = "Use existing HUnit tests with tasty";
        license = stdenv.lib.licenses.bsd3;
@@ -114966,6 +118271,7 @@ self: {
        version = "1.0.2";
        sha256 = "0ii7jcmvmbw03r1ghm2bq9bmbs7w0jqgfc7qx34n45ymjy7ipc55";
        buildDepends = [ base deepseq directory filepath process tasty ];
+       jailbreak = true;
        homepage = "https://github.com/jstolarek/tasty-program";
        description = "Use tasty framework to test whether a program executes correctly";
        license = stdenv.lib.licenses.bsd3;
@@ -115007,17 +118313,17 @@ self: {
   "tasty-silver" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
-     , process-extras, stm, tagged, tasty, tasty-hunit, temporary, text
-     , transformers
+     , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
+     , temporary, text, transformers
      }:
      mkDerivation {
        pname = "tasty-silver";
-       version = "3.1.3";
-       sha256 = "18ciqnj2h77cyr07wypyjdbry5g4m88zmlrxqavhqxz4008biqlx";
+       version = "3.1.5";
+       sha256 = "09mgk5pklmwxhr6r3lfmcdd09fzwn00x1vbyy93gh7wbpcpfa8dv";
        buildDepends = [
          ansi-terminal async base bytestring containers deepseq directory
-         filepath mtl optparse-applicative process process-extras stm tagged
-         tasty temporary text
+         filepath mtl optparse-applicative process process-extras regex-tdfa
+         stm tagged tasty temporary text
        ];
        testDepends = [
          base directory filepath process tasty tasty-hunit temporary
@@ -115155,6 +118461,7 @@ self: {
        homepage = "http://www.cl.cam.ac.uk/~pes20/Netsem/";
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tdd-util" = callPackage
@@ -115210,7 +118517,6 @@ self: {
        buildDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teeth" = callPackage
@@ -115222,24 +118528,25 @@ self: {
        sha256 = "1hxii574qdxcbh10f4bgwyaxf83inqj9vrcwk7vkffv6pg349xcl";
        editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416";
        buildDepends = [ base ];
+       jailbreak = true;
        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
+    ({ mkDerivation, base, bifunctors, containers, errors, http-conduit
+     , mtl, network, regex-posix, split, time, transformers
      }:
      mkDerivation {
        pname = "tellbot";
-       version = "0.4.0.4";
-       sha256 = "1d5jdkk82y1xj22rpaz42ph3gp0fclghg5wbd8p7z2d9vas4p36n";
+       version = "0.5.1.2";
+       sha256 = "1w5byb09gv61qagqb2l16y93zlwvv1wfjlvc4xm6mi91xviyihkc";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
-         base bifunctors containers errors mtl network split time
-         transformers
+         base bifunctors containers errors http-conduit mtl network
+         regex-posix split time transformers
        ];
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
@@ -115267,6 +118574,7 @@ self: {
        homepage = "https://github.com/haskell-pkg-janitors/template-default";
        description = "declaring Default instances just got even easier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-haskell_2_10_0_0" = callPackage
@@ -115276,7 +118584,6 @@ self: {
        version = "2.10.0.0";
        sha256 = "1y0dikbpy98n9g1rwb6swng86cch815x5ipj8kfjgpjgs0c3i2im";
        buildDepends = [ base pretty ];
-       jailbreak = true;
        description = "Support library for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115291,6 +118598,7 @@ self: {
        homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils";
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-hsml" = callPackage
@@ -115331,6 +118639,24 @@ self: {
        homepage = "https://github.com/jekor/templatepg";
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "templater" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, hspec-attoparsec, HUnit
+     , QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "templater";
+       version = "0.0.2.0";
+       sha256 = "10dar9n4ccskv163zh3h756mp9ccx04ifgjwnsf8cnab22lng5mb";
+       buildDepends = [ attoparsec base text ];
+       testDepends = [
+         base hspec hspec-attoparsec HUnit QuickCheck text
+       ];
+       homepage = "https://github.com/geraud/templater";
+       description = "Simple string templater";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "tempodb" = callPackage
@@ -115350,6 +118676,7 @@ self: {
        homepage = "https://github.com/ixmatus/hs-tempodb";
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporal-csound" = callPackage
@@ -115368,6 +118695,7 @@ self: {
        homepage = "https://github.com/anton-k/temporal-csound";
        description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporal-media" = callPackage
@@ -115491,6 +118819,7 @@ self: {
        jailbreak = true;
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensor" = callPackage
@@ -115504,6 +118833,7 @@ self: {
        homepage = "http://noaxiom.org/tensor";
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "term-rewriting" = callPackage
@@ -115512,8 +118842,8 @@ self: {
      }:
      mkDerivation {
        pname = "term-rewriting";
-       version = "0.1.2.1";
-       sha256 = "06lz89dhaq6pqp1zjx8bmgpx06fq3xgnqy1llipik5c9zyr4zrfv";
+       version = "0.1.2.2";
+       sha256 = "0j69a4vvsv5lbh8zx3908bpk76lmg871glm6hqv0nq4xzircp184";
        buildDepends = [
          ansi-wl-pprint array base containers mtl multiset parsec
          union-find-array
@@ -115624,6 +118954,7 @@ self: {
        homepage = "http://mbays.freeshell.org/tersmu";
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework" = callPackage
@@ -115669,8 +119000,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-framework-golden";
-       version = "1.1.3.1";
-       sha256 = "1vmkc16z3gzbq9aibfk3wv7ms7sq7yivaamld63qrzlqaffz1xrw";
+       version = "1.1.3.3";
+       sha256 = "1sfgr91zn7iwgj1p1s3298mswv29rbxz4x4086r8mav7prd0ww36";
        buildDepends = [
          base bytestring filepath mtl process temporary test-framework
        ];
@@ -115718,6 +119049,7 @@ self: {
        homepage = "http://batterseapower.github.com/test-framework/";
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-quickcheck2" = callPackage
@@ -115727,7 +119059,9 @@ self: {
      mkDerivation {
        pname = "test-framework-quickcheck2";
        version = "0.3.0.3";
+       revision = "1";
        sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
+       editedCabalFile = "14fdf07c345e9460882b975851739afc2cf62f0c9930c38d0fee5b0943351638";
        buildDepends = [
          base extensible-exceptions QuickCheck random test-framework
        ];
@@ -115832,6 +119166,7 @@ self: {
        ];
        description = "Template Haskell for test framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-pkg" = callPackage
@@ -115856,8 +119191,8 @@ self: {
      }:
      mkDerivation {
        pname = "test-sandbox";
-       version = "0.1.3";
-       sha256 = "0hkpz3l5b1vpnpgagl150g5rdawwf9mwgb7ai0xilj4d7i55gdwl";
+       version = "0.1.4";
+       sha256 = "1x7vsi1brrdj71gwszc75qz159y8i4xln9dpcnxf70xjlswjmiqj";
        buildDepends = [
          base bytestring cereal containers data-default directory filepath
          lifted-base monad-control monad-loops mtl network process random
@@ -115904,8 +119239,8 @@ self: {
     ({ mkDerivation, base, HUnit, lifted-base, test-sandbox }:
      mkDerivation {
        pname = "test-sandbox-hunit";
-       version = "0.1.0";
-       sha256 = "1kg5i6l0809c0mmi4arp1dcaf52lq2i0lwcv1p3vp3vcc20srfsf";
+       version = "0.1.1";
+       sha256 = "1pdxwbs3508s9j1409bvpjipbqz8ymch633r6gyrirmr1r1zp3dy";
        buildDepends = [ base HUnit lifted-base test-sandbox ];
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "HUnit convenience functions for use with test-sandbox";
@@ -116068,9 +119403,11 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base containers deepseq parsec ];
+       jailbreak = true;
        homepage = "http://textmining.lt/tex2txt/";
        description = "LaTeX to plain-text conversion";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texmath" = callPackage
@@ -116080,8 +119417,8 @@ self: {
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.8.0.2";
-       sha256 = "11hzqfik99zydvsnwy4ihpgqvsiq398pxnw777bcaqzdrvyw7fa7";
+       version = "0.8.1";
+       sha256 = "0k30b4klbp1n59gjpwmkcd8p7rg0ihnn9n3ka5vz85lfsykl7q6q";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -116096,6 +119433,27 @@ self: {
        license = "GPL";
      }) {};
 
+  "texrunner" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
+     , HUnit, io-streams, lens, mtl, process, temporary, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "texrunner";
+       version = "0.0.1.0";
+       sha256 = "1p7q9fz6f56wcm9q0xap17xc2r9a01qf8gdlrbdgryv25fp0lhcs";
+       buildDepends = [
+         attoparsec base bytestring directory filepath io-streams mtl
+         process temporary
+       ];
+       testDepends = [
+         base bytestring HUnit lens test-framework test-framework-hunit
+       ];
+       description = "Functions for running Tex from Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text" = callPackage
     ({ mkDerivation, array, base, bytestring, deepseq, directory
      , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
@@ -116229,6 +119587,7 @@ self: {
        homepage = "http://github.com/finnsson/text-json-qq";
        description = "Json Quasiquatation for Haskell";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-latin1" = callPackage
@@ -116284,12 +119643,12 @@ self: {
      }) {};
 
   "text-manipulate" = callPackage
-    ({ mkDerivation, base, tasty, tasty-hunit, text, text-format }:
+    ({ mkDerivation, base, tasty, tasty-hunit, text }:
      mkDerivation {
        pname = "text-manipulate";
-       version = "0.1.3.1";
-       sha256 = "0k7mh9p6c8yif8sbfgqclk9v9jzymhlpv66bypn0z1y3p4ywfgjc";
-       buildDepends = [ base text text-format ];
+       version = "0.2.0.1";
+       sha256 = "0bwxyjj3ll45srxhsp2ihikgqglvjc6m02ixr8xpvyqwkcfwgsg0";
+       buildDepends = [ base text ];
        testDepends = [ base tasty tasty-hunit text ];
        homepage = "https://github.com/brendanhay/text-manipulate";
        description = "Case conversion, word boundary manipulation, and textual subjugation";
@@ -116312,6 +119671,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "text-position" = callPackage
+    ({ mkDerivation, base, QuickCheck, regex-applicative }:
+     mkDerivation {
+       pname = "text-position";
+       version = "0.1.0.0";
+       sha256 = "0cdi5kwpwvzmadhgkgnwax4jhllm6gjrsg1y3f3fp12x28nml1g8";
+       buildDepends = [ base regex-applicative ];
+       testDepends = [ base QuickCheck regex-applicative ];
+       jailbreak = true;
+       homepage = "http://rel4tion.org/projects/text-position/";
+       description = "Handling positions in text and position-tagging it";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "text-printer" = callPackage
     ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups
      , test-framework, test-framework-quickcheck2, text, text-latin1
@@ -116337,8 +119710,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-regex-replace";
-       version = "0.1.0.0";
-       sha256 = "1f5rqyf3i6ppraic97cla6z7cxyp7ign8x929qaicncccx7nrwx5";
+       version = "0.1.0.1";
+       sha256 = "1xnpfj1890l2zqqhr6b95qpqacpssi8qzgqgnpdxml8wfzan8xwl";
        buildDepends = [ attoparsec base text text-icu ];
        testDepends = [ base hspec QuickCheck smallcheck text text-icu ];
        description = "Easy replacement when using text-icu regexes";
@@ -116356,26 +119729,25 @@ self: {
        homepage = "https://github.com/acfoltzer/text-register-machine";
        description = "A Haskell implementation of the 1# Text Register Machine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, bytestring, ghc-prim, nats
+    ({ mkDerivation, array, base, bytestring, ghc-prim, integer-gmp
      , QuickCheck, quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, transformers
-     , transformers-compat, void
+     , tasty-quickcheck, template-haskell, text
      }:
      mkDerivation {
        pname = "text-show";
        version = "0.7.0.1";
        sha256 = "1qmvnni69dkxdjay387qxnvy1j4cffnw5igdgqbaqvrm0cgkkg4a";
        buildDepends = [
-         array base bytestring ghc-prim nats semigroups template-haskell
-         text transformers void
+         array base bytestring ghc-prim integer-gmp semigroups
+         template-haskell text
        ];
        testDepends = [
-         array base bytestring ghc-prim nats QuickCheck quickcheck-instances
-         tasty tasty-hunit tasty-quickcheck text transformers
-         transformers-compat void
+         array base bytestring ghc-prim QuickCheck quickcheck-instances
+         tasty tasty-hunit tasty-quickcheck text
        ];
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
@@ -116551,6 +119923,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Template-Haskell code for tfp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tftp" = callPackage
@@ -116615,11 +119988,34 @@ self: {
        version = "0.4.0.0";
        sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6";
        buildDepends = [ base template-haskell ];
+       jailbreak = true;
        homepage = "https://github.com/DanielSchuessler/th-build";
        description = "More convenient construction of TH ASTs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-context" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, data-default
+     , deepseq, ghc-prim, haskell-src-exts, hspec, hspec-core, mtl, syb
+     , template-haskell, text, th-desugar, th-orphans, th-reify-many
+     }:
+     mkDerivation {
+       pname = "th-context";
+       version = "0.13";
+       sha256 = "0i5392x1x06fk8ld7k6y8kj4hdi3s9gdf2lqj8f6vkwlcnj8cjwh";
+       buildDepends = [
+         base containers data-default haskell-src-exts mtl syb
+         template-haskell th-desugar th-orphans
+       ];
+       testDepends = [
+         array base bytestring containers deepseq ghc-prim hspec hspec-core
+         mtl syb template-haskell text th-desugar th-orphans th-reify-many
+       ];
+       homepage = "https://github.com/seereason/th-context";
+       description = "Test instance context";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-desugar" = callPackage
     ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb
      , template-haskell, th-lift, th-orphans
@@ -116676,26 +120072,38 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "th-inline-io-action" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "th-inline-io-action";
+       version = "0.1.0.0";
+       sha256 = "1yvxi3n1nafr37zmj0dd83sf2jq4c0sss34k4q5f64vrai8a6zwg";
+       buildDepends = [ base template-haskell ];
+       homepage = "https://github.com/tolysz/inline-io-action";
+       description = "Simple inline IO action into compiled code using TH";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-instance-reification" = callPackage
-    ({ mkDerivation, base, containers, HTF, HUnit, list-extras, loch-th
-     , placeholders, QuickCheck, quickcheck-instances, template-haskell
-     , th-expand-syns
+    ({ mkDerivation, base, containers, HTF, list-extras, loch-th
+     , placeholders, template-haskell, th-expand-syns
      }:
      mkDerivation {
        pname = "th-instance-reification";
-       version = "0.1.3";
-       sha256 = "1aiq4ygxdh9mz59wcnhbjr74sk7l20dvwpjkc4nkj2048axq17h1";
+       version = "0.1.4";
+       sha256 = "0cnq7qxqpc58a59iv8sfqrkhx9wkzpgn9l7r84kh0xa21w16inki";
        buildDepends = [
          base containers list-extras loch-th placeholders template-haskell
          th-expand-syns
        ];
        testDepends = [
-         base containers HTF HUnit list-extras loch-th placeholders
-         QuickCheck quickcheck-instances template-haskell th-expand-syns
+         base containers HTF list-extras loch-th placeholders
+         template-haskell th-expand-syns
        ];
        homepage = "https://github.com/nikita-volkov/th-instance-reification";
        description = "Fixed versions of instances reification functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-instances" = callPackage
@@ -116754,8 +120162,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-lift-instances";
-       version = "0.1.4";
-       sha256 = "02sf7qn1rs33cdf1dl7vpwkhqzhmj8h3naw0ngh2kz05ymk2qng4";
+       version = "0.1.5";
+       sha256 = "1j9j70344mi77923v78v3hfhwn72cpq92i87rqd7alvbhkhcny8z";
        buildDepends = [
          base bytestring containers template-haskell text th-lift vector
        ];
@@ -116763,10 +120171,10 @@ self: {
          base bytestring containers directory doctest filepath QuickCheck
          template-haskell text vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/bennofs/th-lift-instances/";
        description = "Lift instances for template-haskell for common data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-orphans" = callPackage
@@ -116799,9 +120207,11 @@ self: {
        testDepends = [
          base bytestring hspec HUnit QuickCheck template-haskell text
        ];
+       jailbreak = true;
        homepage = "https://github.com/joelteon/th-printf";
        description = "Compile-time printf";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-reify-many" = callPackage
@@ -116853,6 +120263,7 @@ self: {
          aeson base bytestring network old-locale tasty tasty-hunit text
          time transformers unix
        ];
+       jailbreak = true;
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
@@ -116866,7 +120277,9 @@ self: {
      mkDerivation {
        pname = "themplate";
        version = "1.1";
+       revision = "1";
        sha256 = "1bjiiwhbwq6am7269gzsaqq6hpvy45x4pkq0kq7qm2j4bzrmfr14";
+       editedCabalFile = "02239e2cf43fa8f2b4fc9c68ad3561aef40af2348e962cb4f2bb5d7d839ad8da";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -116962,6 +120375,7 @@ self: {
        homepage = "http://web.cecs.pdx.edu/~mpj/thih/";
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thimk" = callPackage
@@ -117146,6 +120560,7 @@ self: {
          transformers unordered-containers utf8-string vault websockets
          websockets-snap
        ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
@@ -117252,6 +120667,7 @@ self: {
        homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tianbar" = callPackage
@@ -117331,7 +120747,6 @@ self: {
        homepage = "http://tidal.lurk.org/";
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tidal-midi" = callPackage
@@ -117360,7 +120775,6 @@ self: {
        homepage = "http://yaxu.org/tidal/";
        description = "Visual rendering for Tidal patterns";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tie-knot" = callPackage
@@ -117374,6 +120788,7 @@ self: {
        homepage = "https://github.com/ppetr/tie-knot";
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tiempo" = callPackage
@@ -117383,6 +120798,7 @@ self: {
        version = "0.0.1.0";
        sha256 = "1gmaiiwcbn3z3zmhgii7q3922c2rwdgkjsc4104gyzjm2m08998r";
        buildDepends = [ base deepseq time ];
+       jailbreak = true;
        homepage = "http://github.com/HaskVan/tiempo";
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
        license = stdenv.lib.licenses.mit;
@@ -117419,6 +120835,7 @@ self: {
        jailbreak = true;
        description = "Nice API for a Slackbot";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tighttp" = callPackage
@@ -117433,6 +120850,7 @@ self: {
          base bytestring handle-like monads-tf old-locale papillon
          simple-pipe time
        ];
+       jailbreak = true;
        homepage = "https://github.com/YoshikuniJujo/tighttp/wiki";
        description = "Tiny and Incrementally-Growing HTTP library";
        license = stdenv.lib.licenses.bsd3;
@@ -117484,7 +120902,6 @@ self: {
          base deepseq QuickCheck test-framework test-framework-quickcheck2
          unix
        ];
-       jailbreak = true;
        homepage = "https://github.com/haskell/time";
        description = "A time library";
        license = stdenv.lib.licenses.bsd3;
@@ -117587,12 +121004,12 @@ self: {
      }) {};
 
   "time-locale-compat" = callPackage
-    ({ mkDerivation, base, old-locale, time }:
+    ({ mkDerivation, base, time }:
      mkDerivation {
        pname = "time-locale-compat";
        version = "0.1.0.1";
        sha256 = "0q5d134cvcy7hlr473fanqqixqnqpqvz9ka2r45m59l6kzrws95c";
-       buildDepends = [ base old-locale time ];
+       buildDepends = [ base time ];
        homepage = "http://twitter.com/khibino/";
        description = "Compatibility of TimeLocale between old-locale and time-1.5";
        license = stdenv.lib.licenses.bsd3;
@@ -117609,6 +121026,7 @@ self: {
        homepage = "https://bitbucket.org/jfmueller/time-patterns";
        description = "Patterns for recurring events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-recurrence" = callPackage
@@ -117624,9 +121042,11 @@ self: {
          base data-ordlist HUnit mtl old-locale test-framework
          test-framework-hunit time
        ];
+       jailbreak = true;
        homepage = "http://github.com/hellertime/time-recurrence";
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-series" = callPackage
@@ -117640,6 +121060,7 @@ self: {
        buildDepends = [ array base containers mtl ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-units" = callPackage
@@ -117681,6 +121102,7 @@ self: {
        buildDepends = [ base haskeline uu-parsinglib ];
        homepage = "https://github.com/chriseidhof/TimeCalc";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeit" = callPackage
@@ -117756,6 +121178,7 @@ self: {
        jailbreak = true;
        description = "Attoparsec parsers for various Date/Time formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeplot" = callPackage
@@ -117777,15 +121200,16 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Timeplot";
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timerep" = callPackage
-    ({ mkDerivation, base, old-locale, time }:
+    ({ mkDerivation, attoparsec, base, old-locale, time }:
      mkDerivation {
        pname = "timerep";
-       version = "1.0.3";
-       sha256 = "14lz8nzfy1j7snvifbwjkk1fjc8wy4jk67xk9n87r25v3cva3x0p";
-       buildDepends = [ base old-locale time ];
+       version = "1.0.4";
+       sha256 = "00a1sfhpp3c88f2pg0kigmzngh84ahw9d4zh188miagw0b4zn8xj";
+       buildDepends = [ attoparsec base old-locale time ];
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117834,6 +121258,7 @@ self: {
        homepage = "https://github.com/Peaker/timestamp-subprocess-lines";
        description = "Run a command and timestamp its stdout/stderr lines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timestamper" = callPackage
@@ -117845,9 +121270,11 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base old-locale time ];
+       jailbreak = true;
        homepage = "https://github.com/kisom/timestamper";
        description = "Read standard input and prepend each line with a timestamp";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-olson" = callPackage
@@ -117861,11 +121288,29 @@ self: {
        buildDepends = [
          base binary bytestring extensible-exceptions time timezone-series
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/time-ng/";
        description = "A pure Haskell parser and renderer for binary Olson timezone files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "timezone-olson-th" = callPackage
+    ({ mkDerivation, base, template-haskell, time, timezone-olson
+     , timezone-series
+     }:
+     mkDerivation {
+       pname = "timezone-olson-th";
+       version = "0.1.0.0";
+       sha256 = "0rw0gca1qa5r9nas12mhmbfa09jjix6kn7h5vjmvbhh83820br5i";
+       buildDepends = [
+         base template-haskell time timezone-olson timezone-series
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/jonpetterbergman/timezone-olson-th";
+       description = "Load TimeZoneSeries from an Olson file at compile time";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "timezone-series" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -117873,6 +121318,7 @@ self: {
        version = "0.1.4";
        sha256 = "06p5v0dimhwmra100gwkhkz3ll492i2bvafw0qx2qzcxx4yxff40";
        buildDepends = [ base time ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -117898,6 +121344,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "19jpwnk7hmi0mg46nqhyiipz085dkakqwgh17lv9ccvvcirpclm3";
        buildDepends = [ attoparsec base bytestring hex serialport unix ];
+       jailbreak = true;
        homepage = "http://github.com/mgajda/tinyMesh";
        description = "TinyMesh - communicating with auto-meshing sensor network";
        license = stdenv.lib.licenses.bsd2;
@@ -117920,14 +121367,28 @@ self: {
        license = "unknown";
      }) {};
 
+  "tinytemplate" = callPackage
+    ({ mkDerivation, base, mtl, QuickCheck, text }:
+     mkDerivation {
+       pname = "tinytemplate";
+       version = "0.1.1.0";
+       sha256 = "19i5vs2kb24hahwahfvn6bldzpcw68lpjlw37yvf2n8s5sq1fibc";
+       buildDepends = [ base text ];
+       testDepends = [ base mtl QuickCheck text ];
+       jailbreak = true;
+       homepage = "http://github.com/dicomgrid/tinytemplate";
+       description = "A tiny text templating library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "titlecase" = callPackage
     ({ mkDerivation, base, blaze-markup, semigroups, tasty, tasty-hunit
      , tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "titlecase";
-       version = "0.1.0.0";
-       sha256 = "09zq7z3icziad12ssn663l32k6c5z31azzlhg789q635ab3dckn0";
+       version = "0.1.0.1";
+       sha256 = "0qwlcfr7fb5nr9vmfjfdlm3bz65jil8xnxmd54zksp1z3sxz5fhf";
        buildDepends = [ base blaze-markup semigroups text ];
        testDepends = [
          base semigroups tasty tasty-hunit tasty-quickcheck text
@@ -117995,8 +121456,8 @@ self: {
      }:
      mkDerivation {
        pname = "tls";
-       version = "1.2.16";
-       sha256 = "0z5w8bj6acr7517y25dkqi3scjn08kzq2hjkhrc1rs6cafn8cl20";
+       version = "1.2.17";
+       sha256 = "0j0a16zwpycp0drsjar0rpcs5vd1ljymhclfjls6091ph917rzn6";
        buildDepends = [
          asn1-encoding asn1-types async base byteable bytestring cereal
          cipher-aes cipher-des cipher-rc4 crypto-cipher-types crypto-numbers
@@ -118083,6 +121544,7 @@ self: {
        buildDepends = [
          base bytestring containers directory process safe text time yaml
        ];
+       jailbreak = true;
        description = "A simple daily journal program";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -118155,6 +121617,7 @@ self: {
        homepage = "http://gitorious.org/todos";
        description = "Easy-to-use TODOs manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tofromxml" = callPackage
@@ -118206,18 +121669,20 @@ self: {
        homepage = "https://github.com/hvr/token-bucket";
        description = "Rate limiter using lazy bucket algorithm";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tokenize" = callPackage
     ({ mkDerivation, base, split, text }:
      mkDerivation {
        pname = "tokenize";
-       version = "0.2.2";
-       sha256 = "0pf4bbvd02jp8blfhyjhygsjgisqp61kw9n42zgnw08bnnqshln3";
+       version = "0.3.0";
+       sha256 = "1dcimgwy6ik5l6f98b0w6sc7pf06qazckfwf2cbmrd7g0q7lk20f";
        buildDepends = [ base split text ];
        homepage = "https://bitbucket.org/gchrupala/lingo/overview";
        description = "Simple tokenizer for English text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toktok" = callPackage
@@ -118291,6 +121756,7 @@ self: {
          attoparsec base bytestring containers old-locale time
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toolshed" = callPackage
@@ -118299,8 +121765,8 @@ self: {
      }:
      mkDerivation {
        pname = "toolshed";
-       version = "0.15.0.0";
-       sha256 = "19cam8s8fcfsip2cr7gcr43plvxy2zhbczlygd6p5rcax4295ikd";
+       version = "0.15.0.1";
+       sha256 = "034npn24nk07hkc6wnfqsxn8msqkgfi8zwvj0yb4rmpgmxq73v60";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -118357,6 +121823,7 @@ self: {
        ];
        description = "BitTorrent file parser and generater";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tostring" = callPackage
@@ -118374,9 +121841,10 @@ self: {
     ({ mkDerivation, base, ghc-prim, void }:
      mkDerivation {
        pname = "total";
-       version = "1.0.2";
-       sha256 = "1di1iblxijdffczv3yni8bj1yjjc2258w7dxf8iwrd5n5h6574d4";
+       version = "1.0.3";
+       sha256 = "1aqpjpxg4incb03zryp6j66fn9wq1jd7nr5kjvrad8awk7349ggn";
        buildDepends = [ base ghc-prim void ];
+       jailbreak = true;
        description = "Exhaustive pattern matching using lenses, traversals, and prisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118426,12 +121894,12 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers
      , data-default-class, data-interval, deepseq, exceptions
      , extended-reals, filepath, finite-field, ghc-prim, hashable, heaps
-     , HUnit, intern, loop, mtl, multiset, old-locale, OptDir
-     , parse-dimacs, parsec, prettyclass, primes, process, queue
-     , QuickCheck, random, sign, stm, temporary, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, time, type-level-numbers, unbounded-delays
-     , unordered-containers, vector-space
+     , HUnit, intern, loop, mtl, multiset, OptDir, parse-dimacs, parsec
+     , prettyclass, primes, process, queue, QuickCheck, random, sign
+     , stm, temporary, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, time
+     , type-level-numbers, unbounded-delays, unordered-containers
+     , vector-space
      }:
      mkDerivation {
        pname = "toysolver";
@@ -118442,10 +121910,10 @@ self: {
        buildDepends = [
          array base bytestring containers data-default-class data-interval
          deepseq exceptions extended-reals filepath finite-field ghc-prim
-         hashable heaps intern loop mtl multiset old-locale OptDir
-         parse-dimacs parsec prettyclass primes process queue random sign
-         stm temporary time type-level-numbers unbounded-delays
-         unordered-containers vector-space
+         hashable heaps intern loop mtl multiset OptDir parse-dimacs parsec
+         prettyclass primes process queue random sign stm temporary time
+         type-level-numbers unbounded-delays unordered-containers
+         vector-space
        ];
        testDepends = [
          array base containers data-interval finite-field HUnit mtl OptDir
@@ -118454,6 +121922,7 @@ self: {
        ];
        description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tpdb" = callPackage
@@ -118475,20 +121944,20 @@ self: {
        homepage = "https://github.com/jwaldmann/haskell-tpdb";
        description = "Data Type for Rewriting Systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trace" = callPackage
-    ({ mkDerivation, base, containers, deepseq, either, kan-extensions
-     , monad-control, mtl, profunctors, transformers, transformers-base
-     , transformers-compat
+    ({ mkDerivation, base, containers, deepseq, monad-control, mtl
+     , transformers, transformers-base
      }:
      mkDerivation {
        pname = "trace";
-       version = "0.1.0.5";
-       sha256 = "19l06mxw5n9r6mnygvgvrsrdkwyf2zxfjb0ky23v2bgrs5wjx4vc";
+       version = "0.2.0.0";
+       sha256 = "14kzdd62gci1f1wskvvwai9wprkn8mq5wsdz4d5mw6kf7dcxbz41";
        buildDepends = [
-         base containers deepseq either kan-extensions monad-control mtl
-         profunctors transformers transformers-base transformers-compat
+         base containers deepseq monad-control mtl transformers
+         transformers-base
        ];
        description = "A monad transformer for tracing provenience of errors";
        license = stdenv.lib.licenses.mit;
@@ -118657,7 +122126,9 @@ self: {
      mkDerivation {
        pname = "transformers-base";
        version = "0.4.4";
+       revision = "1";
        sha256 = "11r3slgpgpra6zi2kjg3g60gvv17b1fh6qxipcpk8n86qx7lk8va";
+       editedCabalFile = "fb1a305f29cbf6ac182af7e67efaae9fcb9664d8d9606bb8a7f3414ad4c8d7a4";
        buildDepends = [ base stm transformers transformers-compat ];
        homepage = "https://github.com/mvv/transformers-base";
        description = "Lift computations from the bottom of a transformer stack";
@@ -118665,13 +122136,12 @@ self: {
      }) {};
 
   "transformers-compat" = callPackage
-    ({ mkDerivation, base, mtl, transformers }:
+    ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "transformers-compat";
        version = "0.4.0.4";
        sha256 = "0lmg8ry6bgigb0v2lg0n74lxi8z5m85qq0qi4h1k9llyjb4in8ym";
-       buildDepends = [ base mtl transformers ];
-       configureFlags = [ "-fthree" ];
+       buildDepends = [ base transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
@@ -118891,6 +122361,7 @@ self: {
        ];
        description = "Library for polling Tremulous servers";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trhsx" = callPackage
@@ -118961,6 +122432,7 @@ self: {
        jailbreak = true;
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trivia" = callPackage
@@ -118996,6 +122468,7 @@ self: {
        version = "0.0.0.2";
        sha256 = "1in9jjfzbqws4bk83082yra2gcb5b095948qyji63ckbz3igp0k2";
        buildDepends = [ base semiring-simple ];
+       jailbreak = true;
        description = "A library for tropical mathematics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119011,6 +122484,7 @@ self: {
        homepage = "https://github.com/liyang/true-name";
        description = "Template Haskell hack to violate another module's abstractions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "truelevel" = callPackage
@@ -119063,6 +122537,19 @@ self: {
        homepage = "https://github.com/thaldyron/tskiplist";
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tslogger" = callPackage
+    ({ mkDerivation, async, base, containers, random }:
+     mkDerivation {
+       pname = "tslogger";
+       version = "0.1.0.0";
+       sha256 = "1xybllaxakzlai0ja93fyw8yr0p56g58f5akc5z9pi4w4493c7dl";
+       buildDepends = [ async base containers random ];
+       jailbreak = true;
+       description = "Thread-safe logging";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tsp-viz" = callPackage
@@ -119113,12 +122600,19 @@ self: {
      }) {};
 
   "ttrie" = callPackage
-    ({ mkDerivation, atomic-primops, base, hashable, primitive, stm }:
+    ({ mkDerivation, atomic-primops, base, containers, hashable
+     , primitive, QuickCheck, stm, test-framework
+     , test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "ttrie";
-       version = "0.1.0.0";
-       sha256 = "1lyz2hyi52fc0w1pix15g5h88y9x66wfw65k8bm4zc79irfv969h";
+       version = "0.1.1";
+       sha256 = "1di4h0vqj0hyxy0zgxkr1zwfy901hfglh9da21kv7li88c2d51sp";
        buildDepends = [ atomic-primops base hashable primitive stm ];
+       testDepends = [
+         base containers hashable QuickCheck stm test-framework
+         test-framework-quickcheck2
+       ];
        jailbreak = true;
        homepage = "http://github.com/mcschroeder/ttrie";
        description = "Contention-free STM hash map";
@@ -119127,9 +122621,9 @@ self: {
 
   "tttool" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , directory, filepath, ghc-prim, hashable, JuicyPixels, mtl
-     , old-locale, parsec, process, template-haskell, text, time
-     , unordered-containers, vector, yaml
+     , directory, filepath, ghc-prim, hashable, JuicyPixels, mtl, parsec
+     , process, template-haskell, text, time, unordered-containers
+     , vector, yaml
      }:
      mkDerivation {
        pname = "tttool";
@@ -119139,8 +122633,8 @@ self: {
        isExecutable = true;
        buildDepends = [
          aeson base binary bytestring containers directory filepath ghc-prim
-         hashable JuicyPixels mtl old-locale parsec process template-haskell
-         text time unordered-containers vector yaml
+         hashable JuicyPixels mtl parsec process template-haskell text time
+         unordered-containers vector yaml
        ];
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
@@ -119172,6 +122666,7 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple" = callPackage
@@ -119195,6 +122690,7 @@ self: {
        jailbreak = true;
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-hlist" = callPackage
@@ -119220,6 +122716,7 @@ self: {
        homepage = "http://github.com/jfischoff/tuple-lenses";
        description = "Stock FieldN combos and generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-morph" = callPackage
@@ -119357,17 +122854,30 @@ self: {
        jailbreak = true;
        description = "Used as Lab Assignments Environment at the University of Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "twentefp-eventloop-trees" = callPackage
+    ({ mkDerivation, base, eventloop }:
+     mkDerivation {
+       pname = "twentefp-eventloop-trees";
+       version = "0.1.0.1";
+       sha256 = "1zbpxmi5n9ckmpxk8k3xlgjk0p9gw4ffa5yzd50x7ns1l8af8s5m";
+       buildDepends = [ base eventloop ];
+       description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "twentefp-graphs" = callPackage
     ({ mkDerivation, base, twentefp-eventloop-graphics }:
      mkDerivation {
        pname = "twentefp-graphs";
-       version = "0.1.0.3";
-       sha256 = "1ran49yvbylf14hbr3ffmbxpkjwva785hgyvnmwzp2v2hwz1343m";
+       version = "0.1.0.4";
+       sha256 = "0g0py8cb4z9i9pjhka2pyjm8vfai9x3k0vmlb06g157ish97qvir";
        buildDepends = [ base twentefp-eventloop-graphics ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp-number" = callPackage
@@ -119406,6 +122916,7 @@ self: {
        buildDepends = [ base twentefp-eventloop-graphics ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp-websockets" = callPackage
@@ -119425,6 +122936,7 @@ self: {
        jailbreak = true;
        description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twhs" = callPackage
@@ -119498,21 +123010,21 @@ self: {
      }:
      mkDerivation {
        pname = "twilio";
-       version = "0.1.1.0";
-       sha256 = "0pzdmsr8ncbpqs42g0n1rbjprg70yfqrxlp8fn719s7gg37qaz78";
+       version = "0.1.2.0";
+       sha256 = "05qhg9djp71xdwzb88xdnrg3zjbd6p8xb4gwzp0l6m3gc9wi7nvp";
        buildDepends = [
          aeson base bifunctors bytestring containers errors exceptions free
          http-client http-client-tls http-types mtl network-uri old-locale
          text time transformers unordered-containers
        ];
        testDepends = [
-         aeson base bytestring Cabal http-client http-client-tls text
-         transformers
+         aeson base bytestring Cabal http-client http-client-tls network-uri
+         text transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/markandrus/twilio-haskell";
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twill" = callPackage
@@ -119623,6 +123135,7 @@ self: {
        ];
        description = "A Haskell-based CLI Twitter client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-conduit" = callPackage
@@ -119691,8 +123204,8 @@ self: {
      }:
      mkDerivation {
        pname = "twitter-feed";
-       version = "0.1.1.3";
-       sha256 = "1c50rirj3wymbh1850c7dm79jyglcn34116vljh5f54f8sv17y96";
+       version = "0.1.1.4";
+       sha256 = "006qdp9imdnaprpaf4yk0zks0p3ry4ngag4i533wyik2xrz3q8ir";
        buildDepends = [
          aeson authenticate-oauth base bytestring http-conduit
        ];
@@ -119717,9 +123230,7 @@ self: {
        pname = "twitter-types";
        version = "0.7.0";
        sha256 = "0smzz3y6xgb0yddp62bvw4j278fw5dnjffrjfxz3dc6hd602cvlh";
-       buildDepends = [
-         aeson base old-locale text time unordered-containers
-       ];
+       buildDepends = [ aeson base text time unordered-containers ];
        testDepends = [
          aeson attoparsec base bytestring derive directory filepath HUnit
          old-locale QuickCheck template-haskell test-framework
@@ -119806,6 +123317,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "08qpdyb1dbkif4zwrap6478fsf7lha6hk18wm0r4803avrr5w2bb";
        buildDepends = [ base ];
+       jailbreak = true;
        description = "Deprecated in favor of eros";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119963,6 +123475,7 @@ self: {
        homepage = "http://github.com/ekmett/type-int";
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-iso" = callPackage
@@ -120000,6 +123513,7 @@ self: {
        homepage = "https://github.com/Kinokkory/type-level-bst";
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-natural-number" = callPackage
@@ -120077,11 +123591,12 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "type-list";
-       version = "0.0.0.1";
-       sha256 = "1mbgwin1rcf1fkm3cq6h2dqv157xwgjca3019fxi759cxg9j70d2";
+       version = "0.1.0.0";
+       sha256 = "0y5qa882rcrlq13mfsp8yzbn6fqsc2clii2qjhk1nmg8ivqf026v";
        buildDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-natural" = callPackage
@@ -120099,6 +123614,7 @@ self: {
        homepage = "https://github.com/konn/type-natural";
        description = "Type-level natural and proofs of their properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-ord" = callPackage
@@ -120281,6 +123797,7 @@ self: {
        version = "1.4.0.4";
        sha256 = "11s10arrbri1f71jfpynhmwh53cgkrfxsrqch1f02j0aii7n0lpv";
        buildDepends = [ base binary bytestring mtl pureMD5 syb ];
+       jailbreak = true;
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120380,6 +123897,7 @@ self: {
        homepage = "http://github.com/paf31/typescript-docs";
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typical" = callPackage
@@ -120406,12 +123924,13 @@ self: {
        ];
        description = "Drawings for printed text documents";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tz" = callPackage
     ({ mkDerivation, base, binary, bindings-posix, bytestring
-     , containers, deepseq, HUnit, QuickCheck, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , containers, deepseq, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
      , test-framework-th, time, tzdata, unix, vector
      }:
      mkDerivation {
@@ -120419,8 +123938,7 @@ self: {
        version = "0.0.0.10";
        sha256 = "15j0ai0i4savvvhd8b7f9mrm1kwdmvjrphyjclmlj1k65c6ap5qm";
        buildDepends = [
-         base binary bytestring containers deepseq template-haskell time
-         tzdata vector
+         base binary bytestring containers deepseq time tzdata vector
        ];
        testDepends = [
          base bindings-posix HUnit QuickCheck test-framework
@@ -120512,6 +124030,7 @@ self: {
        homepage = "http://ui3.info/d/proj/uacpid.html";
        description = "Userspace Advanced Configuration and Power Interface event daemon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uberlast" = callPackage
@@ -120524,6 +124043,7 @@ self: {
        homepage = "https:/github.com/fumieval/uberlast";
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uconv" = callPackage
@@ -120556,6 +124076,7 @@ self: {
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Small DBus implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "udbus-model" = callPackage
@@ -120570,6 +124091,7 @@ self: {
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "udcode" = callPackage
@@ -120631,6 +124153,7 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uhc-util" = callPackage
@@ -120640,8 +124163,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.5.3";
-       sha256 = "0hy950rl4d7ml0aqs0bkyjz3xc8b6p3m2ik6dqkagxxjl3cksjz3";
+       version = "0.1.5.4";
+       sha256 = "0ksaph4nmk38hv3pfs95xrp6mryhjk6dqbl8wlj5iyn75f1yibli";
        buildDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib
@@ -120696,6 +124219,7 @@ self: {
        buildDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uid" = callPackage
@@ -120736,10 +124260,8 @@ self: {
      }:
      mkDerivation {
        pname = "unagi-chan";
-       version = "0.3.0.2";
-       sha256 = "1a6jpr6gynpfh3kqfq42arzxfij5ms18rqhl0xlf49iscj0c15lg";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.0.0";
+       sha256 = "04m1ns6jc1yb1i9pmqmi8k21mwgkrq4q9fbcj4af1a9khxrjxcny";
        buildDepends = [ atomic-primops base ghc-prim primitive ];
        testDepends = [
          atomic-primops base containers ghc-prim primitive
@@ -120755,6 +124277,7 @@ self: {
        version = "0.1.2";
        sha256 = "0fhs55bap2dkp9lismq4df4sy8878f52xawr4an4cl0v1yj12cq0";
        buildDepends = [ base io-streams unagi-chan ];
+       jailbreak = true;
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120798,6 +124321,7 @@ self: {
        homepage = "http://code.google.com/p/replib/";
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbound-generics" = callPackage
@@ -120879,11 +124403,9 @@ self: {
        version = "0.8.2";
        sha256 = "0r6jffm2i2la70xzqsribfbsa84ha5g4zfqphp9gqkvr1x2jmr2i";
        buildDepends = [ base ghc-prim QuickCheck random transformers ];
-       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ungadtagger" = callPackage
@@ -121028,6 +124550,7 @@ self: {
        buildDepends = [ array base containers unicode-properties ];
        description = "Unicode 3.2.0 character names";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode-normalization" = callPackage
@@ -121064,6 +124587,7 @@ self: {
        buildDepends = [ array base containers ];
        description = "Unicode 3.2.0 character properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode-symbols" = callPackage
@@ -121092,6 +124616,7 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/unicoder";
        description = "Make writing in unicode easy";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unification-fd" = callPackage
@@ -121134,8 +124659,8 @@ self: {
     ({ mkDerivation, array, base, mtl }:
      mkDerivation {
        pname = "union-find-array";
-       version = "0.1.0.1";
-       sha256 = "0p50w0kb1pz80nq0nm9l20wshsqjcaaagrrjfqx955awrvz2wmf7";
+       version = "0.1.0.2";
+       sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk";
        buildDepends = [ array base mtl ];
        homepage = "https://github.com/haskell-rewriting/union-find-array";
        description = "union find data structure";
@@ -121152,6 +124677,7 @@ self: {
        homepage = "http://github.com/minpou/union-map";
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uniplate" = callPackage
@@ -121242,6 +124768,7 @@ self: {
        homepage = "https://github.com/goldfirere/units";
        description = "A domain-specific type system for dimensional analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "units-defs" = callPackage
@@ -121254,6 +124781,7 @@ self: {
        homepage = "http://github.com/goldfirere/units-defs";
        description = "Definitions for use with the units package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "units-parser" = callPackage
@@ -121538,10 +125066,13 @@ self: {
      mkDerivation {
        pname = "unlambda";
        version = "0.1.3";
+       revision = "1";
        sha256 = "0clcpkhg23a7ma72rjjpl2w8jpg2mdn4rgm3vf0vqr7lbyma1h89";
+       editedCabalFile = "fa5648fb982ec7670fcd4ace6fa9f01d26b0c81641f4e3d1e31edbd49dd6bbe4";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ array base mtl unix ];
+       jailbreak = true;
        description = "Unlambda interpreter";
        license = "GPL";
      }) {};
@@ -121672,9 +125203,11 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base ];
+       jailbreak = true;
        homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unsafeperformst" = callPackage
@@ -121844,19 +125377,21 @@ self: {
      }) {};
 
   "uri-bytestring" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, attoparsec, base, bytestring, derive, HUnit, lens
+     , QuickCheck, quickcheck-instances, tasty, tasty-hunit
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.0.1";
-       sha256 = "16cp95r94cqzch529i7h282w7d7nrjjxqb6rxd2k5nj7ax0pavy5";
+       version = "0.1";
+       sha256 = "16fvijiaqnrlw8hhv96cnp0qh5sq3bhixihw0k73i6j7wp1wp9i1";
        buildDepends = [ attoparsec base bytestring ];
        testDepends = [
-         attoparsec base bytestring derive HUnit QuickCheck tasty
-         tasty-hunit tasty-quickcheck
+         attoparsec base bytestring derive HUnit lens QuickCheck
+         quickcheck-instances tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://travis-ci.org/Soostone/uri-bytestring";
+       jailbreak = true;
+       homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121991,6 +125526,7 @@ self: {
        buildDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlcheck" = callPackage
@@ -122108,8 +125644,8 @@ self: {
      }:
      mkDerivation {
        pname = "usb";
-       version = "1.3.0.0";
-       sha256 = "0h9lzjmppq2cbyma3rrk2xfayf4aq1xjz8zh18v53m1ky34rhjgp";
+       version = "1.3.0.1";
+       sha256 = "0sckwrf22zpyp11575d8n5ka6cwcc0cw9r79vzbl859rz1bcxrj7";
        buildDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
@@ -122145,6 +125681,7 @@ self: {
        sha256 = "0mx4f1zrk098c9isczni66i8qisx54r85kwyk2s238dznlys39gh";
        editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc";
        buildDepends = [ attoparsec base bytestring usb ];
+       jailbreak = true;
        homepage = "https://github.com/mapinguari/usb-hid";
        description = "Parser and request Library for USB HIDs";
        license = stdenv.lib.licenses.bsd3;
@@ -122254,8 +125791,8 @@ self: {
      }:
      mkDerivation {
        pname = "utc";
-       version = "0.1.0.0";
-       sha256 = "14wqwyc9vgiqps5bgr1wxsfg5x98gbbk2gpkbz2haw0bjmydzzm6";
+       version = "0.1.0.1";
+       sha256 = "0fqqnb6rcbkdxz7wf1r6475k7lv6c8hkvak8nydcl0d10j0hqkil";
        buildDepends = [ attoparsec base bytestring clock text ];
        testDepends = [
          attoparsec base bytestring Cabal clock QuickCheck test-framework
@@ -122343,8 +125880,8 @@ self: {
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
        pname = "uu-cco";
-       version = "0.1.0.1";
-       sha256 = "1skg22cnsnjp5zzv1q6fk68xryynncx5l1xlcaf8jf76g183c5vi";
+       version = "0.1.0.3";
+       sha256 = "0na2gd82z7llrppaskfkrqj3lbl0k6kvb62n4qhpqgsyz001fi8j";
        buildDepends = [ ansi-terminal base ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: core functionality";
@@ -122393,8 +125930,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "uu-interleaved";
-       version = "0.1.0.0";
-       sha256 = "00zq89fjz3r5pj6qbci017cm9y2rsvl265y9d95q0rv6ljhsayzs";
+       version = "0.2.0.0";
+       sha256 = "1rysap86jrq43b99ay52nrmbdpcba7cl0ac85nsb7gll1rbyr59i";
        buildDepends = [ base ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Providing an interleaving combinator for use with applicative/alternative style implementations";
@@ -122414,20 +125951,22 @@ self: {
        buildDepends = [
          base lenses mtl transformers uu-interleaved uu-parsinglib
        ];
+       jailbreak = true;
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Parse command line options using uu-interleave and uu-parsinglib";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uu-parsinglib" = callPackage
     ({ mkDerivation, base, ListLike, time, uu-interleaved }:
      mkDerivation {
        pname = "uu-parsinglib";
-       version = "2.8.1.1";
-       sha256 = "1mz8sni7mj85b0ih0y1ld7lcj74iq5z2xi1lbwwndpqra9ahc5s6";
+       version = "2.9.1";
+       sha256 = "0cic0f689a6n2si43ijyvkp174y1yfppqv64dicwxz6rm2jhz70d";
        buildDepends = [ base ListLike time uu-interleaved ];
        homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
-       description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, idiomatic parser combinators";
+       description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -122440,6 +125979,7 @@ self: {
        buildDepends = [ base ];
        description = "Haskell 98 parser combintors for INFOB3TC at Utrecht University";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagc" = callPackage
@@ -122503,8 +126043,10 @@ self: {
        version = "0.1.1.0";
        sha256 = "16sf4kbjgxsi3amdpr3nqg15f2gmjvf3w2wh6pn72zhjqsbnfnmz";
        buildDepends = [ base diagrams-lib SVGFonts ];
+       jailbreak = true;
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagd" = callPackage
@@ -122598,8 +126140,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "uulib";
-       version = "0.9.19";
-       sha256 = "1q7mnin2prjnxgjln60s97163191dl1kfaqjq01qxfax845c0qbn";
+       version = "0.9.20";
+       sha256 = "1qz73rjxywc9mf54d2j4xv9m7d15gnfmi1c1fj3yklx059xlvfz2";
        buildDepends = [ base ghc-prim ];
        homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
@@ -122703,6 +126245,7 @@ self: {
        homepage = "http://thoughtpolice.github.com/vacuum";
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { ghc-paths = null;};
 
   "vacuum-cairo" = callPackage
@@ -122765,6 +126308,7 @@ self: {
        jailbreak = true;
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vado" = callPackage
@@ -122773,8 +126317,8 @@ self: {
      }:
      mkDerivation {
        pname = "vado";
-       version = "0.0.3";
-       sha256 = "1s6fb19p3lc6g13ryh7bmxciv62v8m0ihvzrymsj0nn6jghiys5f";
+       version = "0.0.4";
+       sha256 = "0ndhknsqrb0vg5gba2q6dala16m7vbc8x4dga28q3ys0f14h1m6m";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ attoparsec base directory filepath process text ];
@@ -122868,6 +126412,7 @@ self: {
        homepage = "https://github.com/mavenraven/validations";
        description = "A nice way to define field validations in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "value-supply" = callPackage
@@ -122899,7 +126444,6 @@ self: {
        homepage = "https://github.com/benzrf/vampire";
        description = "Analyze and visualize expression trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "var" = callPackage
@@ -123004,6 +126548,7 @@ self: {
        ];
        description = "Common types and instances for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcache" = callPackage
@@ -123012,8 +126557,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcache";
-       version = "0.2.4";
-       sha256 = "1dfdfcvq6554dxda1h2mnl1ggm39k8w779836v3dwpi0wnq4x249";
+       version = "0.2.5";
+       sha256 = "0jinysgn4rzh0b4a97wjac6md74vafb7avzprr6yddksmkylkayl";
        buildDepends = [
          base bytestring containers direct-murmur-hash easy-file filelock
          lmdb random stm transformers
@@ -123047,6 +126592,7 @@ self: {
        homepage = "http://github.com/mboes/vCard";
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcd" = callPackage
@@ -123078,8 +126624,8 @@ self: {
      }:
      mkDerivation {
        pname = "vcsgui";
-       version = "0.1.1.0";
-       sha256 = "1sjkg1ncmpymv9m5ag1f4ia4pdak05bgb03d28jd84p24qvshqyk";
+       version = "0.1.2.0";
+       sha256 = "0wqvd57n74fps2cybn970fgag2bxz8y8wwx4hb3dz7znpqzlp7y8";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -123091,17 +126637,18 @@ self: {
      }) {};
 
   "vcswrapper" = callPackage
-    ({ mkDerivation, base, directory, filepath, hxt, mtl, parsec
-     , process, split, text
+    ({ mkDerivation, base, containers, directory, filepath, hxt, mtl
+     , parsec, process, split, text
      }:
      mkDerivation {
        pname = "vcswrapper";
-       version = "0.1.1";
-       sha256 = "056gdgmyprvbz61gfffkpwfyh4m7f9fnglk69jp4xh4jfx1wr7ni";
+       version = "0.1.2";
+       sha256 = "1rbmlfg6kf7b1njfwnd85shlhw8b65j53zsrcn250baj8z0x0p9s";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
-         base directory filepath hxt mtl parsec process split text
+         base containers directory filepath hxt mtl parsec process split
+         text
        ];
        homepage = "https://github.com/forste/haskellVCSWrapper";
        description = "Wrapper for source code management systems";
@@ -123145,6 +126692,7 @@ self: {
        homepage = "http://github.com/cpdurham/vect-floating-accelerate";
        description = "Accelerate instances for vect-floating types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vect-opengl" = callPackage
@@ -123166,6 +126714,7 @@ self: {
        version = "0.10.9.3";
        sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
        buildDepends = [ base deepseq ghc-prim primitive ];
+       jailbreak = true;
        homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -123280,6 +126829,7 @@ self: {
        homepage = "https://github.com/scvalex/vector-clock";
        description = "Vector clocks for versioning message flows";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-conduit" = callPackage
@@ -123311,6 +126861,7 @@ self: {
        sha256 = "0rfvr86yiwp4wb9qjggbbacmgkfj6xrk6h7xb4xmhmk88slvifm0";
        buildDepends = [ base primitive storable-complex vector ];
        extraLibraries = [ fftw3 ];
+       jailbreak = true;
        homepage = "http://hackage.haskell.org/package/vector-fftw";
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -123370,6 +126921,7 @@ self: {
        homepage = "http://github.com/kreuzschlitzschraubenzieher/vector-instances-collections";
        description = "Instances of the Data.Collections classes for Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-mmap" = callPackage
@@ -123449,6 +127001,7 @@ self: {
        ];
        description = "Instances of vector-space classes for OpenGL types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space-points" = callPackage
@@ -123621,18 +127174,18 @@ self: {
     ({ mkDerivation, base, bytestring, c2hs, containers, data-default
      , deepseq, directory, filepath, hspec, hspec-expectations, libmpd
      , mtl, ncurses, old-locale, process, QuickCheck, template-haskell
-     , time, transformers, utf8-string, wcwidth
+     , time, time-locale-compat, transformers, utf8-string, wcwidth
      }:
      mkDerivation {
        pname = "vimus";
-       version = "0.2.0";
-       sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h";
+       version = "0.2.1";
+       sha256 = "0j4j4rsngp76pvssg6kisqqwr9d95fcmxp21yq4483vvc1cv78g2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          base bytestring containers data-default deepseq directory filepath
-         libmpd mtl old-locale process template-haskell time utf8-string
-         wcwidth
+         libmpd mtl old-locale process template-haskell time
+         time-locale-compat utf8-string wcwidth
        ];
        testDepends = [
          base data-default hspec hspec-expectations mtl QuickCheck
@@ -123642,6 +127195,7 @@ self: {
        extraLibraries = [ ncurses ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
@@ -123675,6 +127229,7 @@ self: {
        jailbreak = true;
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-gl" = callPackage
@@ -123696,6 +127251,7 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-json" = callPackage
@@ -123726,6 +127282,7 @@ self: {
        homepage = "http://hub.darcs.net/mjm/vinyl-utils";
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "virthualenv" = callPackage
@@ -123791,7 +127348,6 @@ self: {
        homepage = "http://github.com/zsol/visual-graphrewrite/";
        description = "Visualize the graph-rewrite steps of a Haskell program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "visual-prof" = callPackage
@@ -123848,6 +127404,7 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vk-posix-pty" = callPackage
@@ -123886,6 +127443,7 @@ self: {
        buildDepends = [ base binary-strict bytestring mtl utf8-string ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -123909,6 +127467,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff";
        buildDepends = [ base bytestring process utf8-string ];
+       jailbreak = true;
        homepage = "https://github.com/sethfowler/hslibvoyeur";
        description = "Haskell bindings for libvoyeur";
        license = stdenv.lib.licenses.bsd3;
@@ -124015,19 +127574,18 @@ self: {
 
   "vty-ui" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, data-default
-     , directory, filepath, mtl, old-locale, QuickCheck, random
-     , regex-base, stm, text, time, unix, vector, vty
+     , directory, filepath, mtl, QuickCheck, random, regex-base, stm
+     , text, time, unix, vector, vty
      }:
      mkDerivation {
        pname = "vty-ui";
-       version = "1.8";
-       sha256 = "08jrcwml5g74mp4wy7kqp9jd5mfbxl04517v5354jiwn4dc77azm";
+       version = "1.9";
+       sha256 = "1mvs2224slnkswcag6knnj9ydkfgvw6nhaiy71bijjd2wwln4fq2";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base bytestring containers data-default directory filepath
-         mtl old-locale QuickCheck random regex-base stm text time unix
-         vector vty
+         mtl QuickCheck random regex-base stm text time unix vector vty
        ];
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
@@ -124144,16 +127702,16 @@ self: {
 
   "wai-cors" = callPackage
     ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring
-     , case-insensitive, charset, errors, http-types, parsers, resourcet
-     , transformers, wai
+     , case-insensitive, charset, http-types, mtl, parsers, transformers
+     , wai
      }:
      mkDerivation {
        pname = "wai-cors";
-       version = "0.2.1";
-       sha256 = "1bdnlrpq8s8rb3ybnv8rmmvid5j38gsps65dhlpys32ljhfzzklz";
+       version = "0.2.2";
+       sha256 = "174ld61b2hl890m591qfwclnb1jdssi9minksvhp34dmawnfwgvc";
        buildDepends = [
          attoparsec base base-unicode-symbols bytestring case-insensitive
-         charset errors http-types parsers resourcet transformers wai
+         charset http-types mtl parsers transformers wai
        ];
        homepage = "https://github.com/alephcloud/wai-cors";
        description = "CORS for WAI";
@@ -124175,6 +127733,7 @@ self: {
        homepage = "https://github.com/singpolyma/wai-digestive-functors";
        description = "Helpers to bind digestive-functors onto wai requests";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-dispatch" = callPackage
@@ -124208,18 +127767,18 @@ self: {
      , data-default-class, deepseq, directory, fast-logger, hspec
      , http-types, HUnit, lifted-base, network, old-locale, resourcet
      , streaming-commons, stringsearch, text, time, transformers, unix
-     , unix-compat, void, wai, wai-logger, word8, zlib
+     , unix-compat, vault, void, wai, wai-logger, word8, zlib
      }:
      mkDerivation {
        pname = "wai-extra";
-       version = "3.0.6.1";
-       sha256 = "15wxr9y1f87q3wh5zkrv7d7w2mb9s4jd6l6cxwj9cgk0yw2nbi5f";
+       version = "3.0.7.1";
+       sha256 = "1jfpqqnavk2v7wn4fhpc1fish67wfyicmsl84l234v47wsbz9r13";
        buildDepends = [
          ansi-terminal base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
          directory fast-logger http-types lifted-base network old-locale
          resourcet streaming-commons stringsearch text time transformers
-         unix unix-compat void wai wai-logger word8
+         unix unix-compat vault void wai wai-logger word8
        ];
        testDepends = [
          base blaze-builder bytestring cookie fast-logger hspec http-types
@@ -124244,7 +127803,6 @@ self: {
        ];
        description = "Run CGI apps on WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-graceful" = callPackage
@@ -124397,7 +127955,6 @@ self: {
        homepage = "https://github.com/raptros/wai-hmac-auth";
        description = "hmac authentication tools for WAI apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-lens" = callPackage
@@ -124628,6 +128185,7 @@ self: {
        ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -124648,6 +128206,7 @@ self: {
        homepage = "https://github.com/taktoa/wai-middleware-preprocessor";
        description = "WAI middleware for preprocessing static files";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-route" = callPackage
@@ -124674,16 +128233,17 @@ self: {
      }) {};
 
   "wai-middleware-static" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , http-types, mtl, text, wai
+    ({ mkDerivation, base, base16-bytestring, bytestring, containers
+     , cryptohash, directory, expiring-cache-map, filepath, http-types
+     , mtl, old-locale, text, time, wai
      }:
      mkDerivation {
        pname = "wai-middleware-static";
-       version = "0.6.0.1";
-       sha256 = "1ylf2nm535d3dw0ksa9dfz1b4b78mqzkdrpdfd5pxswcqbgs266d";
+       version = "0.7.0.1";
+       sha256 = "0kvs3bv5yyg1j7zghl91gi12g7k20vwbbk0ag9clmq3zn33i46iw";
        buildDepends = [
-         base bytestring containers directory filepath http-types mtl text
-         wai
+         base base16-bytestring bytestring containers cryptohash directory
+         expiring-cache-map filepath http-types mtl old-locale text time wai
        ];
        homepage = "https://github.com/scotty-web/wai-middleware-static";
        description = "WAI middleware that serves requests to static files";
@@ -124704,9 +128264,11 @@ self: {
          expiring-cache-map filepath http-types mtl old-locale text time
          unix wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/agrafix/wai-middleware-static";
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-throttle" = callPackage
@@ -124728,6 +128290,7 @@ self: {
        ];
        description = "WAI Middleware for Request Throttling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-predicates" = callPackage
@@ -124751,6 +128314,7 @@ self: {
        homepage = "https://github.com/twittner/wai-predicates/";
        description = "WAI request predicates";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-responsible" = callPackage
@@ -124760,6 +128324,7 @@ self: {
        version = "0.0.0.0";
        sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va";
        buildDepends = [ base bytestring http-types wai ];
+       jailbreak = true;
        homepage = "https://github.com/pharpend/wai-responsible";
        description = "Response interface for WAI";
        license = stdenv.lib.licenses.bsd3;
@@ -124838,6 +128403,7 @@ self: {
        homepage = "https://github.com/twittner/wai-routing/";
        description = "Declarative routing for WAI";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session" = callPackage
@@ -124855,6 +128421,7 @@ self: {
        homepage = "https://github.com/singpolyma/wai-session";
        description = "Flexible session middleware for WAI";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-clientsession" = callPackage
@@ -124872,6 +128439,7 @@ self: {
        homepage = "https://github.com/singpolyma/wai-session-clientsession";
        description = "Session store based on clientsession";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-tokyocabinet" = callPackage
@@ -125048,8 +128616,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.0.11";
-       sha256 = "05sm9l8fjf18vl3b7qk3lpz2fd4knld0a90fh8smfxdvxap3fqv3";
+       version = "3.0.12.1";
+       sha256 = "0dahx5g6dclpgrapwvplz4di6yjhy7i3ja089nlyn46lx15pzp6b";
        buildDepends = [
          array auto-update base blaze-builder bytestring case-insensitive
          ghc-prim hashable http-date http-types iproute network
@@ -125149,8 +128717,10 @@ self: {
        version = "0.2.2.1";
        sha256 = "06b93cqn6rbl6jbjyawzqmrx80h0dbcks7ia6l3wzdqpic8yjj6v";
        buildDepends = [ base mtl time ];
+       jailbreak = true;
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watcher" = callPackage
@@ -125323,6 +128893,7 @@ self: {
        homepage = "http://github.com/snoyberg/web-encodings/tree/master";
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-fpco" = callPackage
@@ -125379,6 +128950,7 @@ self: {
        homepage = "http://hub.darcs.net/ertes/web-page";
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-plugins" = callPackage
@@ -125391,6 +128963,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "dynamic plugin system for web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes" = callPackage
@@ -125556,27 +129129,24 @@ self: {
   "webcrank" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , case-insensitive, either, exceptions, http-date, http-media
-     , http-types, lens, mtl, network-uri, QuickCheck, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, text, transformers
-     , unordered-containers, utf8-string
+     , http-types, lens, mtl, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, unordered-containers
+     , utf8-string
      }:
      mkDerivation {
        pname = "webcrank";
-       version = "0.1";
-       revision = "1";
-       sha256 = "00jnarj4s9jsb7g03jazabpvnnscz7385yslyvvj9z2qryxwv9xk";
-       editedCabalFile = "f4521a187e8f4fca8752ab6e53c38df6cafbdc2002397c521928ad69765c1864";
+       version = "0.2.0.1";
+       sha256 = "0l6mc3gyflb0lqmcs5x0nc3r5szyf4ig6y268f7crp74h05mvnlr";
        buildDepends = [
          attoparsec base blaze-builder bytestring case-insensitive either
-         exceptions http-date http-media http-types lens mtl network-uri
-         semigroups text transformers unordered-containers utf8-string
+         exceptions http-date http-media http-types lens mtl semigroups text
+         transformers unordered-containers utf8-string
        ];
        testDepends = [
-         attoparsec base bytestring case-insensitive either exceptions
-         http-date http-media http-types lens mtl QuickCheck tasty
-         tasty-hunit tasty-quickcheck unordered-containers
+         attoparsec base bytestring case-insensitive exceptions http-date
+         http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck
+         unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/webcrank/webcrank.hs";
        description = "Webmachine inspired toolkit for building http applications and services";
        license = stdenv.lib.licenses.bsd3;
@@ -125606,8 +129176,8 @@ self: {
      }:
      mkDerivation {
        pname = "webcrank-wai";
-       version = "0.1";
-       sha256 = "16w5hw517mmh46jxv7ks9lrpzaahkyal6a26f99118kzh6w0447b";
+       version = "0.2";
+       sha256 = "02d6hsgx70mcghz1xrszf1jnl62alki3ch7wacp35s8jz79xrccw";
        buildDepends = [
          base bytestring exceptions lens mtl unix-compat
          unordered-containers wai wai-lens webcrank webcrank-dispatch
@@ -125615,6 +129185,7 @@ self: {
        homepage = "https://github.com/webcrank/webcrank-wai";
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver" = callPackage
@@ -125640,6 +129211,7 @@ self: {
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-angular" = callPackage
@@ -125662,6 +129234,7 @@ self: {
        homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver-snoy" = callPackage
@@ -125801,8 +129374,8 @@ self: {
      }:
      mkDerivation {
        pname = "webpage";
-       version = "0.0.3";
-       sha256 = "0j57jv9jh7kz27a5wl77ajp99mxj0747x7hhninw35qzgf88vizm";
+       version = "0.0.3.1";
+       sha256 = "1s9q44wvkc60g1117c3c4klf9pc92x7rpgvb7pwyhbbkvshmnirj";
        buildDepends = [
          base blaze-html data-default hastache lucid text
        ];
@@ -125825,6 +129398,7 @@ self: {
        ];
        description = "HTTP server library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websnap" = callPackage
@@ -125933,8 +129507,10 @@ self: {
          array base colour containers diagrams-cairo diagrams-lib
          MonadRandom strict
        ];
+       jailbreak = true;
        description = "Wedged postcard generator";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -126059,6 +129635,7 @@ self: {
        homepage = "http://neugierig.org/software/darcs/whim/";
        description = "A Haskell window manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "whiskers" = callPackage
@@ -126085,6 +129662,7 @@ self: {
        homepage = "https://github.com/haroldl/whitespace-nd";
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "whois" = callPackage
@@ -126191,8 +129769,8 @@ self: {
      }:
      mkDerivation {
        pname = "wiring";
-       version = "0.2.1";
-       sha256 = "1vbvv6wkizmh6wrzfk968vdsmp9iwrkpl3dgw6465s8z90ncclj5";
+       version = "0.3.0";
+       sha256 = "0c7xg6xq5bmb0qc2f9509sx5yrnngp4q5v1bgxl636qp9mhck68x";
        buildDepends = [ base mtl template-haskell transformers ];
        testDepends = [
          base hspec mtl QuickCheck template-haskell transformers
@@ -126208,8 +129786,8 @@ self: {
      }:
      mkDerivation {
        pname = "witherable";
-       version = "0.1.2.2";
-       sha256 = "18vhaardjzxbs2if9va4fadr47cjkbv84b2lvpszarrvfgibvxb7";
+       version = "0.1.2.3";
+       sha256 = "1281npwsmj9vzw3l5bb8pzywgm5dk4y723zsq5dk0b0ri58m3hcz";
        buildDepends = [
          base containers hashable transformers unordered-containers vector
        ];
@@ -126263,10 +129841,9 @@ self: {
     ({ mkDerivation, base, lens, linear, parsec, parsec-numbers }:
      mkDerivation {
        pname = "wkt";
-       version = "0.2.4";
-       sha256 = "0xbzk4p5jazdkrlvj67xzy9vphl6rw90jp8cv4hr8p63v7ja2kfq";
+       version = "0.2.5";
+       sha256 = "02r453wx1kv50lw0hx4nvzzv5wjfsy16gyjqphc25aq45rl5hr8g";
        buildDepends = [ base lens linear parsec parsec-numbers ];
-       jailbreak = true;
        homepage = "http://github.com/bgamari/wkt";
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
        license = stdenv.lib.licenses.bsd3;
@@ -126276,10 +129853,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "wl-pprint";
-       version = "1.1";
-       revision = "1";
-       sha256 = "16kp3fkh0x9kgzk6fdqrm8m0v7b5cgbv0m3x63ybbp5vxbhand06";
-       editedCabalFile = "faf1b4364a3b77cf970f7d966be6dea925f6029625e12db730435230527c6aed";
+       version = "1.2";
+       sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r";
        buildDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
@@ -126652,6 +130227,45 @@ self: {
        homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wreq-sb" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec
+     , authenticate-oauth, base, base16-bytestring, base64-bytestring
+     , byteable, bytestring, case-insensitive, containers, cryptohash
+     , directory, doctest, exceptions, filepath, ghc-prim, hashable
+     , http-client, http-client-tls, http-types, HUnit, lens, lens-aeson
+     , mime-types, network-info, old-locale, psqueues, QuickCheck
+     , snap-core, snap-server, template-haskell, temporary
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, transformers, unix-compat, unordered-containers, uuid
+     , vector
+     }:
+     mkDerivation {
+       pname = "wreq-sb";
+       version = "0.4.0.0";
+       sha256 = "0m0vjykj1wqv07xxy2r7xz68syx5r3chni4x399f5fwn6shw1jfz";
+       isLibrary = true;
+       isExecutable = true;
+       buildDepends = [
+         aeson attoparsec authenticate-oauth base base16-bytestring byteable
+         bytestring case-insensitive containers cryptohash exceptions
+         ghc-prim hashable http-client http-client-tls http-types lens
+         lens-aeson mime-types old-locale psqueues template-haskell text
+         time unordered-containers
+       ];
+       testDepends = [
+         aeson aeson-pretty base base64-bytestring bytestring
+         case-insensitive containers directory doctest filepath hashable
+         http-client http-types HUnit lens lens-aeson network-info
+         QuickCheck snap-core snap-server temporary test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         transformers unix-compat uuid vector
+       ];
+       homepage = "http://www.serpentine.com/wreq";
+       description = "An easy-to-use HTTP client library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "wright" = callPackage
@@ -126688,6 +130302,7 @@ self: {
        jailbreak = true;
        description = "A small tool to list, add and remove webseeds from a torrent file";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wtk" = callPackage
@@ -126745,6 +130360,7 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-drawing" = callPackage
@@ -126800,6 +130416,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "wuss" = callPackage
+    ({ mkDerivation, base, bytestring, connection, doctest, network
+     , websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.0.0";
+       sha256 = "1nv8mkfbgfnlmni0rzlzq7ir27ya3lnhkksfbkywjkbwz2k3yykc";
+       buildDepends = [ base bytestring connection network websockets ];
+       testDepends = [ base doctest ];
+       homepage = "http://taylor.fausak.me/wuss/";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, wxcore }:
      mkDerivation {
@@ -126810,6 +130442,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxAsteroids" = callPackage
@@ -126892,6 +130525,7 @@ self: {
        buildDepends = [
          base containers directory filepath parsec process strict time
        ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "helper tool for building wxHaskell";
        license = stdenv.lib.licenses.bsd3;
@@ -127318,6 +130952,7 @@ self: {
        homepage = "https://github.com/aslatter/xhb";
        description = "X Haskell Bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhb-atom-cache" = callPackage
@@ -127335,6 +130970,7 @@ self: {
        homepage = "http://github.com/jotrk/xhb-atom-cache/";
        description = "Atom cache for XHB";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhb-ewmh" = callPackage
@@ -127353,6 +130989,7 @@ self: {
        homepage = "http://github.com/jotrk/xhb-ewmh/";
        description = "EWMH utilities for XHB";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhtml_3000_2_1" = callPackage
@@ -127505,6 +131142,7 @@ self: {
        testDepends = [
          base blaze-markup bytestring old-locale text time zip-archive
        ];
+       jailbreak = true;
        description = "Streaming Excel file generation and parsing";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127613,8 +131251,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-conduit";
-       version = "1.2.3.3";
-       sha256 = "0y5k2l6a4vl5gl8ch8gwjqyg0v2qkiwrixf0yb0ik71z8zb9ki8b";
+       version = "1.2.4";
+       sha256 = "1pb9iy95ajy0dxw2f1jh1ymdl4fjlhyan59hbmnj09g1q1h51dpq";
        buildDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          conduit conduit-extra containers data-default deepseq monad-control
@@ -127698,6 +131336,7 @@ self: {
        version = "0.4.0.0";
        sha256 = "02380x94zvm736lj2j02926xn8asc6bq4hbhm3nshh9iw8x4phwq";
        buildDepends = [ base mtl safe transformers xml ];
+       jailbreak = true;
        homepage = "https://github.com/holmisen/xml-extractors";
        description = "Wrapper over xml to extract data from parsed xml";
        license = stdenv.lib.licenses.bsd3;
@@ -128068,8 +131707,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmobar";
-       version = "0.23";
-       sha256 = "0nl3md4d8mzdch2i79ax09brwvm1d6b3rfxy52zbg4z05iv6grdv";
+       version = "0.23.1";
+       sha256 = "0yjnymiw518pjcks0kvpbj73kf0dvl1aj3a40qgmdf5xff1mac9v";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -128128,6 +131767,7 @@ self: {
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-contrib" = callPackage
@@ -128218,17 +131858,18 @@ self: {
      }) {};
 
   "xmonad-extras" = callPackage
-    ({ mkDerivation, base, containers, directory, mtl, old-locale
-     , old-time, parsec, process, random, regex-posix, split, unix, X11
-     , xmonad, xmonad-contrib
+    ({ mkDerivation, base, containers, directory, hint, mtl, network
+     , old-locale, old-time, parsec, process, random, regex-posix, split
+     , unix, X11, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "xmonad-extras";
-       version = "0.12";
-       sha256 = "1gyj9j6x21rvs6kg6g74wr0jdd36c5ml63a670456fhjr96s8y0g";
+       version = "0.12.1";
+       sha256 = "14g8i3rvfiqp6mq1xhw8f9q0svcfz5nhlsgbz20zlk1az7673z55";
        buildDepends = [
-         base containers directory mtl old-locale old-time parsec process
-         random regex-posix split unix X11 xmonad xmonad-contrib
+         base containers directory hint mtl network old-locale old-time
+         parsec process random regex-posix split unix X11 xmonad
+         xmonad-contrib
        ];
        configureFlags = [
          "-f-with_hlist" "-fwith_parsec" "-fwith_split"
@@ -128248,6 +131889,7 @@ self: {
        homepage = "http://github.com/supki/xmonad-screenshot";
        description = "Workspaces screenshooting utility for XMonad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-utils" = callPackage
@@ -128321,6 +131963,7 @@ self: {
        jailbreak = true;
        description = "text builder for xournal file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-convert" = callPackage
@@ -128363,6 +132006,7 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-render" = callPackage
@@ -128396,6 +132040,7 @@ self: {
        ];
        description = "Data types for programs for xournal file format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xsact" = callPackage
@@ -128490,6 +132135,7 @@ self: {
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xtest" = callPackage
@@ -128553,6 +132199,7 @@ self: {
        jailbreak = true;
        description = "#plaimi's all-encompassing bot";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yabi" = callPackage
@@ -128608,6 +132255,7 @@ self: {
        homepage = "http://github.com/snoyberg/yackage";
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yahoo-finance-conduit" = callPackage
@@ -128624,6 +132272,7 @@ self: {
        jailbreak = true;
        description = "Streaming aproach to the yahoo finance api";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yahoo-web-search" = callPackage
@@ -128703,8 +132352,8 @@ self: {
      }:
      mkDerivation {
        pname = "yaml";
-       version = "0.8.10.1";
-       sha256 = "1a8v8digg6mcc4gx4kgfg8wzgj18wdf40wv1b7n72dg1c8kr2xz9";
+       version = "0.8.11";
+       sha256 = "18ara96wca3gnk436i8rarb5smv80aa3ww4lnlrd5w01rp0p171v";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
@@ -128755,18 +132404,16 @@ self: {
 
   "yaml-light-lens" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, containers
-     , doctest, lens, transformers-compat, yaml-light
+     , doctest, lens, yaml-light
      }:
      mkDerivation {
        pname = "yaml-light-lens";
        version = "0.3.1.9";
        sha256 = "0gxwa792g2nbgm2j6gl478qq5vgr06z6zzbbxranvh5fq7pq6al5";
        buildDepends = [
-         base bytestring bytestring-lexing containers lens
-         transformers-compat yaml-light
+         base bytestring bytestring-lexing containers lens yaml-light
        ];
        testDepends = [ base doctest ];
-       jailbreak = true;
        description = "Lens interface to yaml-light";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128788,6 +132435,7 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Simple library for network (HTTP REST-like) YAML RPC";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc-scotty" = callPackage
@@ -128854,8 +132502,10 @@ self: {
        isLibrary = true;
        isExecutable = true;
        buildDepends = [ base blank-canvas stm text time Yampa ];
+       jailbreak = true;
        description = "blank-canvas frontend for yampa";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -128897,6 +132547,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        buildDepends = [ base gloss random Yampa ];
+       jailbreak = true;
        homepage = "https://github.com/ksaveljev/yampa-2048";
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
@@ -128914,6 +132565,7 @@ self: {
        homepage = "https://github.com/esmolanka/yaop";
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yap" = callPackage
@@ -128934,10 +132586,8 @@ self: {
      }:
      mkDerivation {
        pname = "yarr";
-       version = "1.3.3.3";
-       revision = "1";
-       sha256 = "09nr1k0yhm1sh4g741876sf4vi0mgrh7gdq9cbw33hxn6168h547";
-       editedCabalFile = "290dde1a67c1de78074c60796f5326cf01668fb109345cd100ff1ac5a5663687";
+       version = "1.4.0.1";
+       sha256 = "0kk2yhhh6cjbav30sh68fg880kgdpks018c9gmn4gw98621nc6al";
        buildDepends = [
          base deepseq fixed-vector ghc-prim missing-foreign primitive
          template-haskell
@@ -128945,6 +132595,7 @@ self: {
        jailbreak = true;
        description = "Yet another array library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yarr-image-io" = callPackage
@@ -128955,8 +132606,10 @@ self: {
        sha256 = "1wmmzw62wb5hz4qavy51wb3wwqn07zd6iiwsrzcck1jdxwy0p81x";
        buildDepends = [ base yarr ];
        extraLibraries = [ libdevil ];
+       jailbreak = true;
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) libdevil;};
 
   "yavie" = callPackage
@@ -128975,6 +132628,7 @@ self: {
        ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ycextra" = callPackage
@@ -129059,8 +132713,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod";
-       version = "1.4.1.4";
-       sha256 = "1av6s5nanq5y9fqlzq2yq95989gg1fyqlpzg6y5pl4dcc45srm1x";
+       version = "1.4.1.5";
+       sha256 = "0sr9z3lxnwn5bdfwja97jsya3j0y0i8z5j6mph11bjgjdhv0s5m1";
        buildDepends = [
          aeson base blaze-html blaze-markup bytestring conduit-extra
          data-default directory fast-logger monad-control monad-logger safe
@@ -129090,6 +132744,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-angular-ui" = callPackage
+    ({ mkDerivation, base, blaze-html, containers, directory, hjsmin
+     , mtl, resourcet, shakespeare, template-haskell, text, transformers
+     , yesod, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-angular-ui";
+       version = "0.1.0.1";
+       sha256 = "1kj2lbg57sp4bsl4ri3p73gr5a2k17lx7gf01ay7x0960gj5ql92";
+       buildDepends = [
+         base blaze-html containers directory hjsmin mtl resourcet
+         shakespeare template-haskell text transformers yesod yesod-core
+       ];
+       homepage = "https://github.com/tolysz/yesod-angular-ui";
+       description = "Angular Helpers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-auth" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
@@ -129103,8 +132776,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth";
-       version = "1.4.4";
-       sha256 = "079ny0jdg68kxdp117y1av0d09fhpywbb8v9iyl867vswpb38b08";
+       version = "1.4.5";
+       sha256 = "0agddsicjqcvraa3lcbxwwnk4mapjjd1y4pdp5kg111kaww6nkdn";
        buildDepends = [
          aeson authenticate base base16-bytestring base64-bytestring binary
          blaze-builder blaze-html blaze-markup byteable bytestring conduit
@@ -129249,9 +132922,11 @@ self: {
          authenticate-kerberos base bytestring shakespeare text transformers
          yesod-auth yesod-core yesod-form
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/";
        description = "Kerberos Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-ldap" = callPackage
@@ -129288,24 +132963,25 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "OAuth Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-oauth2" = callPackage
     ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2
-     , http-conduit, http-types, lifted-base, network-uri, text
-     , transformers, uuid, yesod-auth, yesod-core, yesod-form
+     , http-conduit, http-types, lifted-base, network-uri, random, text
+     , transformers, yesod-auth, yesod-core, yesod-form
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.0.12";
-       sha256 = "1n70cnab99ldx4pd9yi7v6lvc7f1psnicmvq7sm8am8p9yhf9bs0";
+       version = "0.1.1";
+       sha256 = "13z3h1x9n414vi7k2aqpwcxr7839lljwcrpxybazlf82zkwl4kj2";
        buildDepends = [
          aeson authenticate base bytestring hoauth2 http-conduit http-types
-         lifted-base network-uri text transformers uuid yesod-auth
+         lifted-base network-uri random text transformers yesod-auth
          yesod-core yesod-form
        ];
-       homepage = "http://github.com/scan/yesod-auth-oauth2";
-       description = "Library to authenticate with OAuth 2.0 for Yesod web applications.";
+       homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
+       description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -129377,8 +133053,10 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.7";
-       sha256 = "1xi0i9j8gmgg920wzv363yq586kxcrmbf7br5ykxj30adj5w0cvp";
+       version = "1.4.7.1";
+       revision = "1";
+       sha256 = "080jamya9scyybls3j230rv1mpmxhvskaxd72wxxm5slv8kc6p27";
+       editedCabalFile = "a4b2436fca046b83a3e88fc9b923d3d852a87ebd392d9d0704047e01b8a0a7be";
        isLibrary = false;
        isExecutable = true;
        buildDepends = [
@@ -129520,18 +133198,18 @@ self: {
 
   "yesod-dsl" = callPackage
     ({ mkDerivation, alex, array, base, Cabal, containers, directory
-     , filepath, happy, MissingH, mtl, shakespeare-text, strict, syb
-     , text, transformers
+     , filepath, happy, MissingH, mtl, shakespeare, shakespeare-text
+     , strict, syb, text, transformers, uniplate
      }:
      mkDerivation {
        pname = "yesod-dsl";
-       version = "0.1.1.22";
-       sha256 = "1rfynal7l065dsmxx9zfqpjnl92ri4qj1ff62xp1482my72pin57";
+       version = "0.1.1.23";
+       sha256 = "01rafa5klq1qjrl5w7ii4h27kiqhnacn95x7f2f7b1gxxp26psrx";
        isLibrary = true;
        isExecutable = true;
        buildDepends = [
          array base Cabal containers directory filepath MissingH mtl
-         shakespeare-text strict syb text transformers
+         shakespeare shakespeare-text strict syb text transformers uniplate
        ];
        buildTools = [ alex happy ];
        jailbreak = true;
@@ -129602,6 +133280,7 @@ self: {
        homepage = "https://github.com/fpco/yesod-fay";
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-fb" = callPackage
@@ -129679,6 +133358,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-gitrev" = callPackage
+    ({ mkDerivation, aeson, base, gitrev, template-haskell, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-gitrev";
+       version = "0.1.0.0";
+       sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih";
+       buildDepends = [ aeson base gitrev template-haskell yesod-core ];
+       description = "A subsite for displaying git information";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-goodies" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, directory, HTTP
      , old-locale, pandoc, pureMD5, text, time, yesod, yesod-form
@@ -129721,6 +133412,7 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links";
        description = "A typeclass which simplifies creating link widgets throughout your site";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-mangopay" = callPackage
@@ -129983,6 +133675,7 @@ self: {
        homepage = "https://github.com/mpietrzak/yesod-purescript";
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -130273,6 +133966,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-transloadit" = callPackage
+    ({ mkDerivation, aeson, base, byteable, bytestring, cryptohash
+     , hspec, lens, lens-aeson, old-locale, shakespeare, text, time
+     , transformers, yesod, yesod-core, yesod-form, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-transloadit";
+       version = "0.1.1.0";
+       sha256 = "0m83hy3j2sg060jv44pcgr99avzg0laq6ydl37pckvyqz27rbw7f";
+       buildDepends = [
+         aeson base byteable bytestring cryptohash lens lens-aeson
+         old-locale shakespeare text time transformers yesod yesod-core
+         yesod-form
+       ];
+       testDepends = [
+         base hspec old-locale text time yesod yesod-form yesod-test
+       ];
+       description = "Transloadit support for Yesod";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-vend" = callPackage
     ({ mkDerivation, base, blaze-html, hamlet, monad-logger, persistent
      , persistent-sqlite, resourcet, text, yesod, yesod-form
@@ -130311,6 +134025,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-websockets-extra" = callPackage
+    ({ mkDerivation, base, enclosed-exceptions, transformers
+     , websockets, yesod-websockets
+     }:
+     mkDerivation {
+       pname = "yesod-websockets-extra";
+       version = "0.1.0.0";
+       sha256 = "042gl7w8cipjhqfl5h933b0p3j9d5m58v91p1rylz4mjgvhxpk5g";
+       buildDepends = [
+         base enclosed-exceptions transformers websockets yesod-websockets
+       ];
+       description = "Extension to yesod-websockets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-worker" = callPackage
     ({ mkDerivation, base, containers, fast-logger, monad-control
      , monad-logger, persistent, resourcet, stm, template-haskell
@@ -130334,23 +134063,30 @@ self: {
 
   "yet-another-logger" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base
-     , base-unicode-symbols, bytestring, case-insensitive
+     , base-unicode-symbols, bytestring, Cabal, case-insensitive, clock
      , configuration-tools, deepseq, either, enclosed-exceptions, lens
      , lifted-base, monad-control, mtl, optparse-applicative, stm
-     , stm-chans, text, trace, transformers, transformers-base
+     , stm-chans, tagged, tasty, tasty-hunit, text, time, trace
+     , transformers, transformers-base, void
      }:
      mkDerivation {
        pname = "yet-another-logger";
-       version = "0.1.1.1";
-       sha256 = "0bwslcxb747krvpa4irnych4ddjik51542jf0bkzsyhagmakrjz8";
+       version = "0.2.2";
+       sha256 = "17mh22kkah1wvd5d13qcslqx6k49vlvykrwrqw2vnxkjk4pbp8bb";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [
          aeson ansi-terminal async base base-unicode-symbols bytestring
-         case-insensitive configuration-tools deepseq either
+         Cabal case-insensitive clock configuration-tools deepseq either
          enclosed-exceptions lens lifted-base monad-control mtl
-         optparse-applicative stm stm-chans text trace transformers
-         transformers-base
+         optparse-applicative stm stm-chans text time trace transformers
+         transformers-base void
+       ];
+       testDepends = [
+         async base base-unicode-symbols configuration-tools
+         enclosed-exceptions lens lifted-base tagged tasty tasty-hunit text
+         transformers transformers-base void
        ];
-       jailbreak = true;
        homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
@@ -130400,9 +134136,11 @@ self: {
          tasty-hunit tasty-quickcheck text yi-language yi-rope
        ];
        configureFlags = [ "-fpango" "-fvty" ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Yi";
        description = "The Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-contrib" = callPackage
@@ -130423,6 +134161,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Yi";
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -130453,6 +134192,7 @@ self: {
        homepage = "https://github.com/yi-editor/yi-fuzzy-open";
        description = "Fuzzy open plugin for Yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-gtk" = callPackage
@@ -130503,6 +134243,7 @@ self: {
        homepage = "https://github.com/Fuuzetsu/yi-monokai";
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-rope" = callPackage
@@ -130533,6 +134274,7 @@ self: {
        homepage = "https://github.com/yi-editor/yi-snippet";
        description = "Snippet support for Yi";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-spolsky" = callPackage
@@ -130546,6 +134288,7 @@ self: {
        homepage = "https://github.com/melrief/yi-spolsky";
        description = "Spolsky colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-vty" = callPackage
@@ -130767,6 +134510,7 @@ self: {
        homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yuiGrid" = callPackage
@@ -130778,6 +134522,7 @@ self: {
        buildDepends = [ base ];
        description = "Grids defined by layout hints and implemented on top of Yahoo grids";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yuuko" = callPackage
@@ -130801,12 +134546,16 @@ self: {
      }) {};
 
   "z3" = callPackage
-    ({ mkDerivation, base, containers, gomp, mtl, z3 }:
+    ({ mkDerivation, base, containers, gomp, hspec, mtl, QuickCheck, z3
+     }:
      mkDerivation {
        pname = "z3";
-       version = "0.3.2";
-       sha256 = "1qlklpzpjfbqjgzzkyv2j06ps42brria4px2ir2fvwgdjfzxha4n";
+       version = "4.0.0";
+       sha256 = "1axn3kzy6hsrnq5mcgf2n1sv63q3pqkhznvvhlj13k6jc3h2jzhl";
+       isLibrary = true;
+       isExecutable = true;
        buildDepends = [ base containers mtl ];
+       testDepends = [ base hspec QuickCheck ];
        extraLibraries = [ gomp z3 ];
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
@@ -130830,6 +134579,7 @@ self: {
        homepage = "https://github.com/briansniffen/zampolit";
        description = "A tool for checking how much work is done on group projects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zasni-gerna" = callPackage
@@ -131074,6 +134824,7 @@ self: {
          base bytestring conduit directory filepath hpc HUnit mtl resourcet
          temporary test-framework test-framework-hunit time
        ];
+       jailbreak = true;
        homepage = "https://github.com/tymmym/zip-conduit";
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;
@@ -131089,6 +134840,7 @@ self: {
        homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zipper" = callPackage
@@ -131142,6 +134894,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) zlib;};
 
+  "zlib_0_6_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
+     , tasty-hunit, tasty-quickcheck, zlib
+     }:
+     mkDerivation {
+       pname = "zlib";
+       version = "0.6.1.0";
+       sha256 = "1yc4zfysbj28px064bfwz9n3b3i57c1dsfvkzgfxxmgj1mq65q7n";
+       buildDepends = [ base bytestring ];
+       testDepends = [
+         base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       extraLibraries = [ zlib ];
+       jailbreak = true;
+       description = "Compression and decompression in the gzip and zlib formats";
+       license = stdenv.lib.licenses.bsd3;
+     }) { inherit (pkgs) zlib;};
+
   "zlib-bindings" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
      mkDerivation {
@@ -131374,6 +135144,7 @@ self: {
        buildDepends = [ base monads-tf ];
        description = "Zot language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zsh-battery" = callPackage
@@ -131407,6 +135178,7 @@ self: {
        ];
        description = "Multi-file, colored, filtered log tailer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
 }
diff --git a/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch b/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch
new file mode 100644
index 00000000000..0a0ed65803a
--- /dev/null
+++ b/pkgs/development/haskell-modules/lambdabot-fix-ghc78.patch
@@ -0,0 +1,22 @@
+diff -ru3 lambdabot-5.0.1.old/State/L.hs lambdabot-5.0.1/State/L.hs
+--- lambdabot-5.0.1.old/State/L.hs	2015-04-15 03:26:04.818947594 +0300
++++ lambdabot-5.0.1/State/L.hs	2015-04-15 03:26:20.386099365 +0300
+@@ -34,7 +34,6 @@
+ import Control.Monad
+ import Control.Monad.Cont
+ import Control.Monad.Identity
+-import Control.Monad.Instances
+ import Control.Monad.Reader
+ import Control.Monad.ST.Safe
+ import Control.Monad.State
+diff -ru3 lambdabot-5.0.1.old/State/Pristine.hs lambdabot-5.0.1/State/Pristine.hs
+--- lambdabot-5.0.1.old/State/Pristine.hs	2015-04-15 03:26:04.818947594 +0300
++++ lambdabot-5.0.1/State/Pristine.hs	2015-04-15 03:26:20.386099365 +0300
+@@ -34,7 +34,6 @@
+ import Control.Monad
+ import Control.Monad.Cont
+ import Control.Monad.Identity
+-import Control.Monad.Instances
+ import Control.Monad.Reader
+ import Control.Monad.ST.Safe
+ import Control.Monad.State
diff --git a/pkgs/development/haskell-modules/mueval-nix.patch b/pkgs/development/haskell-modules/mueval-nix.patch
new file mode 100644
index 00000000000..a1f95120a1f
--- /dev/null
+++ b/pkgs/development/haskell-modules/mueval-nix.patch
@@ -0,0 +1,23 @@
+diff --git a/Mueval/Interpreter.hs b/Mueval/Interpreter.hs
+index 29b771f..6360ee3 100644
+--- a/Mueval/Interpreter.hs
++++ b/Mueval/Interpreter.hs
+@@ -8,6 +8,7 @@ import Control.Monad.Writer (Any(..),runWriterT,tell)
+ import Data.Char (isDigit)
+ import Data.List (stripPrefix)
+ import System.Directory (copyFile, makeRelativeToCurrentDirectory, removeFile, setCurrentDirectory)
++import System.Environment (lookupEnv)
+ import System.Exit (exitFailure)
+ import System.FilePath.Posix (takeFileName)
+ import qualified Control.Exception.Extensible as E (evaluate,catch,SomeException(..))
+@@ -47,6 +48,10 @@ interpreter Options { extensions = exts, namedExtensions = nexts,
+                                   -- Explicitly adding ImplicitPrelude because of
+                                   -- http://darcsden.com/jcpetruzza/hint/issue/1
+                                   unless (null lexts) $ set [languageExtensions := (UnknownExtension "ImplicitPrelude" : lexts)]
++                                  pkgs' <- liftIO $ lookupEnv "NIX_GHC_LIBDIR"
++                                  case pkgs' of
++                                    Just pkgs -> unsafeSetGhcOption ("-package-db " ++ pkgs ++ "/package.conf.d")
++                                    Nothing -> return ()
+                                   when trust $ do
+                                     unsafeSetGhcOption "-fpackage-trust"
+                                     forM_ (trustPkgs >>= words) $ \pkg ->
diff --git a/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch b/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch
new file mode 100644
index 00000000000..51c453557aa
--- /dev/null
+++ b/pkgs/development/haskell-modules/unlambda-fix-ghc710.patch
@@ -0,0 +1,28 @@
+diff -ru3 unlambda-0.1.3-old/Language/Unlambda.hs unlambda-0.1.3/Language/Unlambda.hs
+--- unlambda-0.1.3-old/Language/Unlambda.hs	2015-04-17 21:16:32.415751612 +0300
++++ unlambda-0.1.3/Language/Unlambda.hs	2015-04-17 21:25:38.210123501 +0300
+@@ -29,6 +29,7 @@
+ import Prelude hiding(catch)
+ #endif
+ import Control.Exception (catch, IOException)
++import Control.Monad (liftM, ap)
+ 
+ ------------------------------------------------------------------------
+ -- Abstract syntax
+@@ -85,6 +86,16 @@
+ 
+ type Cont a = (Maybe Char, Int) -> a -> IO Exp
+ 
++instance Functor Eval where
++
++  fmap = liftM
++
++instance Applicative Eval where
++
++  pure = return
++
++  (<*>) = ap
++
+ instance Monad Eval where
+ 
+   (Eval cp1) >>= f = Eval $ \dat1 cont2 ->
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index 30035671a32..136566f65f0 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -1,6 +1,7 @@
-{ stdenv, lib, ghc, llvmPackages, packages, buildEnv
-, makeWrapper
-, ignoreCollisions ? false, withLLVM ? false }:
+{ stdenv, lib, ghc, llvmPackages, packages, buildEnv, makeWrapper
+, ignoreCollisions ? false, withLLVM ? false
+, postBuild ? ""
+}:
 
 # This wrapper works only with GHC 6.12 or later.
 assert lib.versionOlder "6.12" ghc.version || ghc.isGhcjs;
@@ -89,7 +90,7 @@ buildEnv {
 
     ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"}
     $out/bin/${ghcCommand}-pkg check
-  '';
+  '' + postBuild;
 } // {
   preferLocalBuild = true;
   inherit (ghc) version meta;
diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
new file mode 100644
index 00000000000..f9d6271e5d8
--- /dev/null
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name = "jython-${version}";
+
+  version = "2.7-rc3";
+
+  src = fetchurl {
+    url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
+    sha256 = "89fcaf53f1bda6124f836065c1e318e2e853d5a9a1fbf0e96a387c6d38828c78";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  unpackPhase = ":";
+
+  installPhase = ''
+     mkdir -pv $out/bin
+     cp $src $out/jython.jar
+     makeWrapper ${jre}/bin/java $out/bin/jython --add-flags "-jar $out/jython.jar"
+  '';
+
+  meta = {
+    description = "Python interpreter written in Java";
+    homepage = http://jython.org/;
+    license = stdenv.lib.licenses.psfl;
+    platforms = jre.meta.platforms;
+  };
+}
diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix
index 6796a195286..7133b1e0824 100644
--- a/pkgs/development/interpreters/php/5.4.nix
+++ b/pkgs/development/interpreters/php/5.4.nix
@@ -1,273 +1,6 @@
-{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
-, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext
-, openssl, pkgconfig, sqlite, config, libiconv, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds }:
-
-let
-  libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
-in
-
-composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
-
-  version = "5.4.39";
-
-  name = "php-${version}";
-
-  enableParallelBuilding = true;
-
-  buildInputs = ["flex" "bison" "pkgconfig"];
-
-  flags = {
-
-    # much left to do here...
-
-    # SAPI modules:
-
-      apxs2 = {
-        configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
-        buildInputs = [apacheHttpd];
-      };
-
-      # Extensions
-
-      ldap = {
-        configureFlags = ["--with-ldap=${openldap}"];
-        buildInputs = [openldap cyrus_sasl openssl];
-      };
-
-      mhash = {
-        configureFlags = ["--with-mhash"];
-        buildInputs = [libmhash];
-      };
-
-      curl = {
-        configureFlags = ["--with-curl=${curl}"];
-        buildInputs = [curl openssl];
-      };
-
-      curlWrappers = {
-        configureFlags = ["--with-curlwrappers"];
-      };
-
-      zlib = {
-        configureFlags = ["--with-zlib=${zlib}"];
-        buildInputs = [zlib];
-      };
-
-      libxml2 = {
-        configureFlags = [
-          "--with-libxml-dir=${libxml2}"
-          #"--with-iconv-dir=${libiconv}"
-          ];
-        buildInputs = [ libxml2 ];
-      };
-
-      pcntl = {
-        configureFlags = [ "--enable-pcntl" ];
-      };
-
-      readline = {
-        configureFlags = ["--with-readline=${readline}"];
-        buildInputs = [ readline ];
-      };
-
-      sqlite = {
-        configureFlags = ["--with-pdo-sqlite=${sqlite}"];
-        buildInputs = [ sqlite ];
-      };
-
-      postgresql = {
-        configureFlags = ["--with-pgsql=${postgresql}"];
-        buildInputs = [ postgresql ];
-      };
-
-      pdo_pgsql = {
-        configureFlags = ["--with-pdo-pgsql=${postgresql}"];
-        buildInputs = [ postgresql ];
-      };
-
-      mysql = {
-        configureFlags = ["--with-mysql=${mysql.lib}"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      mysqli = {
-        configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      mysqli_embedded = {
-        configureFlags = ["--enable-embedded-mysqli"];
-        depends = "mysqli";
-        assertion = fixed.mysqliSupport;
-      };
-
-      pdo_mysql = {
-        configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      bcmath = {
-        configureFlags = ["--enable-bcmath"];
-      };
-
-      gd = {
-        # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
-        configureFlags = [
-          "--with-gd"
-          "--with-freetype-dir=${freetype}"
-          "--with-png-dir=${libpng}"
-          "--with-jpeg-dir=${libjpeg}"
-        ];
-        buildInputs = [ libpng libjpeg freetype ];
-      };
-
-      soap = {
-        configureFlags = ["--enable-soap"];
-      };
-
-      sockets = {
-        configureFlags = ["--enable-sockets"];
-      };
-
-      openssl = {
-        configureFlags = ["--with-openssl=${openssl}"];
-        buildInputs = ["openssl"];
-      };
-
-      mbstring = {
-        configureFlags = ["--enable-mbstring"];
-      };
-
-      gettext = {
-        configureFlags = ["--with-gettext=${gettext}"];
-        buildInputs = [gettext];
-      };
-
-      intl = {
-        configureFlags = ["--enable-intl"];
-        buildInputs = [icu];
-      };
-
-      exif = {
-        configureFlags = ["--enable-exif"];
-      };
-
-      xsl = {
-        configureFlags = ["--with-xsl=${libxslt}"];
-        buildInputs = [libxslt];
-      };
-
-      mcrypt = {
-        configureFlags = ["--with-mcrypt=${libmcrypt}"];
-        buildInputs = [libmcryptOverride];
-      };
-
-      bz2 = {
-        configureFlags = ["--with-bz2=${bzip2}"];
-        buildInputs = [bzip2];
-      };
-
-      zip = {
-        configureFlags = ["--enable-zip"];
-      };
-
-      ftp = {
-        configureFlags = ["--enable-ftp"];
-      };
-
-      fpm = {
-        configureFlags = ["--enable-fpm"];
-      };
-
-      mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-        configureFlags = ["--with-mssql=${freetds}"];
-        buildInputs = [freetds];
-      };
-
-      zts = {
-        configureFlags = ["--enable-maintainer-zts"];
-      };
-
-      calendar = {
-        configureFlags = ["--enable-calendar"];
-      };
-
-      /*
-         php is build within this derivation in order to add the xdebug lines to the php.ini.
-         So both Apache and command line php both use xdebug without having to configure anything.
-         Xdebug could be put in its own derivation.
-      */
-    };
-
-  cfg = {
-    ldapSupport = config.php.ldap or true;
-    mhashSupport = config.php.mhash or true;
-    mysqlSupport = config.php.mysql or true;
-    mysqliSupport = config.php.mysqli or true;
-    pdo_mysqlSupport = config.php.pdo_mysql or true;
-    libxml2Support = config.php.libxml2 or true;
-    apxs2Support = config.php.apxs2 or true;
-    bcmathSupport = config.php.bcmath or true;
-    socketsSupport = config.php.sockets or true;
-    curlSupport = config.php.curl or true;
-    curlWrappersSupport = config.php.curlWrappers or false;
-    gettextSupport = config.php.gettext or true;
-    pcntlSupport = config.php.pcntl or true;
-    postgresqlSupport = config.php.postgresql or true;
-    pdo_pgsqlSupport = config.php.pdo_pgsql or true;
-    readlineSupport = config.php.readline or true;
-    sqliteSupport = config.php.sqlite or true;
-    soapSupport = config.php.soap or true;
-    zlibSupport = config.php.zlib or true;
-    opensslSupport = config.php.openssl or true;
-    mbstringSupport = config.php.mbstring or true;
-    gdSupport = config.php.gd or true;
-    intlSupport = config.php.intl or true;
-    exifSupport = config.php.exif or true;
-    xslSupport = config.php.xsl or false;
-    mcryptSupport = config.php.mcrypt or false;
-    bz2Support = config.php.bz2 or false;
-    zipSupport = config.php.zip or true;
-    ftpSupport = config.php.ftp or true;
-    fpmSupport = config.php.fpm or true;
-    mssqlSupport = config.php.mssql or (!stdenv.isDarwin);
-    ztsSupport = config.php.zts or false;
-    calendarSupport = config.php.calendar or false;
-  };
-
-  configurePhase = ''
-    # Don't record the configure flags since this causes unnecessary
-    # runtime dependencies.
-    for i in main/build-defs.h.in scripts/php-config.in; do
-      substituteInPlace $i \
-        --replace '@CONFIGURE_COMMAND@' '(omitted)' \
-        --replace '@CONFIGURE_OPTIONS@' "" \
-        --replace '@PHP_LDFLAGS@' ""
-    done
-
-    iniFile=$out/etc/php-recommended.ini
-    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
-    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
-  '';
-
-  installPhase = ''
-    unset installPhase; installPhase;
-    cp php.ini-production $iniFile
-  '';
-
-  src = fetchurl {
-    url = "http://www.php.net/distributions/php-${version}.tar.bz2";
-    sha256 = "0znpd6pgri5vah4j4wwamhqc60awila43bhh699p973hir9pdsvw";
-  };
-
-  meta = with stdenv.lib; {
-    description = "An HTML-embedded scripting language";
-    homepage = http://www.php.net/;
-    license = stdenv.lib.licenses.php301;
-    maintainers = with maintainers; [ globin ];
-  };
-
-  patches = [ ./fix-paths.patch ];
-
-})
+{ callPackage, apacheHttpd }:
+callPackage ./generic.nix {
+  phpVersion = "5.4.40";
+  sha = "06m5b3hw5kgwvnarhiylymadj504xalpczagr662vjrwmklgz628";
+  apacheHttpd = apacheHttpd;
+}
diff --git a/pkgs/development/interpreters/php/5.5.nix b/pkgs/development/interpreters/php/5.5.nix
index 87aff4ff1a2..fdc1ab79c76 100644
--- a/pkgs/development/interpreters/php/5.5.nix
+++ b/pkgs/development/interpreters/php/5.5.nix
@@ -1,270 +1,6 @@
-{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
-, apacheHttpd, mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp }:
-
-let
-  libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
-in
-
-composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
-
-  version = "5.5.21";
-
-  name = "php-${version}";
-
-  enableParallelBuilding = true;
-
-  buildInputs = ["flex" "bison" "pkgconfig"];
-
-  flags = {
-
-    # much left to do here...
-
-    # SAPI modules:
-
-      apxs2 = {
-        configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
-        buildInputs = [apacheHttpd];
-      };
-
-      # Extensions
-      imap = {
-        configureFlags = [
-          "--with-imap=${uwimap}"
-          "--with-imap-ssl"
-          ];
-        buildInputs = [ uwimap openssl pam ];
-      };
-
-      ldap = {
-        configureFlags = ["--with-ldap=${openldap}"];
-        buildInputs = [openldap cyrus_sasl openssl];
-      };
-
-      mhash = {
-        configureFlags = ["--with-mhash"];
-        buildInputs = [libmhash];
-      };
-
-      curl = {
-        configureFlags = ["--with-curl=${curl}"];
-        buildInputs = [curl openssl];
-      };
-
-      zlib = {
-        configureFlags = ["--with-zlib=${zlib}"];
-        buildInputs = [zlib];
-      };
-
-      libxml2 = {
-        configureFlags = [
-          "--with-libxml-dir=${libxml2}"
-          ];
-        buildInputs = [ libxml2 ];
-      };
-
-      pcntl = {
-        configureFlags = [ "--enable-pcntl" ];
-      };
-
-      readline = {
-        configureFlags = ["--with-readline=${readline}"];
-        buildInputs = [ readline ];
-      };
-
-      sqlite = {
-        configureFlags = ["--with-pdo-sqlite=${sqlite}"];
-        buildInputs = [ sqlite ];
-      };
-
-      postgresql = {
-        configureFlags = ["--with-pgsql=${postgresql}"];
-        buildInputs = [ postgresql ];
-      };
-
-      pdo_pgsql = {
-        configureFlags = ["--with-pdo-pgsql=${postgresql}"];
-        buildInputs = [ postgresql ];
-      };
-
-      mysql = {
-        configureFlags = ["--with-mysql=${mysql.lib}"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      mysqli = {
-        configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      mysqli_embedded = {
-        configureFlags = ["--enable-embedded-mysqli"];
-        depends = "mysqli";
-        assertion = fixed.mysqliSupport;
-      };
-
-      pdo_mysql = {
-        configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      bcmath = {
-        configureFlags = ["--enable-bcmath"];
-      };
-
-      gd = {
-        # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
-        configureFlags = [
-          "--with-gd"
-          "--with-freetype-dir=${freetype}"
-          "--with-png-dir=${libpng}"
-          "--with-jpeg-dir=${libjpeg}"
-        ];
-        buildInputs = [ libpng libjpeg freetype ];
-      };
-
-      gmp = {
-        configureFlags = ["--with-gmp=${gmp}"];
-        buildInputs = [ gmp ];
-      };
-
-      soap = {
-        configureFlags = ["--enable-soap"];
-      };
-
-      sockets = {
-        configureFlags = ["--enable-sockets"];
-      };
-
-      openssl = {
-        configureFlags = ["--with-openssl=${openssl}"];
-        buildInputs = ["openssl"];
-      };
-
-      mbstring = {
-        configureFlags = ["--enable-mbstring"];
-      };
-
-      gettext = {
-        configureFlags = ["--with-gettext=${gettext}"];
-        buildInputs = [gettext];
-      };
-
-      intl = {
-        configureFlags = ["--enable-intl"];
-        buildInputs = [icu];
-      };
-
-      exif = {
-        configureFlags = ["--enable-exif"];
-      };
-
-      xsl = {
-        configureFlags = ["--with-xsl=${libxslt}"];
-        buildInputs = [libxslt];
-      };
-
-      mcrypt = {
-        configureFlags = ["--with-mcrypt=${libmcryptOverride}"];
-        buildInputs = [libmcryptOverride];
-      };
-
-      bz2 = {
-        configureFlags = ["--with-bz2=${bzip2}"];
-        buildInputs = [bzip2];
-      };
-
-      zip = {
-        configureFlags = ["--enable-zip"];
-      };
-
-      ftp = {
-        configureFlags = ["--enable-ftp"];
-      };
-
-      fpm = {
-        configureFlags = ["--enable-fpm"];
-      };
-
-      mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-        configureFlags = ["--with-mssql=${freetds}"];
-        buildInputs = [freetds];
-      };
-
-      calendar = {
-        configureFlags = ["--enable-calendar"];
-      };
-    };
-
-  cfg = {
-    imapSupport = config.php.imap or true;
-    ldapSupport = config.php.ldap or true;
-    mhashSupport = config.php.mhash or true;
-    mysqlSupport = config.php.mysql or true;
-    mysqliSupport = config.php.mysqli or true;
-    pdo_mysqlSupport = config.php.pdo_mysql or true;
-    libxml2Support = config.php.libxml2 or true;
-    apxs2Support = config.php.apxs2 or true;
-    bcmathSupport = config.php.bcmath or true;
-    socketsSupport = config.php.sockets or true;
-    curlSupport = config.php.curl or true;
-    gettextSupport = config.php.gettext or true;
-    pcntlSupport = config.php.pcntl or true;
-    postgresqlSupport = config.php.postgresql or true;
-    readlineSupport = config.php.readline or true;
-    sqliteSupport = config.php.sqlite or true;
-    soapSupport = config.php.soap or true;
-    zlibSupport = config.php.zlib or true;
-    opensslSupport = config.php.openssl or true;
-    mbstringSupport = config.php.mbstring or true;
-    gdSupport = config.php.gd or true;
-    intlSupport = config.php.intl or true;
-    exifSupport = config.php.exif or true;
-    xslSupport = config.php.xsl or false;
-    mcryptSupport = config.php.mcrypt or true;
-    bz2Support = config.php.bz2 or false;
-    zipSupport = config.php.zip or true;
-    ftpSupport = config.php.ftp or true;
-    fpmSupport = config.php.fpm or true;
-    gmpSupport = config.php.gmp or true;
-    mssqlSupport = config.php.mssql or (!stdenv.isDarwin);
-    calendarSupport = config.php.calendar or true;
-  };
-
-  configurePhase = ''
-    # Don't record the configure flags since this causes unnecessary
-    # runtime dependencies.
-    for i in main/build-defs.h.in scripts/php-config.in; do
-      substituteInPlace $i \
-        --replace '@CONFIGURE_COMMAND@' '(omitted)' \
-        --replace '@CONFIGURE_OPTIONS@' "" \
-        --replace '@PHP_LDFLAGS@' ""
-    done
-
-    iniFile=$out/etc/php-recommended.ini
-    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
-    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
-  '';
-
-  installPhase = ''
-    unset installPhase; installPhase;
-    cp php.ini-production $iniFile
-  '';
-
-  src = fetchurl {
-    url = "http://www.php.net/distributions/php-${version}.tar.bz2";
-    sha256 = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2";
-  };
-
-  meta = with stdenv.lib; {
-    description = "An HTML-embedded scripting language";
-    homepage = http://www.php.net/;
-    license = stdenv.lib.licenses.php301;
-    maintainers = with maintainers; [ globin ];
-  };
-
-  patches = [ ./fix-paths.patch ];
-
-})
+{ callPackage, apacheHttpd  }:
+callPackage ./generic.nix {
+  phpVersion = "5.5.21";
+  sha = "1zl3valcak5hb4fmivpfa66arwpvi19js1d5cxq5vjn4fncl5sb2";
+  apacheHttpd = apacheHttpd;
+}
diff --git a/pkgs/development/interpreters/php/5.6.nix b/pkgs/development/interpreters/php/5.6.nix
index 1fa98708920..5f69e46189f 100644
--- a/pkgs/development/interpreters/php/5.6.nix
+++ b/pkgs/development/interpreters/php/5.6.nix
@@ -1,272 +1,6 @@
-{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
-, apacheHttpd, mysql, libxml2, readline, zlib, curl, postgresql, gettext
-, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
-, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
-, uwimap, pam, gmp }:
-
-let
-  libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
-in
-
-composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
-
-  version = "5.6.5";
-
-  name = "php-${version}";
-
-  enableParallelBuilding = true;
-
-  buildInputs = ["flex" "bison" "pkgconfig"];
-
-  flags = {
-
-    # much left to do here...
-
-    # SAPI modules:
-
-      apxs2 = {
-        configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
-        buildInputs = [apacheHttpd];
-      };
-
-      # Extensions
-      imap = {
-        configureFlags = [
-          "--with-imap=${uwimap}"
-          "--with-imap-ssl"
-          ];
-        buildInputs = [ uwimap openssl pam ];
-      };
-
-      ldap = {
-        configureFlags = ["--with-ldap=${openldap}"];
-        buildInputs = [openldap cyrus_sasl openssl];
-      };
-
-      mhash = {
-        configureFlags = ["--with-mhash"];
-        buildInputs = [libmhash];
-      };
-
-      curl = {
-        configureFlags = ["--with-curl=${curl}"];
-        buildInputs = [curl openssl];
-      };
-
-      zlib = {
-        configureFlags = ["--with-zlib=${zlib}"];
-        buildInputs = [zlib];
-      };
-
-      libxml2 = {
-        configureFlags = [
-          "--with-libxml-dir=${libxml2}"
-          ];
-        buildInputs = [ libxml2 ];
-      };
-
-      pcntl = {
-        configureFlags = [ "--enable-pcntl" ];
-      };
-
-      readline = {
-        configureFlags = ["--with-readline=${readline}"];
-        buildInputs = [ readline ];
-      };
-
-      sqlite = {
-        configureFlags = ["--with-pdo-sqlite=${sqlite}"];
-        buildInputs = [ sqlite ];
-      };
-
-      postgresql = {
-        configureFlags = ["--with-pgsql=${postgresql}"];
-        buildInputs = [ postgresql ];
-      };
-
-      pdo_pgsql = {
-        configureFlags = ["--with-pdo-pgsql=${postgresql}"];
-        buildInputs = [ postgresql ];
-      };
-
-      mysql = {
-        configureFlags = ["--with-mysql=${mysql.lib}"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      mysqli = {
-        configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      mysqli_embedded = {
-        configureFlags = ["--enable-embedded-mysqli"];
-        depends = "mysqli";
-        assertion = fixed.mysqliSupport;
-      };
-
-      pdo_mysql = {
-        configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
-        buildInputs = [ mysql.lib ];
-      };
-
-      bcmath = {
-        configureFlags = ["--enable-bcmath"];
-      };
-
-      gd = {
-        # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
-        configureFlags = [
-          "--with-gd"
-          "--with-freetype-dir=${freetype}"
-          "--with-png-dir=${libpng}"
-          "--with-jpeg-dir=${libjpeg}"
-        ];
-        buildInputs = [ libpng libjpeg freetype ];
-      };
-
-      gmp = {
-        configureFlags = ["--with-gmp=${gmp}"];
-        buildInputs = [ gmp ];
-      };
-
-      soap = {
-        configureFlags = ["--enable-soap"];
-      };
-
-      sockets = {
-        configureFlags = ["--enable-sockets"];
-      };
-
-      openssl = {
-        configureFlags = ["--with-openssl=${openssl}"];
-        buildInputs = ["openssl"];
-      };
-
-      mbstring = {
-        configureFlags = ["--enable-mbstring"];
-      };
-
-      gettext = {
-        configureFlags = ["--with-gettext=${gettext}"];
-        buildInputs = [gettext];
-      };
-
-      intl = {
-        configureFlags = ["--enable-intl"];
-        buildInputs = [icu];
-      };
-
-      exif = {
-        configureFlags = ["--enable-exif"];
-      };
-
-      xsl = {
-        configureFlags = ["--with-xsl=${libxslt}"];
-        buildInputs = [libxslt];
-      };
-
-      mcrypt = {
-        configureFlags = ["--with-mcrypt=${libmcryptOverride}"];
-        buildInputs = [libmcryptOverride];
-      };
-
-      bz2 = {
-        configureFlags = ["--with-bz2=${bzip2}"];
-        buildInputs = [bzip2];
-      };
-
-      zip = {
-        configureFlags = ["--enable-zip"];
-      };
-
-      ftp = {
-        configureFlags = ["--enable-ftp"];
-      };
-
-      fpm = {
-        configureFlags = ["--enable-fpm"];
-      };
-
-      mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
-        configureFlags = ["--with-mssql=${freetds}"];
-        buildInputs = [freetds];
-      };
-
-
-      calendar = {
-        configureFlags = ["--enable-calendar"];
-      };
-
-    };
-
-  cfg = {
-    imapSupport = config.php.imap or true;
-    ldapSupport = config.php.ldap or true;
-    mhashSupport = config.php.mhash or true;
-    mysqlSupport = config.php.mysql or true;
-    mysqliSupport = config.php.mysqli or true;
-    pdo_mysqlSupport = config.php.pdo_mysql or true;
-    libxml2Support = config.php.libxml2 or true;
-    apxs2Support = config.php.apxs2 or true;
-    bcmathSupport = config.php.bcmath or true;
-    socketsSupport = config.php.sockets or true;
-    curlSupport = config.php.curl or true;
-    gettextSupport = config.php.gettext or true;
-    pcntlSupport = config.php.pcntl or true;
-    postgresqlSupport = config.php.postgresql or true;
-    readlineSupport = config.php.readline or true;
-    sqliteSupport = config.php.sqlite or true;
-    soapSupport = config.php.soap or true;
-    zlibSupport = config.php.zlib or true;
-    opensslSupport = config.php.openssl or true;
-    mbstringSupport = config.php.mbstring or true;
-    gdSupport = config.php.gd or true;
-    intlSupport = config.php.intl or true;
-    exifSupport = config.php.exif or true;
-    xslSupport = config.php.xsl or false;
-    mcryptSupport = config.php.mcrypt or true;
-    bz2Support = config.php.bz2 or false;
-    zipSupport = config.php.zip or true;
-    ftpSupport = config.php.ftp or true;
-    fpmSupport = config.php.fpm or true;
-    gmpSupport = config.php.gmp or true;
-    mssqlSupport = config.php.mssql or (!stdenv.isDarwin);
-    calendarSupport = config.php.calendar or true;
-  };
-
-  configurePhase = ''
-    # Don't record the configure flags since this causes unnecessary
-    # runtime dependencies.
-    for i in main/build-defs.h.in scripts/php-config.in; do
-      substituteInPlace $i \
-        --replace '@CONFIGURE_COMMAND@' '(omitted)' \
-        --replace '@CONFIGURE_OPTIONS@' "" \
-        --replace '@PHP_LDFLAGS@' ""
-    done
-
-    iniFile=$out/etc/php-recommended.ini
-    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
-    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
-  '';
-
-  installPhase = ''
-    unset installPhase; installPhase;
-    cp php.ini-production $iniFile
-  '';
-
-  src = fetchurl {
-    url = "http://www.php.net/distributions/php-${version}.tar.bz2";
-    sha256 = "0vfhvwn84lrz9psf10sjnwljbna1r7yqxq3lmsh5qajifl3lraxd";
-  };
-
-  meta = with stdenv.lib; {
-    description = "An HTML-embedded scripting language";
-    homepage = http://www.php.net/;
-    license = stdenv.lib.licenses.php301;
-    maintainers = with maintainers; [ globin ];
-  };
-
-  patches = [ ./fix-paths.patch ];
-
-})
+{ callPackage, apacheHttpd  }:
+callPackage ./generic.nix {
+  phpVersion = "5.6.6";
+  sha = "0k5vml94p5809bk2d5a8lhzf3h7f1xgs75b9qy6ikj70cndmqqh9";
+  apacheHttpd = apacheHttpd;
+}
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
new file mode 100644
index 00000000000..33b5b0f9024
--- /dev/null
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -0,0 +1,283 @@
+{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison
+, mysql, libxml2, readline, zlib, curl, postgresql, gettext
+, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype
+, libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds
+, uwimap, pam, gmp
+
+, phpVersion, apacheHttpd, sha }:
+
+let
+  libmcryptOverride = libmcrypt.override { disablePosixThreads = true; };
+in
+
+composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
+
+  version = "${phpVersion}";
+
+  name = "php-${version}";
+
+  enableParallelBuilding = true;
+
+  buildInputs = ["flex" "bison" "pkgconfig"];
+
+  flags = {
+
+    # much left to do here...
+
+    # SAPI modules:
+
+    apxs2 = {
+      configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
+      buildInputs = [apacheHttpd];
+    };
+
+    # Extensions
+    imap = {
+      configureFlags = [
+        "--with-imap=${uwimap}"
+        "--with-imap-ssl"
+        ];
+      buildInputs = [ uwimap openssl pam ];
+    };
+
+    ldap = {
+      configureFlags = ["--with-ldap=${openldap}"];
+      buildInputs = [openldap cyrus_sasl openssl];
+    };
+
+    mhash = {
+      configureFlags = ["--with-mhash"];
+      buildInputs = [libmhash];
+    };
+
+    curl = {
+      configureFlags = ["--with-curl=${curl}"];
+      buildInputs = [curl openssl];
+    };
+
+    curlWrappers = {
+      configureFlags = ["--with-curlwrappers"];
+    };
+
+    zlib = {
+      configureFlags = ["--with-zlib=${zlib}"];
+      buildInputs = [zlib];
+    };
+
+    libxml2 = {
+      configureFlags = [
+        "--with-libxml-dir=${libxml2}"
+        ];
+      buildInputs = [ libxml2 ];
+    };
+
+    pcntl = {
+      configureFlags = [ "--enable-pcntl" ];
+    };
+
+    readline = {
+      configureFlags = ["--with-readline=${readline}"];
+      buildInputs = [ readline ];
+    };
+
+    sqlite = {
+      configureFlags = ["--with-pdo-sqlite=${sqlite}"];
+      buildInputs = [ sqlite ];
+    };
+
+    postgresql = {
+      configureFlags = ["--with-pgsql=${postgresql}"];
+      buildInputs = [ postgresql ];
+    };
+
+    pdo_pgsql = {
+      configureFlags = ["--with-pdo-pgsql=${postgresql}"];
+      buildInputs = [ postgresql ];
+    };
+
+    mysql = {
+      configureFlags = ["--with-mysql=${mysql.lib}"];
+      buildInputs = [ mysql.lib ];
+    };
+
+    mysqli = {
+      configureFlags = ["--with-mysqli=${mysql.lib}/bin/mysql_config"];
+      buildInputs = [ mysql.lib ];
+    };
+
+    mysqli_embedded = {
+      configureFlags = ["--enable-embedded-mysqli"];
+      depends = "mysqli";
+      assertion = fixed.mysqliSupport;
+    };
+
+    pdo_mysql = {
+      configureFlags = ["--with-pdo-mysql=${mysql.lib}"];
+      buildInputs = [ mysql.lib ];
+    };
+
+    bcmath = {
+      configureFlags = ["--enable-bcmath"];
+    };
+
+    gd = {
+      # FIXME: Our own gd package doesn't work, see https://bugs.php.net/bug.php?id=60108.
+      configureFlags = [
+        "--with-gd"
+        "--with-freetype-dir=${freetype}"
+        "--with-png-dir=${libpng}"
+        "--with-jpeg-dir=${libjpeg}"
+      ];
+      buildInputs = [ libpng libjpeg freetype ];
+    };
+
+    gmp = {
+      configureFlags = ["--with-gmp=${gmp}"];
+      buildInputs = [ gmp ];
+    };
+
+    soap = {
+      configureFlags = ["--enable-soap"];
+    };
+
+    sockets = {
+      configureFlags = ["--enable-sockets"];
+    };
+
+    openssl = {
+      configureFlags = ["--with-openssl=${openssl}"];
+      buildInputs = ["openssl"];
+    };
+
+    mbstring = {
+      configureFlags = ["--enable-mbstring"];
+    };
+
+    gettext = {
+      configureFlags = ["--with-gettext=${gettext}"];
+      buildInputs = [gettext];
+    };
+
+    intl = {
+      configureFlags = ["--enable-intl"];
+      buildInputs = [icu];
+    };
+
+    exif = {
+      configureFlags = ["--enable-exif"];
+    };
+
+    xsl = {
+      configureFlags = ["--with-xsl=${libxslt}"];
+      buildInputs = [libxslt];
+    };
+
+    mcrypt = {
+      configureFlags = ["--with-mcrypt=${libmcryptOverride}"];
+      buildInputs = [libmcryptOverride];
+    };
+
+    bz2 = {
+      configureFlags = ["--with-bz2=${bzip2}"];
+      buildInputs = [bzip2];
+    };
+
+    zip = {
+      configureFlags = ["--enable-zip"];
+    };
+
+    ftp = {
+      configureFlags = ["--enable-ftp"];
+    };
+
+    fpm = {
+      configureFlags = ["--enable-fpm"];
+    };
+
+    mssql = stdenv.lib.optionalAttrs (!stdenv.isDarwin) {
+      configureFlags = ["--with-mssql=${freetds}"];
+      buildInputs = [freetds];
+    };
+
+    zts = {
+      configureFlags = ["--enable-maintainer-zts"];
+    };
+
+    calendar = {
+      configureFlags = ["--enable-calendar"];
+    };
+  };
+
+  cfg = {
+    imapSupport = config.php.imap or true;
+    ldapSupport = config.php.ldap or true;
+    mhashSupport = config.php.mhash or true;
+    mysqlSupport = config.php.mysql or true;
+    mysqliSupport = config.php.mysqli or true;
+    pdo_mysqlSupport = config.php.pdo_mysql or true;
+    libxml2Support = config.php.libxml2 or true;
+    apxs2Support = config.php.apxs2 or true;
+    bcmathSupport = config.php.bcmath or true;
+    socketsSupport = config.php.sockets or true;
+    curlSupport = config.php.curl or true;
+    curlWrappersSupport = config.php.curlWrappers or true;
+    gettextSupport = config.php.gettext or true;
+    pcntlSupport = config.php.pcntl or true;
+    postgresqlSupport = config.php.postgresql or true;
+    pdo_pgsqlSupport = config.php.pdo_pgsql or true;
+    readlineSupport = config.php.readline or true;
+    sqliteSupport = config.php.sqlite or true;
+    soapSupport = config.php.soap or true;
+    zlibSupport = config.php.zlib or true;
+    opensslSupport = config.php.openssl or true;
+    mbstringSupport = config.php.mbstring or true;
+    gdSupport = config.php.gd or true;
+    intlSupport = config.php.intl or true;
+    exifSupport = config.php.exif or true;
+    xslSupport = config.php.xsl or false;
+    mcryptSupport = config.php.mcrypt or true;
+    bz2Support = config.php.bz2 or false;
+    zipSupport = config.php.zip or true;
+    ftpSupport = config.php.ftp or true;
+    fpmSupport = config.php.fpm or true;
+    gmpSupport = config.php.gmp or true;
+    mssqlSupport = config.php.mssql or (!stdenv.isDarwin);
+    ztsSupport = config.php.zts or false;
+    calendarSupport = config.php.calendar or true;
+  };
+
+  configurePhase = ''
+    # Don't record the configure flags since this causes unnecessary
+    # runtime dependencies.
+    for i in main/build-defs.h.in scripts/php-config.in; do
+      substituteInPlace $i \
+        --replace '@CONFIGURE_COMMAND@' '(omitted)' \
+        --replace '@CONFIGURE_OPTIONS@' "" \
+        --replace '@PHP_LDFLAGS@' ""
+    done
+
+    iniFile=$out/etc/php-recommended.ini
+    [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
+    ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags
+  '';
+
+  installPhase = ''
+    unset installPhase; installPhase;
+    cp php.ini-production $iniFile
+  '';
+
+  src = fetchurl {
+    url = "http://www.php.net/distributions/php-${version}.tar.bz2";
+    sha256 = sha;
+  };
+
+  meta = with stdenv.lib; {
+    description = "An HTML-embedded scripting language";
+    homepage = http://www.php.net/;
+    license = stdenv.lib.licenses.php301;
+    maintainers = with maintainers; [ globin ];
+  };
+
+  patches = [ ./fix-paths.patch ];
+
+})
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index f67c48c62d8..10d03103b1b 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -51,7 +51,7 @@ let
       # tkinter hints
       substituteInPlace lib_pypy/_tkinter/tklib.py \
         --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \
-        --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \
+        --replace "linklibs=['tcl', 'tk']" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \
         --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
 
       sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3.py
diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile b/pkgs/development/interpreters/ruby/bundix/Gemfile
index 7d2f78133c5..4899cafc373 100644
--- a/pkgs/development/interpreters/ruby/bundix/Gemfile
+++ b/pkgs/development/interpreters/ruby/bundix/Gemfile
@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 gem "bundix",
   :git => "https://github.com/cstrahan/bundix.git",
-  :ref => "v1.0.2"
+  :ref => "v1.0.3"
diff --git a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock
index 038fa1a7a50..f241a3bafd4 100644
--- a/pkgs/development/interpreters/ruby/bundix/Gemfile.lock
+++ b/pkgs/development/interpreters/ruby/bundix/Gemfile.lock
@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/cstrahan/bundix.git
-  revision: e098b8c04087079c897aaf9542990e9fdd503bcf
-  ref: v1.0.2
+  revision: c879cf901ff8084b4c97aaacfb5ecbdb0f95cc03
+  ref: v1.0.3
   specs:
     bundix (1.0.2)
       thor (~> 0.19.1)
diff --git a/pkgs/development/interpreters/ruby/bundix/gemset.nix b/pkgs/development/interpreters/ruby/bundix/gemset.nix
index adde97a49f2..f8f6546671d 100644
--- a/pkgs/development/interpreters/ruby/bundix/gemset.nix
+++ b/pkgs/development/interpreters/ruby/bundix/gemset.nix
@@ -4,8 +4,8 @@
     source = {
       type = "git";
       url = "https://github.com/cstrahan/bundix.git";
-      rev = "e098b8c04087079c897aaf9542990e9fdd503bcf";
-      sha256 = "0www8srjqlxy1pzn2b6himy5y768dni54m7rv67gj8yvx48vd803";
+      rev = "c879cf901ff8084b4c97aaacfb5ecbdb0f95cc03";
+      sha256 = "05kmdnq4qa5h8l3asv05cjpnyplnqqx6hrqybj2cjlzmdxnkkgyj";
       fetchSubmodules = false;
     };
     dependencies = [
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
index cadda288764..38b7ce530ae 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
@@ -25,13 +25,12 @@
 
 let
   v8 = v8_3_16_14;
-  mysql = assert false; (import <nixpkgs> {}).mysql;
 
 in
 
 {
   charlock_holmes = attrs: {
-    buildInputs = [ which icu ];
+    buildInputs = [ which icu zlib ];
   };
 
   ffi = attrs: {
diff --git a/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb b/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
index f3849446fe6..f68a20212ce 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
+++ b/pkgs/development/interpreters/ruby/bundler-env/monkey_patches.rb
@@ -74,16 +74,24 @@ Bundler::Fetcher.class_eval do
 
     spec_list = gem_names.map do |name|
       spec = Bundler.nix_gemspecs.detect {|spec| spec.name == name }
-      dependencies = spec.dependencies.
-        select {|dep| dep.type != :development}.
-        map do |dep|
-          deps_list << dep.name
-          dep
-        end
-
-      [spec.name, spec.version, spec.platform, dependencies]
+      if spec.nil?
+        msg = "WARNING: Could not find gemspec for '#{name}'"
+        Bundler.ui.warn msg
+        nil
+      else
+        dependencies = spec.dependencies.
+          select {|dep| dep.type != :development}.
+          map do |dep|
+            deps_list << dep.name
+            dep
+          end
+
+        [spec.name, spec.version, spec.platform, dependencies]
+      end
     end
 
+    spec_list.compact!
+
     [spec_list, deps_list.uniq]
   end
 end
diff --git a/pkgs/development/interpreters/tcl/8.5.nix b/pkgs/development/interpreters/tcl/8.5.nix
new file mode 100644
index 00000000000..193ff4f9376
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/8.5.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  release = "8.5";
+  version = "${release}.18";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
+    sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3";
+  };
+})
diff --git a/pkgs/development/interpreters/tcl/8.6.nix b/pkgs/development/interpreters/tcl/8.6.nix
new file mode 100644
index 00000000000..fd88c8e8716
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/8.6.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  release = "8.6";
+  version = "${release}.4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";
+    sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
+  };
+})
diff --git a/pkgs/development/interpreters/tcl/default.nix b/pkgs/development/interpreters/tcl/default.nix
deleted file mode 100644
index 913c73f01f3..00000000000
--- a/pkgs/development/interpreters/tcl/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "tcl-8.6.4";
-
-  src = fetchurl {
-    url = mirror://sourceforge/tcl/tcl8.6.4-src.tar.gz;
-    sha256 = "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly";
-  };
-
-  preConfigure = "cd unix";
-
-  postInstall = ''
-    make install-private-headers
-    ln -s $out/bin/tclsh8.6 $out/bin/tclsh
-  '';
-  
-  meta = {
-    description = "The Tcl scription language";
-    homepage = http://www.tcl.tk/;
-    license = stdenv.lib.licenses.tcltk;
-  };
-  
-  passthru = {
-    libdir = "lib/tcl8.5";
-  };
-}
diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix
new file mode 100644
index 00000000000..8b5722c79c8
--- /dev/null
+++ b/pkgs/development/interpreters/tcl/generic.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl
+
+# Version specific stuff
+, release, version, src
+, ...
+}:
+
+stdenv.mkDerivation rec {
+  name = "tcl-${version}";
+
+  inherit src;
+
+  preConfigure = "cd unix";
+
+  postInstall = ''
+    make install-private-headers
+    ln -s $out/bin/tclsh${release} $out/bin/tclsh
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "The Tcl scription language";
+    homepage = http://www.tcl.tk/;
+    license = licenses.tcltk;
+    platforms = platforms.all;
+  };
+  
+  passthru = rec {
+    inherit release version;
+    libPrefix = "tcl${release}";
+    libdir = "lib/${libPrefix}";
+  };
+}
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 6d6148e092a..1e32a598506 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, audiofile
+{ stdenv, fetchurl, pkgconfig, audiofile, libcap
 , openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
 , x11Support ? true, x11 ? null, libXrandr ? null
@@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
-  in stdenv.lib.optional notMingw audiofile;
+  in [ libcap ]
+    ++ (stdenv.lib.optional notMingw audiofile);
 
   nativeBuildInputs = [ pkgconfig ] ++
     stdenv.lib.optional openglSupport [ mesa ];
diff --git a/pkgs/development/libraries/accelio/cflags.patch b/pkgs/development/libraries/accelio/cflags.patch
new file mode 100644
index 00000000000..a0904519122
--- /dev/null
+++ b/pkgs/development/libraries/accelio/cflags.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index 6ce6b6b..72d2e65 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -110,14 +110,10 @@ AC_MSG_RESULT([$enable_debug])
+ 
+ if test "$enable_debug" = "yes"; then
+ 	AC_DEFINE([DEBUG],[],[Debug Mode])
+-	AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wdeclaration-after-statement \
+-		  -Wsign-compare -Wc++-compat \

+-		   -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE"
++	AM_CFLAGS="$AM_CFLAGS -g -ggdb -fno-omit-frame-pointer -O0 -D_REENTRANT -D_GNU_SOURCE"
+ else
+ 	AC_DEFINE([NDEBUG],[],[No-debug Mode])
+-	AM_CFLAGS="$AM_CFLAGS -g -ggdb -Wall -Werror -Wpadded -Wdeclaration-after-statement \
+-		  -Wsign-compare -Wc++-compat \

+-		  -O3 -D_REENTRANT -D_GNU_SOURCE"
++	AM_CFLAGS="$AM_CFLAGS -O3 -D_REENTRANT -D_GNU_SOURCE"
+ fi
+ 
+ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
diff --git a/pkgs/development/libraries/accelio/default.nix b/pkgs/development/libraries/accelio/default.nix
new file mode 100644
index 00000000000..b56f2d81389
--- /dev/null
+++ b/pkgs/development/libraries/accelio/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, libibverbs, librdmacm, libevent
+
+# Linux only deps
+, numactl, kernel ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "accelio-${version}${stdenv.lib.optionalString (kernel != null) "-kernel"}";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "accelio";
+    repo = "accelio";
+    rev = "v${version}";
+    sha256 = "05yqzjs12nymhs0pq1ypnfszgbmvfprjqd3gr2iz3vqbkpzi9n2c";
+  };
+
+  patches = [ ./cflags.patch ];
+
+  postPatch = ''
+    # Don't build broken examples
+    sed -i '/AC_CONFIG_SUBDIRS(\[\(examples\|tests\)\/kernel/d' configure.ac
+
+    # Allow the installation of xio kernel headers
+    sed -i 's,/opt/xio,''${out},g' src/kernel/xio/Makefile.in
+  '';
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libevent ];
+  propagatedBuildInputs = [ libibverbs librdmacm ]
+    ++ stdenv.lib.optional stdenv.isLinux numactl;
+
+  configureFlags = [
+    "--enable-rdma"
+    "--disable-raio-build"
+  ] ++ stdenv.lib.optionals (kernel != null) [
+    "--enable-kernel-module"
+    "--with-kernel=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
+    "--with-kernel-build=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  INSTALL_MOD_PATH = "\${out}";
+
+  meta = with stdenv.lib; {
+    homepage = http://www.accelio.org/;
+    description = "a high-performance asynchronous reliable messaging and RPC library optimized for hardware acceleration";
+    license = licenses.bsd3;
+    platforms = with platforms; linux ++ freebsd;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
new file mode 100644
index 00000000000..14fbcdf7342
--- /dev/null
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, gettext, gtk3, intltool, glib
+, gtk_doc, autoconf, automake, libtool, libarchive, libyaml
+, gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
+}:
+
+stdenv.mkDerivation rec {
+  name = "appstream-glib-0.3.6";
+
+  src = fetchurl {
+    url = "https://github.com/hughsie/appstream-glib/archive/appstream_glib_0_3_6.tar.gz";
+    sha256 = "1zdxg9dk9vxw2cs04cswd138di3dysz0hxk4918750hh19s3859c";
+  };
+
+  buildInputs = [ glib libtool pkgconfig gtk_doc gettext intltool sqlite libsoup
+                  gcab attr acl docbook_xsl
+                  libarchive libyaml gtk3 autoconf automake gobjectIntrospection ];
+
+  configureScript = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Objects and helper methods to read and write AppStream metadata";
+    homepage    = https://github.com/hughsie/appstream-glib;
+    license     = licenses.lgpl21Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ lethalman ];
+  };
+
+}
diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix
index cc0f51eb68d..3fb49c2be24 100644
--- a/pkgs/development/libraries/aspell/dictionaries.nix
+++ b/pkgs/development/libraries/aspell/dictionaries.nix
@@ -37,6 +37,15 @@ in {
     };
   };
 
+  da = buildDict {
+    shortName = "da-1.4.42-1";
+    fullName = "Danish";
+    src = fetchurl {
+      url = mirror://gnu/aspell/dict/da/aspell5-da-1.4.42-1.tar.bz2;
+      sha256 = "1hfkmiyhgrx5lgrb2mffjbdn1hivrm73wcg7x0iid74p2yb0fjpp";
+    };
+  };
+
   de = buildDict {
     shortName = "de-20030222-1";
     fullName = "German";
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index d6b080050be..83f532ba15d 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, glib, libintlOrEmpty, gobjectIntrospection }:
 
 let
-  ver_maj = "2.12";
+  ver_maj = "2.16";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/atk/${ver_maj}/${name}.tar.xz";
-    sha256 = "13zijfcmx7sda83qkryzsmr9hw0r3b73xkagq9cmm733fhcl7a28";
+    sha256 = "0qp5i91kfk6rhrlam3s8ha0cz88lkyp89vsyn4pb5856c1h9hpq9";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 5920c691d94..677652a733b 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation {
   configureScript = "./bootstrap.sh";
   configureFlags = commonConfigureFlags ++ [
     "--with-icu=${icu}"
-    "--with-python=${python}/bin/python"
+    "--with-python=${python.interpreter}"
   ] ++ optional (toolset != null) "--with-toolset=${toolset}";
 
   buildPhase = builder nativeB2Args;
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index 59778d36f85..4ab554561f7 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage    = http://www.celt-codec.org/;
     license     = licenses.bsd2;
     maintainers = with maintainers; [ codyopel raskin ];
-    platform    = platforms.unix;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index 049938e1f45..cd679183650 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://cimg.sourceforge.net/;
     license = licenses.cecill-c;
     maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/clutter-gst/3.0.nix b/pkgs/development/libraries/clutter-gst/3.0.nix
new file mode 100644
index 00000000000..617501130ca
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gst/3.0.nix
@@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gst-3.0.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter-gst/3.0/${name}.tar.xz";
+    sha256 = "0ahn6m9ca78cgf7xad16sb50x4dx0fcn5ircllilkir84iri2466";
+  };
+
+  propagatedBuildInputs = [ clutter gtk3 glib cogl ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "GStreamer bindings for clutter";
+
+    homepage = http://www.clutter-project.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/clutter-gtk/1.4.nix b/pkgs/development/libraries/clutter-gtk/1.4.nix
new file mode 100644
index 00000000000..e493bab1bc7
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gtk/1.4.nix
@@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gtk-1.4.4";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz";
+    sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e";
+  };
+
+  propagatedBuildInputs = [ clutter gtk3 ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Clutter-GTK";
+
+    homepage = http://www.clutter-project.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/clutter-gtk/1.6.nix b/pkgs/development/libraries/clutter-gtk/1.6.nix
new file mode 100644
index 00000000000..9c4e7ae1271
--- /dev/null
+++ b/pkgs/development/libraries/clutter-gtk/1.6.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gtk-1.6.0";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter-gtk/1.6/${name}.tar.xz";
+    sha256 = "883550b574a036363239442edceb61cf3f6bedc8adc97d3404278556dc82234d";
+  };
+
+  propagatedBuildInputs = [ clutter gtk3 ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Clutter-GTK";
+    homepage = http://www.clutter-project.org/;
+    license = stdenv.lib.licenses.lgpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/development/libraries/clutter/1.22.nix b/pkgs/development/libraries/clutter/1.22.nix
new file mode 100644
index 00000000000..e303d5f0339
--- /dev/null
+++ b/pkgs/development/libraries/clutter/1.22.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
+, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
+gobjectIntrospection 
+}:
+
+let
+  ver_maj = "1.22";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "clutter-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
+    sha256 = "5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs =
+    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
+      atk json_glib gobjectIntrospection
+    ];
+
+  configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
+
+  #doCheck = true; # no tests possible without a display
+
+  meta = {
+    description = "Clutter, a library for creating fast, dynamic graphical user interfaces";
+
+    longDescription =
+      '' Clutter is free software library for creating fast, compelling,
+         portable, and dynamic graphical user interfaces.  It is a core part
+         of MeeGo, and is supported by the open source community.  Its
+         development is sponsored by Intel.
+
+         Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use
+         on mobile and embedded platforms), but wraps an easy to use,
+         efficient, flexible API around GL's complexity.
+
+         Clutter enforces no particular user interface style, but provides a
+         rich, generic foundation for higher-level toolkits tailored to
+         specific needs.
+      '';
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+    homepage = http://www.clutter-project.org/;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 67de04050af..37b2c73fe44 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
     homepage = http://www.clutter-project.org/;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud ];
+    maintainers = with stdenv.lib.maintainers; [ urkud lethalman ];
     platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }
diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix
new file mode 100644
index 00000000000..1489f48c9b4
--- /dev/null
+++ b/pkgs/development/libraries/cogl/1.20.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty
+, pangoSupport ? true, pango, cairo, gobjectIntrospection
+, gstreamerSupport ? true, gst_all_1 }:
+
+let
+  ver_maj = "1.20";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "cogl-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz";
+    sha256 = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  configureFlags = [
+    "--enable-introspection"
+    "--enable-gles1"
+    "--enable-gles2"
+    "--enable-kms-egl-platform"
+  ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst";
+
+  propagatedBuildInputs = with xorg; [
+      glib gdk_pixbuf gobjectIntrospection
+      mesa_noglu libXrandr libXfixes libXcomposite libXdamage
+    ]
+    ++ libintlOrEmpty
+    ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
+                                               gst_all_1.gst-plugins-base ];
+
+  buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ];
+
+  COGL_PANGO_DEP_CFLAGS
+    = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
+      "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
+  #doCheck = true; # all tests fail (no idea why)
+
+  meta = with stdenv.lib; {
+    description = "A small open source library for using 3D graphics hardware for rendering";
+    maintainers = with maintainers; [ lovek323 ];
+
+    longDescription = ''
+      Cogl is a small open source library for using 3D graphics hardware for
+      rendering. The API departs from the flat state machine style of OpenGL
+      and is designed to make it easy to write orthogonal components that can
+      render without stepping on each other's toes.
+    '';
+
+    platforms = stdenv.lib.platforms.mesaPlatforms;
+  };
+}
diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix
index 506bb0d7071..e394c9db4ce 100644
--- a/pkgs/development/libraries/cracklib/default.nix
+++ b/pkgs/development/libraries/cracklib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libintlOrEmpty, zlib, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "cracklib-2.9.2";
+  name = "cracklib-2.9.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/cracklib/${name}.tar.gz";
-    sha256 = "1xarjwga2bc4hys4fkspcp1cph699ag8gg6gmv8rjgj43llrkj61";
+    sha256 = "0n49prh5rffl33bxy8qf46cqm6mswdlqpmm6iqi490w0p6s6da7j";
   };
 
   buildInputs = [ libintlOrEmpty zlib gettext ];
diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix
index c326fb7fd38..cf22a775b14 100644
--- a/pkgs/development/libraries/crypto++/default.nix
+++ b/pkgs/development/libraries/crypto++/default.nix
@@ -46,10 +46,11 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkPhase = "LD_LIBRARY_PATH=`pwd` make test";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Crypto++, a free C++ class library of cryptographic schemes";
     homepage = http://cryptopp.com/;
-    license = stdenv.lib.licenses.boost;
+    license = licenses.boost;
+    platforms = platforms.all;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix
index 2bd4f814985..5bf9832843b 100644
--- a/pkgs/development/libraries/dbus-cplusplus/default.nix
+++ b/pkgs/development/libraries/dbus-cplusplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dbus, glib, gtkmm, pkgconfig, expat }:
+{ stdenv, fetchurl, dbus, glib, pkgconfig, expat }:
 
 stdenv.mkDerivation rec {
   name = "dbus-cplusplus-${version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/dbus-cplusplus/dbus-c%2B%2B/0.9.0/libdbus-c%2B%2B-0.9.0.tar.gz";
-    name = "dbus-cplusplus.tar.gz";
+    name = "${name}.tar.gz";
     sha256 = "0qafmy2i6dzx4n1dqp6pygyy6gjljnb7hwjcj2z11c1wgclsq4dw";
   };
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rwcz9pvc13b3yfr0lkifnfz0vb5q6dg240bzgf37ni4s8rpc72g";
   })];
 
-  buildInputs = [ dbus glib gtkmm pkgconfig expat ];
+  buildInputs = [ dbus glib pkgconfig expat ];
 
   configureFlags = "--disable-ecore";
 
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index ad836ac732d..087df1a7151 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -76,6 +76,7 @@ let
     # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
     NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
     buildInputs = [ systemdOrEmpty ];
+    meta.platforms = with stdenv.lib.platforms; allBut darwin;
   };
 
 
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index fc8ed42c640..90f50037dce 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
     homepage = http://eigen.tuxfamily.org ;
+    platforms = platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ];
     inherit version;
   };
diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix
index 2b0b027bda5..12c21693a79 100644
--- a/pkgs/development/libraries/fdk-aac/default.nix
+++ b/pkgs/development/libraries/fdk-aac/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "fdk-aac-${version}";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/opencore-amr/fdk-aac/${name}.tar.gz";
-    sha256 = "138c1l6c571289czihk0vlcfbla7qlac2jd5yyps5dyg08l8gjx9";
+    sha256 = "1aqmzxri23q83wfmwbbashs27mq1mapvfirz5r9i7jkphrwgw42r";
   };
 
   configureFlags = [ ]
diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix
new file mode 100644
index 00000000000..5a8b1f2fcbc
--- /dev/null
+++ b/pkgs/development/libraries/gcab/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, intltool, gobjectIntrospection, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "gcab-0.6";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gcab/0.6/${name}.tar.xz";
+    sha256 = "a0443b904bfa7227b5155bfcdf9ea9256b6e26930b8febe1c41f972f6f1334bb";
+  };
+
+  buildInputs = [ intltool gobjectIntrospection pkgconfig ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+
+}
diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 237b5537ba4..fe7d0869fbd 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -13,6 +13,12 @@ composableDerivation.composableDerivation {} (fixed: rec {
 
   buildInputs = [ unzip libjpeg libtiff libpng python pythonPackages.numpy proj openssl ];
 
+  patches = [
+    # This ensures that the python package is installed into gdal's prefix,
+    # rather than trying to install into python's prefix.
+    ./python.patch
+  ];
+
   # Don't use optimization for gcc >= 4.3. That's said to be causing segfaults.
   # Unset CC and CXX as they confuse libtool.
   preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
@@ -31,6 +37,18 @@ composableDerivation.composableDerivation {} (fixed: rec {
     "--with-geos=${geos}/bin/geos-config"# optional
   ];
 
+  # Prevent this:
+  #
+  #   Checking .pth file support in /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/
+  #   /nix/store/pbi1lgank10fy0xpjckbdpgacqw34dsz-python-2.7.9/bin/python -E -c pass
+  #   TEST FAILED: /nix/store/xkrmb8xnvqxzjwsdmasqmsdh1a5y2y99-gdal-1.11.2/lib/python2.7/site-packages/ does NOT support .pth files
+  #   error: bad install directory or PYTHONPATH
+  preBuild = ''
+    pythonInstallDir=$out/lib/${python.libPrefix}/site-packages
+    mkdir -p $pythonInstallDir
+    export PYTHONPATH=''${PYTHONPATH:+''${PYTHONPATH}:}$pythonInstallDir
+  '';
+
   meta = {
     description = "Translator library for raster geospatial data formats";
     homepage = http://www.gdal.org/;
diff --git a/pkgs/development/libraries/gdal/python.patch b/pkgs/development/libraries/gdal/python.patch
new file mode 100644
index 00000000000..50504c62edd
--- /dev/null
+++ b/pkgs/development/libraries/gdal/python.patch
@@ -0,0 +1,17 @@
+diff --git a/swig/python/GNUmakefile.old b/swig/python/GNUmakefile
+index b4d5e90..2160b83 100644
+--- a/swig/python/GNUmakefile
++++ b/swig/python/GNUmakefile
+@@ -67,11 +67,7 @@ egg:
+ 	
+ install:
+ 
+-ifeq ($(PY_HAVE_SETUPTOOLS),1)
+-	$(PYTHON) setup.py install 
+-else
+ 	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
+-endif
+ 
+ 	for f in $(SCRIPTS) ; do $(INSTALL) ./scripts/$$f $(DESTDIR)$(INST_BIN) ; done
+ 
+
diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix
index c0deb2d5fca..ee7b12de502 100644
--- a/pkgs/development/libraries/gecode/default.nix
+++ b/pkgs/development/libraries/gecode/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gecode-${version}";
-  version = "4.3.3";
+  version = "4.4.0";
 
   src = fetchurl {
     url = "http://www.gecode.org/download/${name}.tar.gz";
-    sha256 = "1nxcv32pqmf7fsdpa8zp482i8a1nhrfppqaimymcxvxjgxzmpj1i";
+    sha256 = "0akqjzy6pd229mn0lhpdbyc4wbazhprkd5ijqs99z68bj3b9h0s3";
   };
 
   buildInputs = [ perl ];
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
new file mode 100644
index 00000000000..575e2d562aa
--- /dev/null
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchgit, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
+, librsvg, pango, gtk, bzip2, intltool, libtool, automake, autoconf, json_glib }:
+
+stdenv.mkDerivation rec {
+  name = "gegl-0.3.0-20140619";
+
+  src = fetchgit {
+    url = "https://git.gnome.org/browse/gegl";
+    sha256 = "1rjmv2y7z34zrnlqczmmh0bm724iszzdf6jpibszxnp3w0npwjrb";
+    rev = "0014eb1bad50244314ed09592fe57efa9322678c";
+  };
+
+  configureScript = "./autogen.sh";
+
+  # needs fonts otherwise  don't know how to pass them
+  configureFlags = "--disable-docs";
+
+  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool
+                  autoconf automake libtool which json_glib ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = { 
+    description = "Graph-based image processing framework";
+    homepage = http://www.gegl.org;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index 15f42afd9a8..24c24fe5f12 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "https://launchpad.net/geis";
-    description = "GEIS is a library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism.";
+    description = "A library for applications and toolkit programmers which provides a consistent platform independent interface for any system-wide input gesture recognition mechanism";
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 88d9837d597..88545bf732c 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
      substituteInPlace configure --replace "-Werror" ""
   '';
 
+  configureFlags = [ "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+
   propagatedBuildInputs = [ dbus dbus_glib glib ];
 
   meta = {
diff --git a/pkgs/development/libraries/gettext/expat.nix b/pkgs/development/libraries/gettext/expat.nix
new file mode 100644
index 00000000000..fc6116b3916
--- /dev/null
+++ b/pkgs/development/libraries/gettext/expat.nix
@@ -0,0 +1,10 @@
+{ runCommand, gettext, expat, makeWrapper }:
+
+runCommand "gettext-expat-${gettext.name}" { buildInputs = [ makeWrapper ]; } ''
+  mkdir $out
+  cp -rf ${gettext}/* $out/
+  chmod a+w $out/bin
+  for p in $out/bin/*; do
+    wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat}/lib
+  done
+''
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index ee7f39585ef..6f0394823a6 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -2,15 +2,15 @@
 , gsettings_desktop_schemas }:
 
 let
-  ver_maj = "2.42";
-  ver_min = "1";
+  ver_maj = "2.44";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "glib-networking-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
-    sha256 = "c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0";
+    sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
   };
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 8322ccefff3..066874973aa 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -36,7 +36,8 @@ in
       if [ -f ${stdenv.cc.cc}/lib/libgcc_s.so.1 ]; then
           mkdir -p $out/lib
           cp ${stdenv.cc.cc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1
-          ln -s libgcc_s.so.1 $out/lib/libgcc_s.so
+          # the .so It used to be a symlink, but now it is a script
+          cp -a ${stdenv.cc.cc}/lib/libgcc_s.so $out/lib/libgcc_s.so
       fi
     '';
 
diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 9e06ed66412..25666066601 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
 
 let
-  ver_maj = "2.42";
+  ver_maj = "2.44";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397";
+    sha256 = "1a1fczy7hcpn24fglyn4i79f4yjc8s50is70q03mb294bm1c02hv";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix
index 9e26d8ecf05..c663c4e68a7 100644
--- a/pkgs/development/libraries/glog/default.nix
+++ b/pkgs/development/libraries/glog/default.nix
@@ -1,16 +1,23 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "glog-0.3.3";
+  name = "glog-${version}";
+  version = "0.3.4";
   
-  src = fetchurl {
-    url = "http://google-glog.googlecode.com/files/${name}.tar.gz";
-    sha1 = "ed40c26ecffc5ad47c618684415799ebaaa30d65";
+  src = fetchFromGitHub {
+    owner = "Google";
+    repo = "glog";
+    rev = "v${version}";
+    sha256 = "0ym5g15m7c8kjfr2c3zq6bz08ghin2d1r1nb6v2vnkfh1vn945x1";
   };
 
-  meta = {
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
     homepage = http://code.google.com/p/google-glog/;
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     description = "Library for application-level logging";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix
new file mode 100644
index 00000000000..f768e03f184
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/3.4.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchurl, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "3.4.0";
+
+  src = fetchurl {
+    url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.lz";
+    sha256 = "0mhym25ns3fhjd82p6g0aafhzbfkanryqbxvjy9mi25n2xpr1b95";
+  };
+
+  patches = [ ./install-fix.patch ];
+})
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 9c1c2e1b7d8..930713f5987 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -1,8 +1,8 @@
-{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
-, guileBindings, guile, perl, gmp
+{ fetchurl, stdenv, autoreconfHook, zlib, lzo, libtasn1, nettle, pkgconfig, lzip
+, guileBindings, guile, perl, gmp, libidn, p11_kit, unbound, trousers
 
 # Version dependent args
-, version, src
+, version, src, patches ? []
 , ...}:
 
 assert guileBindings -> guile != null;
@@ -10,42 +10,36 @@ assert guileBindings -> guile != null;
 stdenv.mkDerivation rec {
   name = "gnutls-${version}";
 
-  inherit src;
+  inherit src patches;
 
-  patches =
-    # FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
-    stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch
-    ;
-
-  # Note: GMP is a dependency of Nettle, whose public headers include
-  # GMP headers, hence the hack.
-  configurePhase = ''
-    ./configure --prefix="$out"                                 \
-      --disable-dependency-tracking --enable-fast-install       \
-      --without-p11-kit                                         \
-      --with-lzo --with-libtasn1-prefix="${libtasn1}"           \
-      --with-libnettle-prefix="${nettle}"                       \
-      CPPFLAGS="-I${gmp}/include"                               \
-      ${stdenv.lib.optionalString guileBindings
-          "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""}
-  '';
+  configureFlags = [
+    "--disable-dependency-tracking"
+    "--enable-fast-install"
+  ] ++ stdenv.lib.optional guileBindings
+    [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ];
 
   # Build of the Guile bindings is not parallel-safe.  See
   # <http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=330995a920037b6030ec0282b51dde3f8b493cad>
   # for the actual fix.
   enableParallelBuilding = !guileBindings;
 
-  buildInputs = [ zlib lzo lzip ]
+  buildInputs = [ lzo lzip nettle libtasn1 libidn p11_kit zlib gmp trousers unbound ]
     ++ stdenv.lib.optional guileBindings guile;
 
-  nativeBuildInputs = [ perl pkgconfig ];
-
-  propagatedBuildInputs = [ nettle libtasn1 ];
+  nativeBuildInputs = [ perl pkgconfig autoreconfHook ];
 
   # XXX: Gnulib's `test-select' fails on FreeBSD:
   # http://hydra.nixos.org/build/2962084/nixlog/1/raw .
   doCheck = (!stdenv.isFreeBSD && !stdenv.isDarwin);
 
+  # Fixup broken libtool and pkgconfig files
+  preFixup = ''
+    sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
+        -e 's,-lz,-L${zlib}/lib -lz,' \
+        -e 's,-lgmp,-L${gmp}/lib -lgmp,' \
+        -i $out/lib/libgnutls.la $out/lib/pkgconfig/gnutls.pc
+  '';
+
   meta = with stdenv.lib; {
     description = "The GNU Transport Layer Security Library";
 
diff --git a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch b/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
deleted file mode 100644
index 1624d1f7ab9..00000000000
--- a/pkgs/development/libraries/gnutls/guile-gnulib-includes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 699ae6ef085c699dd5f3fb460b0f8a2408cc2860
-Author: Simon Josefsson <simon@josefsson.org>
-Date:   Thu Aug 9 15:24:11 2012 +0200
-
-    Add gnulib -I's to guile-snarf command.
-
---- gnutls-3.0.22/guile/src/Makefile.in	2012-08-04 20:52:39.000000000 +0200
-+++ gnutls-3.0.22/guile/src/Makefile.in	2012-08-11 21:55:20.000000000 +0200
-@@ -1564,7 +1564,7 @@ AM_CPPFLAGS = \
- # `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be
- # included here, even though we'd really want `$(GUILE_CPPFLAGS)'.
- snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	       $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
-+	       $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS)
- 
- all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/pkgs/development/libraries/gnutls/install-fix.patch b/pkgs/development/libraries/gnutls/install-fix.patch
new file mode 100644
index 00000000000..48ed2da24c0
--- /dev/null
+++ b/pkgs/development/libraries/gnutls/install-fix.patch
@@ -0,0 +1,27 @@
+diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
+index 8e793d3..68de757 100644
+--- a/doc/manpages/Makefile.am
++++ b/doc/manpages/Makefile.am
+@@ -134,11 +134,8 @@ APIMANS += gnutls_certificate_get_peers.3
+ APIMANS += gnutls_certificate_get_peers_subkey_id.3
+ APIMANS += gnutls_certificate_get_trust_list.3
+ APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_verify_flags.3
+-APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_crt.3
+ APIMANS += gnutls_certificate_get_x509_key.3
+-APIMANS += gnutls_certificate_get_x509_key.3
+ APIMANS += gnutls_certificate_send_x509_rdn_sequence.3
+ APIMANS += gnutls_certificate_server_set_request.3
+ APIMANS += gnutls_certificate_set_dh_params.3
+@@ -1101,7 +1098,7 @@ compare-makefile:
+ 	@echo "******************************************************************************"
+ 	@echo "If the following step fails copy $(srcdir)/doc/manpages/tmp-compare-makefile to doc/manpages/Makefile.am"
+ 	@echo "******************************************************************************"
+-	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d`; \
++	FUNCS=`cat $(top_srcdir)/lib/includes/gnutls/*.h | $(top_srcdir)/doc/scripts/getfuncs.pl|sort -d|uniq`; \
+ 	MANS=""; \
+ 	for i in $$FUNCS; do \
+ 		MANS="$$MANS\nAPIMANS += $$i.3"; \
+--
+libgit2 0.21.4
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 0dcf6e9f0d5..6975df9545e 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -5,7 +5,7 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.40";
+  ver_maj = "1.42";
   ver_min = "0";
 in
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln";
+    sha256 = "3ba2edfad4f71d4f0de16960b5d5f2511335fa646b2c49bbb93ce5942b3f95f7";
   };
 
   outputs = [ "dev" "out" "doc" ];
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage    = http://live.gnome.org/GObjectIntrospection;
-    maintainers = with maintainers; [ lovek323 urkud ];
+    maintainers = with maintainers; [ lovek323 urkud lethalman ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 2e51f70e91d..d4913ef21f6 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -11,11 +11,11 @@ let
     "${gnupg}/bin/gpg2";
 in
 stdenv.mkDerivation rec {
-  name = "gpgme-1.5.3";
+  name = "gpgme-1.5.4";
 
   src = fetchurl {
     url = "mirror://gnupg/gpgme/${name}.tar.bz2";
-    sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d";
+    sha256 = "0v7azxazsfakvhrxzj5ysvcxma0892c89d27c17fkj8mi3nc0f5v";
   };
 
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 581f8b1b222..706bd769219 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -1,45 +1,55 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl
+, staticSupport ? false # Compile statically (support for packages that look for the static object)
+}:
+
+let
+  inherit (stdenv) isDarwin;
+  inherit (stdenv.lib) optional optionalString;
+in
 
-with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "gsm-${version}";
-  version = "1.0.13";
+  version = "1.0.14";
 
   src = fetchurl {
     url = "http://www.quut.com/gsm/${name}.tar.gz";
-    sha256 = "1bcjl2h60gvr1dc5a963h3vnz9zl6n8qrfa3qmb2x3229lj1iiaj";
+    sha256 = "0b1mx69jq88wva3wk0hi6fcl5a52qhnq2f9p3f3jdh5k61ma252q";
   };
 
   patchPhase = ''
     # Fix include directory
     sed -e 's,$(GSM_INSTALL_ROOT)/inc,$(GSM_INSTALL_ROOT)/include/gsm,' -i Makefile
-
-    makeFlags="$makeFlags INSTALL_ROOT=$out"
-
-    # Build shared library instead of static
-    sed -e 's,-c -O2 -DNeedFunctionPrototypes=1,-c -O2 -fPIC -DNeedFunctionPrototypes=1,' -i Makefile
-    sed -e 's,libgsm.a,libgsm.so,' -i Makefile
-    sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile
-    sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile
-  '';
+  '' + optionalString (!staticSupport) (
+    (if isDarwin then  ''
+      # Build dylib on Darwin
+      sed -e 's,libgsm.a,libgsm.dylib,' -i Makefile
+      sed -e 's,$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS),$(LD) -o $(LIBGSM) -dynamiclib -install_name $(GSM_INSTALL_ROOT)/$(LIBGSM) $(GSM_OBJECTS) -lc,' -i Makefile
+    '' else ''
+      # Build ELF shared object by default
+      sed -e 's,libgsm.a,libgsm.so,' -i Makefile
+      sed -e 's/$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)/$(LD) -shared -Wl,-soname,libgsm.so -o $(LIBGSM) $(GSM_OBJECTS) -lc/' -i Makefile
+    '') + ''
+      # Remove line that is unused when building shared libraries
+      sed -e 's,$(RANLIB) $(LIBGSM),,' -i Makefile
+    ''
+  );
 
   makeFlags = [
-    ''SHELL=${stdenv.shell}''
-  ];
+    "SHELL=${stdenv.shell}"
+    "INSTALL_ROOT=$(out)"
+  ] ++ optional (stdenv.cc.cc.isClang or false) "CC=clang";
 
-  preInstall = ''
-    mkdir -p "$out/"{bin,lib,man/man1,man/man3,include/gsm}
-  '';
+  preInstall = "mkdir -p $out/{bin,lib,man/man1,man/man3,include/gsm}";
 
-  NIX_CFLAGS_COMPILE = "-fPIC";
+  NIX_CFLAGS_COMPILE = optional (!staticSupport) "-fPIC";
 
   parallelBuild = false;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Lossy speech compression codec";
     homepage    = http://www.quut.com/gsm/;
     license     = licenses.bsd2;
     maintainers = with maintainers; [ codyopel raskin ];
-    platforms   = platforms.all;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 96a094ca9cc..b4c962d9e54 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -5,11 +5,14 @@
 , openjpeg, libopus, librsvg
 , wildmidi, fluidsynth, libvdpau, wayland
 , libwebp, xvidcore, gnutls
-, mesa
+, mesa, libintlOrEmpty
 }:
 
 assert faacSupport -> faac != null;
 
+let
+  inherit (stdenv.lib) optional optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-1.4.5";
 
@@ -23,7 +26,7 @@ stdenv.mkDerivation rec {
       a real live maintainer, or some actual wide use.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -39,7 +42,15 @@ stdenv.mkDerivation rec {
     faad2 libass libkate libmms
     libmodplug mpeg2dec mpg123
     openjpeg libopus librsvg
-    wildmidi fluidsynth libvdpau wayland
+    fluidsynth libvdpau
     libwebp xvidcore gnutls mesa
-  ] ++ stdenv.lib.optional faacSupport faac;
+  ]
+    ++ libintlOrEmpty
+    ++ optional faacSupport faac
+    ++ optional stdenv.isLinux wayland
+    # wildmidi requires apple's OpenAL
+    # TODO: package apple's OpenAL, fix wildmidi, include on Darwin
+    ++ optional (!stdenv.isDarwin) wildmidi;
+
+  LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 61e0762826a..f959da4045e 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, python, gstreamer, gobjectIntrospection
 , orc, alsaLib, libXv, pango, libtheora
-, cdparanoia, libvisual
+, cdparanoia, libvisual, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     description = "Base plugins and helper libraries";
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 
@@ -24,12 +24,23 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    orc alsaLib libXv pango libtheora
-    cdparanoia libvisual
-  ];
+    orc libXv pango libtheora cdparanoia
+  ]
+  ++ libintlOrEmpty
+  ++ stdenv.lib.optional stdenv.isLinux alsaLib
+  ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual;
 
   propagatedBuildInputs = [ gstreamer ];
 
+  configureFlags = if stdenv.isDarwin then [ 
+    # Does not currently build on Darwin
+    "--disable-libvisual"
+    # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia
+    "--disable-cdparanoia"
+  ] else null;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   enableParallelBuilding = true;
 }
 
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 5e306f5500f..5dbcb1cee4b 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     description = "Open source multimedia framework";
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index df7078a1365..47b09e95e6e 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     description = "Library for creation of audio/video non-linear editors";
     homepage    = "http://gstreamer.freedesktop.org";
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index 05113973a9d..4b6e7957f5c 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
       applications. It introduces the concept of a timeline.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index a06747ddc90..51ad836b644 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -3,9 +3,12 @@
 , libv4l, libdv, libavc1394, libiec61883
 , libvpx, speex, flac, taglib
 , cairo, gdk_pixbuf, aalib, libcaca
-, libsoup, pulseaudio
+, libsoup, pulseaudio, libintlOrEmpty
 }:
 
+let
+  inherit (stdenv.lib) optionals optionalString;
+in
 stdenv.mkDerivation rec {
   name = "gst-plugins-good-1.4.5";
 
@@ -18,7 +21,7 @@ stdenv.mkDerivation rec {
       code, LGPL or LGPL-compatible for the supporting library).
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -31,9 +34,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gst-plugins-base orc bzip2
-    libv4l libdv libavc1394 libiec61883
-    libvpx speex flac taglib
+    libdv libvpx speex flac taglib
     cairo gdk_pixbuf aalib libcaca
-    libsoup pulseaudio
-  ];
+    libsoup
+  ]
+  ++ libintlOrEmpty
+  ++ optionals stdenv.isLinux [ libv4l pulseaudio libavc1394 libiec61883 ];
+
+  LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index d4db4fa8de5..1db7e4dbd55 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
 , libiec61883, libavc1394, taglib, pulseaudio, gdk_pixbuf, orc
-, glib, gstreamer, bzip2, libsoup
+, glib, gstreamer, bzip2, libsoup, libintlOrEmpty
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
   minimalDeps ? false
@@ -23,11 +23,15 @@ stdenv.mkDerivation rec {
   configureFlags = "--enable-experimental --disable-oss";
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base pulseaudio ]
+    [ pkgconfig glib gstreamer gst_plugins_base ]
+    ++ stdenv.lib.optional stdenv.isLinux [ pulseaudio ]
+    ++ libintlOrEmpty
     ++ stdenv.lib.optionals (!minimalDeps)
       [ aalib libcaca cairo libdv flac libjpeg libpng speex
         taglib bzip2 libvpx gdk_pixbuf orc libsoup ];
 
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+
   enableParallelBuilding = true;
 
   meta = {
@@ -36,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "`Good' plug-ins for GStreamer";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     license = stdenv.lib.licenses.lgpl2Plus;
   };
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
index e4411fcefbb..99ac5a5ec54 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gstreamer, gst_plugins_base
-, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc }:
+, libmad, libdvdread, libmpeg2, libcdio, a52dec, x264, orc, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-0.10.19";
@@ -13,7 +13,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ];
+    [ pkgconfig glib gstreamer gst_plugins_base libmad libdvdread a52dec x264 orc ] ++ libintlOrEmpty;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 
   enableParallelBuilding = true;
 
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer";
 
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
 
     license = stdenv.lib.licenses.lgpl2Plus;
   };
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch b/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
new file mode 100644
index 00000000000..67dfc34434d
--- /dev/null
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/darwin.patch
@@ -0,0 +1,14 @@
+diff --git a/gst/gstdatetime.c b/gst/gstdatetime.c
+index 60f709f..cdc7e75 100644
+--- a/gst/gstdatetime.c
++++ b/gst/gstdatetime.c
+@@ -21,8 +21,8 @@
+ #include "config.h"
+ #endif
+ 
+-#include "glib-compat-private.h"
+ #include "gst_private.h"
++#include "glib-compat-private.h"
+ #include "gstdatetime.h"
+ #include <glib.h>
+ #include <math.h>
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
index b608f891533..07b846f35b4 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     sed -i -e 's/^   /\t/' docs/gst/Makefile.in docs/libs/Makefile.in docs/plugins/Makefile.in
+  ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    # Applying this patch manually to avoid a rebuild on Linux. Feel free to refactor later
+    # See https://trac.macports.org/ticket/40783 for explanation of patch
+    patch -p1 < ${./darwin.patch}
   '';
 
   configureFlags = ''
diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
index 97a4638170f..ea1c31ccab8 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gtkmm.org/;
     license = stdenv.lib.licenses.lgpl2Plus;
     maintainers = "Philip Lykke Carlsen <plcplc@gmail.com>";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
 }
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 4e3d7eee78b..c13beb4d5f7 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, python
 , gst-plugins-base, orc
 , a52dec, libcdio, libdvdread
-, lame, libmad, libmpeg2, x264
+, lame, libmad, libmpeg2, x264, libintlOrEmpty
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       like. The code might be widely known to present patent problems.
     '';
     license     = licenses.lgpl2Plus;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ iyzsong ];
   };
 
@@ -32,5 +32,7 @@ stdenv.mkDerivation rec {
     gst-plugins-base orc
     a52dec libcdio libdvdread
     lame libmad libmpeg2 x264
-  ];
+  ] ++ libintlOrEmpty;
+
+  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 }
diff --git a/pkgs/development/libraries/gtk+/3.16.nix b/pkgs/development/libraries/gtk+/3.16.nix
new file mode 100644
index 00000000000..84bea07602f
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/3.16.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchurl, pkgconfig, gettext, perl
+, expat, glib, cairo, pango, gdk_pixbuf, atk, at_spi2_atk, gobjectIntrospection
+, xlibs, x11, wayland, libxkbcommon, epoxy
+, xineramaSupport ? stdenv.isLinux
+, cupsSupport ? stdenv.isLinux, cups ? null
+}:
+
+assert xineramaSupport -> xlibs.libXinerama != null;
+assert cupsSupport -> cups != null;
+
+let
+  ver_maj = "3.16";
+  ver_min = "2";
+  version = "${ver_maj}.${ver_min}";
+in
+stdenv.mkDerivation rec {
+  name = "gtk+3-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz";
+    sha256 = "1yhwg2l72l3khfkprydcjlpxjrg11ccqfc80sjl56llz3jk66fd0";
+  };
+
+  nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
+
+  buildInputs = [ libxkbcommon epoxy ];
+  propagatedBuildInputs = with xlibs; with stdenv.lib;
+    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk ]
+    ++ optionals stdenv.isLinux [ libXrandr libXrender libXcomposite libXi libXcursor wayland ]
+    ++ optional stdenv.isDarwin x11
+    ++ optional xineramaSupport libXinerama
+    ++ optional cupsSupport cups;
+
+  # demos fail to install, no idea where's the problem
+  preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
+
+  enableParallelBuilding = true;
+
+  postInstall = "rm -rf $out/share/gtk-doc";
+
+  passthru = {
+    gtkExeEnvPostBuild = ''
+      rm $out/lib/gtk-3.0/3.0.0/immodules.cache
+      $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache
+    ''; # workaround for bug of nix-mode for Emacs */ '';
+  };
+
+  meta = {
+    description = "A multi-platform toolkit for creating graphical user interfaces";
+
+    longDescription = ''
+      GTK+ is a highly usable, feature rich toolkit for creating
+      graphical user interfaces which boasts cross platform
+      compatibility and an easy to use API.  GTK+ it is written in C,
+      but has bindings to many other popular programming languages
+      such as C++, Python and C# among others.  GTK+ is licensed
+      under the GNU LGPL 2.1 allowing development of both free and
+      proprietary software with GTK+ without any license fees or
+      royalties.
+    '';
+
+    homepage = http://www.gtk.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix
index b57c91c4455..52df259616b 100644
--- a/pkgs/development/libraries/gtkimageview/default.nix
+++ b/pkgs/development/libraries/gtkimageview/default.nix
@@ -10,6 +10,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk ];
 
+  preConfigure = ''
+    sed '/DEPRECATED_FLAGS/d' -i configure
+    sed 's/-Wall -Werror//' -i configure
+  '';
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/development/libraries/gtkmm/3.16.nix b/pkgs/development/libraries/gtkmm/3.16.nix
new file mode 100644
index 00000000000..bc327468855
--- /dev/null
+++ b/pkgs/development/libraries/gtkmm/3.16.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
+
+let
+  ver_maj = "3.16";
+  ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "gtkmm-${ver_maj}.${ver_min}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz";
+    sha256 = "036xn22jkaf3akpid7w23b8vkqa3xxqz93mwacmyar5vw7slm3cv";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
+
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = {
+    description = "C++ interface to the GTK+ graphical user interface library";
+
+    longDescription = ''
+      gtkmm is the official C++ interface for the popular GUI library
+      GTK+.  Highlights include typesafe callbacks, and a
+      comprehensive set of widgets that are easily extensible via
+      inheritance.  You can create user interfaces either in code or
+      with the Glade User Interface designer, using libglademm.
+      There's extensive documentation, including API reference and a
+      tutorial.
+    '';
+
+    homepage = http://gtkmm.org/;
+
+    license = stdenv.lib.licenses.lgpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud vcunat ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 739b0ad3136..dcdef696ffd 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -5,15 +5,15 @@
 , gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }:
 
 let
-  ver_maj = "1.18";
-  version = "${ver_maj}.3";
+  ver_maj = "1.22";
+  version = "${ver_maj}.2";
 in
 stdenv.mkDerivation rec {
   name = "gvfs-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz";
-    sha256 = "0b27vidnrwh6yb2ga9a1k9qlrz6lrzsaz2hcxqbc1igivhb9g0hx";
+    sha256 = "8d08c4927b6c20d990498c23280017e7033b31a386f09b4c3ce5bedd20316250";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libtool ];
@@ -35,8 +35,9 @@ stdenv.mkDerivation rec {
     wrapProgram $out/libexec/gvfsd --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  meta = {
-    description = "Virtual Filesystem support library" + stdenv.lib.optionalString gnomeSupport " (full GNOME support)";
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)";
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
   };
 }
diff --git a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
index 8d175398414..3fbc8c3f2b0 100644
--- a/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
+++ b/pkgs/development/libraries/haskell/diagrams/builder/wrapper.nix
@@ -2,7 +2,7 @@
   If user need access to more haskell package for building his
   diagrams, he simply has to pass these package through the
   extra packages function as follow in `config.nix`:
-  
+
   ~~~
   diagramBuilderWrapper.override {
     extraPackages = self : [myHaskellPackage];
@@ -10,22 +10,21 @@
   ­~~~
 
   WARNING:
-  Note that this solution works well but however, as this is a 
+  Note that this solution works well but however, as this is a
   non-cabal derivation, user should be carefull to never put this
   package inside the listing passed as argument to `ghcWithPackages`
   as it will silently disregard the package. This silent disregard
   should be regarded as an issue for `ghcWithPackages`. It should
   rather raise an error instead when a non-cabal dirivation is
   directly passed to it. The alternative would have been to
-  use a fake cabal file in order to make this a cabal derivation
-  such as what `yiCustom` package did.
+  use a fake cabal file in order to make this a cabal derivation.
 */
 
-{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper, 
+{ stdenv, diagramsBuilder, ghcWithPackages, makeWrapper,
   extraPackages ? (self: []) }:
 let
-  # Used same technique as for the yiCustom package.
-  w = ghcWithPackages 
+  # Used same technique such as xmonad
+  w = ghcWithPackages
     (self: [ diagramsBuilder ] ++ extraPackages self);
   wrappedGhc = w.override { ignoreCollisions = true; };
 in
@@ -50,4 +49,4 @@ stdenv.mkDerivation {
   '';
   preferLocalBuild = true;
   meta = diagramsBuilder.meta;
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/hiredis/default.nix b/pkgs/development/libraries/hiredis/default.nix
index fc4b2b47959..6476fb663ef 100644
--- a/pkgs/development/libraries/hiredis/default.nix
+++ b/pkgs/development/libraries/hiredis/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "hiredis-${version}";
-  version = "0.12.1";
+  version = "0.13.0";
 
-  src = fetchgit {
-    url = "git://github.com/redis/hiredis";
-    rev = "37c06facda57af9bad68f50c18edfa22d6ef76f7";
-    sha256 = "1z1rzhh1659g8i5bl78k1i1imlz2prwirhzbkn6j7hvq4mxbf2yz";
+  src = fetchFromGitHub {
+    owner = "redis";
+    repo = "hiredis";
+    rev = "v${version}";
+    sha256 = "195ih8jprw0q253nvhnmfv9dsm8pss6pdf4x3c88q4mfsyw8pg76";
   };
 
   PREFIX = "\${out}";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/redis/hiredis;
     description = "Minimalistic C client for Redis >= 1.2";
-    licenses = licenses.bsd3;
+    license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
   };
diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/pkgs/development/libraries/javascript/jquery/default.nix
index 7dd2b6284fa..3491b2b3970 100644
--- a/pkgs/development/libraries/javascript/jquery/default.nix
+++ b/pkgs/development/libraries/javascript/jquery/default.nix
@@ -3,17 +3,17 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "jquery-1.11.1";
+  name = "jquery-1.11.2";
 
   src = if compressed then
     fetchurl {
       url = "http://code.jquery.com/${name}.min.js";
-      sha256 = "0hgly37jhg0n5cqlx3ylmwcxkxmbkvv07f9z9pm94jyxq7gcc2sl";
+      sha256 = "1h09zz6cjm66g30wa7c41by1jswx9gjpgqgbxln0dv2v55fjkk9f";
     }
     else
     fetchurl {
       url = "http://code.jquery.com/${name}.js";
-      sha256 = "1g7nhy8dwzzai7h7m800fsig4gzw34kjxxbpqdac2y8ch9586a9h";
+      sha256 = "098gnzndmmjygpsfywxgmb0vi42b882pwpby77gqkrd2nwsp1hjq";
     };
 
   unpackPhase = "true";
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/default.nix b/pkgs/development/libraries/kde-frameworks-5.7/default.nix
deleted file mode 100644
index 30e8d5ffe1c..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/default.nix
+++ /dev/null
@@ -1,203 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
-
-with stdenv.lib; with autonix;
-
-let
-
-  mkDerivation = drv:
-    let inherit (builtins.parseDrvName drv.name) version; in
-    stdenv.mkDerivation
-      (drv // {
-        setupHook = ./setup-hook.sh;
-
-        enableParallelBuilding = drv.enableParallelBuilding or true;
-        cmakeFlags =
-          (drv.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta =
-          {
-            license = with stdenv.lib.licenses; [
-              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-            ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          } // (drv.meta or {});
-      });
-
-  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
-
-  scope =
-    # packages in this collection
-    (mapAttrs (dep: name: kf5."${name}") renames) //
-    # packages pinned to this version of Qt 5
-    {
-      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      Qt5 = qt5.base;
-      Qt5Core = qt5.base;
-      Qt5DBus = qt5.base;
-      Qt5Gui = qt5.base;
-      Qt5LinguistTools = qt5.tools;
-      Qt5Qml = [qt5.declarative qt5.graphicaleffects];
-      Qt5Quick = [qt5.quickcontrols qt5.graphicaleffects];
-      Qt5Script = qt5.script;
-      Qt5Svg = qt5.svg;
-      Qt5WebkitWidgets = qt5.webkit;
-      Qt5Widgets = qt5.base;
-      Qt5X11Extras = qt5.x11extras;
-      Qt5XmlPatterns = qt5.xmlpatterns;
-      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
-    } //
-    # packages from the nixpkgs collection
-    (with pkgs;
-      {
-        Boost = boost155;
-        inherit cmake epoxy;
-        GIF = giflib;
-        GLIB2 = glib;
-        Gpgme = gpgme;
-        JPEG = libjpeg;
-        LibGcrypt = libgcrypt;
-        LibGit2 = libgit2;
-        LibIntl = gettext;
-        LibLZMA = lzma;
-        NetworkManager = networkmanager;
-        Perl = perl;
-        PythonInterp = python;
-        QImageBlitz = qimageblitz;
-        SharedMimeInfo = shared_mime_info;
-        ZLIB = zlib;
-      }
-    );
-
-  mirror = "mirror://kde";
-
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-      ];
-
-  postResolve = super:
-    super // {
-      extra-cmake-modules = {
-        inherit (super.extra-cmake-modules) name src;
-
-        propagatedNativeBuildInputs = [ scope.cmake pkgs.pkgconfig qt5.tools ];
-        cmakeFlags = ["-DBUILD_TESTING=OFF"];
-        patches =
-          [
-            ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch
-          ];
-        meta =
-          let inherit (builtins.parseDrvName super.extra-cmake-modules.name) version; in
-          {
-            license = with stdenv.lib.licenses; [ bsd2 ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-            inherit version;
-            branch = intersperse "." (take 2 (splitString "." version));
-          };
-      };
-
-      frameworkintegration = super.frameworkintegration // {
-        buildInputs = with pkgs.xlibs; super.frameworkintegration.buildInputs ++ [ libXcursor ];
-      };
-
-      kauth = super.kauth // {
-        buildInputs =
-          super.kauth.buildInputs
-          ++ [(pkgs.polkit_qt5.override { inherit qt5; })];
-        patches = [./kauth/kauth-policy-install.patch];
-      };
-
-      kcmutils = super.kcmutils // {
-        patches =
-          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
-      };
-
-      kconfigwidgets = super.kconfigwidgets // {
-        patches =
-          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
-      };
-
-      kdelibs4support = with pkgs; super.kdelibs4support // {
-        buildInputs =
-          super.kdelibs4support.buildInputs
-          ++ [networkmanager xlibs.libSM];
-        cmakeFlags =
-          (super.kdelibs4support.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-          ];
-      };
-
-      kdoctools = with pkgs; super.kdoctools // {
-        cmakeFlags =
-          (super.kdoctools.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-          ];
-        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
-      };
-
-      ki18n = with pkgs; super.ki18n // {
-        propagatedNativeBuildInputs =
-          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
-      };
-
-      kimageformats = with pkgs; super.kimageformats // {
-        NIX_CFLAGS_COMPILE =
-          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
-      };
-
-      kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
-
-      kpackage = super.kpackage // { patches = [ ./kpackage/0001-allow-external-paths.patch ]; };
-
-      kservice = super.kservice // {
-        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
-        patches =
-          [
-            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
-            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
-          ];
-      };
-
-      ktexteditor = super.ktexteditor // {
-        patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
-      };
-
-    };
-
-  kf5 = generateCollection ./. {
-    inherit mirror mkDerivation preResolve postResolve renames scope;
-  };
-
-in
-
-  kf5 // { inherit mkDerivation qt5 scope; }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix
deleted file mode 100644
index c4a2977b8e5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix
+++ /dev/null
@@ -1,500 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  attica = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  extra-cmake-modules = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Qt5QUIET" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  frameworkintegration = {
-    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kactivities = {
-    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapidox = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  karchive = {
-    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kauth = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbookmarks = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcodecs = {
-    buildInputs = [ "ECM" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcompletion = {
-    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfig = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfigwidgets = {
-    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcoreaddons = {
-    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kcrash = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdbusaddons = {
-    buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeclarative = {
-    buildInputs = [ "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kded = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs4support = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesignerplugin = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesu = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Pty" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebkit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" "Qt5Core" "Qt5Network" "Qt5WebKitWidgets" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdnssd = {
-    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" "Qt5DBus" "Qt5Network" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdoctools = {
-    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" "Qt5NO_MODULE" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kemoticons = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kglobalaccel = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kguiaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khtml = {
-    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ki18n = {
-    buildInputs = [ "ECM" "LibIntl" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiconthemes = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kidletime = {
-    buildInputs = [ "ECM" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "X11" "X11_XCB" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kimageformats = {
-    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5QUIET" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio = {
-    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Qt5Xml" "Strigi" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemmodels = {
-    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemviews = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjobwidgets = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjs = {
-    buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjsembed = {
-    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmediaplayer = {
-    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Parts" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knewstuff = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifications = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpackage = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kparts = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kplotting = {
-    buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpty = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kross = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krunner = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Quick" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kservice = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktextwidgets = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kunitconversion = {
-    buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwallet = {
-    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwidgetsaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5UiTools" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwindowsystem = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5WinExtras" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlgui = {
-    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  networkmanager-qt = {
-    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-framework = {
-    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ];
-    nativeBuildInputs = [ "SH" "cmake" ];
-    propagatedBuildInputs = [ "KF5Package" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  solid = {
-    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5Xml" "UDev" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sonnet = {
-    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  threadweaver = {
-    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
-    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh b/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh
deleted file mode 100755
index 2b220244c59..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/dependencies.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script rebuilds dependencies.nix.
-# You must run manifest.sh first to download the packages.
-
-# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
-# If you are working on the packages, this is probably what you want.
-
-# You can also pass the path to a source tree where you have built
-# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
-# probably what you want.
-
-manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch
deleted file mode 100644
index 340155256f2..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kauth/kauth-policy-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
deleted file mode 100644
index 47b8dfad180..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kcmutils/kcmutils-pluginselector-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index c63241b..2243f94 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
deleted file mode 100644
index 3bd946cbd84..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch
deleted file mode 100644
index 4e3a33efab3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch
deleted file mode 100644
index a6ccb2085d3..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kinit/kinit-libpath.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 3c3c913..f510620 100644
---- a/src/kdeinit/kinit.cpp
-+++ b/src/kdeinit/kinit.cpp
-@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
-+                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/plugins, so the kdeinit5
-+                  // shared libraries should be in /lib/plugins/../
-+                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../");
-+                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
-+                  Q_FOREACH (const QString &path, paths) {
-+                    l.setFileName(path + up + libpath);
-                     l.load();
-+                    if (l.isLoaded()) break;
-+                  }
-                 }
-             }
-             if (!l.isLoaded()) {
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch
deleted file mode 100644
index 440e979c008..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kpackage/0001-allow-external-paths.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fbf10d2059fa1f19a0f0cfa2fda0abb6c435fa78 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 28 Jan 2015 07:15:30 -0600
-Subject: [PATCH] allow external paths
-
----
- src/kpackage/package.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp
-index eb4a09b..f70f1a1 100644
---- a/src/kpackage/package.cpp
-+++ b/src/kpackage/package.cpp
-@@ -758,7 +758,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
--- 
-2.1.4
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch
deleted file mode 100644
index e9bc418544a..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-follow-symlinks.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
-index 69b1427..9c37a49 100644
---- a/src/kbuildsycoca/kbuildsycoca.cpp
-+++ b/src/kbuildsycoca/kbuildsycoca.cpp
-@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
deleted file mode 100644
index 7e21ebfe86f..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
-index 2eb1275..e39a36f 100644
---- a/src/kbuildsycoca/vfolder_menu.cpp
-+++ b/src/kbuildsycoca/vfolder_menu.cpp
-@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+        QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch
deleted file mode 100644
index c2e77a537c5..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 15 Feb 2015 19:09:17 -0600
-Subject: [PATCH] no qcoreapplication
-
----
- src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
-index 3f02e8c..d1a865b 100644
---- a/src/syntax/data/katehighlightingindexer.cpp
-+++ b/src/syntax/data/katehighlightingindexer.cpp
-@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
- 
- int main(int argc, char *argv[])
- {
--    // get app instance
--    QCoreApplication app(argc, argv);
--    
-     // ensure enough arguments are passed
--    if (app.arguments().size() < 3)
-+    if (argc < 3)
-         return 1;
- 
-     // open schema
-     QXmlSchema schema;
--    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
-+    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
-         return 2;
- 
--    const QString hlFilenamesListing = app.arguments().value(3);
-+    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
-     if (hlFilenamesListing.isEmpty()) {
-         return 1;
-     }
-@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
-         return anyError;
-     
-     // create outfile, after all has worked!
--    QFile outFile(app.arguments().at(1));
-+    QFile outFile(QString::fromLocal8Bit(argv[1]));
-     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-         return 7;
- 
--- 
-2.1.4
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix b/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix
deleted file mode 100644
index e2d215889e0..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/manifest.nix
+++ /dev/null
@@ -1,562 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ stdenv, fetchurl, mirror }:
-[
-  {
-    name = stdenv.lib.nameFromURL "kplotting-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/qldfj7r4gfnwd9137m5x282kn9clghvc-kplotting-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kplotting-5.7.0.tar.xz";
-      sha256 = "0257ydhyq0f5r2yl0va4y8zcb7vxll1jdz6ykaskg413hm2qxkpi";
-      name = "kplotting-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktextwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/kpbcn842lgx6h7cj7rblc60h656qqv49-ktextwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ktextwidgets-5.7.0.tar.xz";
-      sha256 = "0yhhm9cgn2lbj2ca64szyy11xviaqj5kil5kwivwnndzvaap9ja5";
-      name = "ktextwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ki18n-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/x5y7xgpn24rw7ax1xm5m3z0kd1db3k5p-ki18n-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ki18n-5.7.0.tar.xz";
-      sha256 = "16vz9hrm1j5gl5k0mbx36rxxngxbfwwlg7sznplybcghdzf5xwpc";
-      name = "ki18n-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "attica-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/fa5fimm0kc5yymlj05hcljz4lnyx15xz-attica-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/attica-5.7.0.tar.xz";
-      sha256 = "1xxd3062bv65npc3kxpsaw3805sg12fq76wy3qa1mqqy3074hvwh";
-      name = "attica-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesignerplugin-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/0nd3wx3gkln1bdpa956b8yjcs7k9ia4j-kdesignerplugin-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdesignerplugin-5.7.0.tar.xz";
-      sha256 = "0y6yjm9zqi9plfbwqc7p8r0vsxj28drfymsdx4wvwqzfv8nby57q";
-      name = "kdesignerplugin-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kservice-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/claqclndc0kz33g5nkbpa3w38mh9jqqh-kservice-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kservice-5.7.0.tar.xz";
-      sha256 = "1aziycv2r0y02lcc3hv7kzzlk9sc3c5fmh02sgm4px2wknfd12ja";
-      name = "kservice-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kbookmarks-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ww9xz56sdx2i3q8bipgf83gzdisihv0c-kbookmarks-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kbookmarks-5.7.0.tar.xz";
-      sha256 = "1vv3wirszsr5a2parbr6k4wkbp7lhcjqhbadr4fyhq62cvr7ya8l";
-      name = "kbookmarks-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kidletime-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/qiihgxjbhx39pc1p6g5w933ifzc3gdp8-kidletime-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kidletime-5.7.0.tar.xz";
-      sha256 = "15i9rj7fs6nc40axd19a8ba21wcbzvivwlsr49h27vfbhca4h5x3";
-      name = "kidletime-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpty-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ij41pg9l8j47f42yhycv8nqh7lf2zjv8-kpty-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kpty-5.7.0.tar.xz";
-      sha256 = "0sg11pzrgmdyqxbvd8rbcljmjcacnpnf6wwjqb5rj92fvrd30av0";
-      name = "kpty-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdesu-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/yxxr5ldkg551dydqjwxds5fm0nsjszwp-kdesu-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdesu-5.7.0.tar.xz";
-      sha256 = "0bjvkzgkmzxk4wlpk5hcxykf2nidg1c5c65mlhabddg0bns67axd";
-      name = "kdesu-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcodecs-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/4dx78zbckkn5hyrjmch1wh5n3vkzz8lc-kcodecs-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcodecs-5.7.0.tar.xz";
-      sha256 = "0pnf435jdm8lifvq8gdy4195vq653ffqrqdw0qh36qn9242csqhj";
-      name = "kcodecs-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kinit-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/laps2gv18vnzirpm4il51m1kw2p7hslq-kinit-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kinit-5.7.0.tar.xz";
-      sha256 = "1fzmizq877f124kal9vali5a910kv3fx6pwpza502h6rdhslpsx2";
-      name = "kinit-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwindowsystem-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/b4c3rpfikpk4bl9y87862h2fvfv22nvx-kwindowsystem-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwindowsystem-5.7.0.tar.xz";
-      sha256 = "1h3snqhlri98645nyc2p5jbz0s98yrppn3ipd7nyklnwk220prkk";
-      name = "kwindowsystem-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kxmlgui-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/sb8f1fy08m738adnajy1dd0xz5ipmwkr-kxmlgui-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kxmlgui-5.7.0.tar.xz";
-      sha256 = "1zpwih2v8416r3pn4rklr6xzhcn1jf3zlj4sd75xbnx6y5fbm1q6";
-      name = "kxmlgui-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifyconfig-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/an7xgl36n79n038b9i9dg7r1ngg0vncg-knotifyconfig-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knotifyconfig-5.7.0.tar.xz";
-      sha256 = "0psv2k6p7d04s3icjw10hxi7676a9kphqcd2pzmcxg4wk50ikqns";
-      name = "knotifyconfig-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kunitconversion-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/161vcj6bf51i82rmpd9xws4h72xbcypg-kunitconversion-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kunitconversion-5.7.0.tar.xz";
-      sha256 = "1fhh2db23q0d6g9rqsbgv5wbzyzj72x9pjda5vqa549sx8yq04is";
-      name = "kunitconversion-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdbusaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/lq4kzjg64c30yrinbgmkp5w596bg2121-kdbusaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdbusaddons-5.7.0.tar.xz";
-      sha256 = "1bn5ayywnhak0933y11lzkw39rkrmrm9m73knvgb46l7x1cchr3v";
-      name = "kdbusaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "threadweaver-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/9gnqmwvy7pm5sjpfhqqk8grz1mjb2701-threadweaver-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/threadweaver-5.7.0.tar.xz";
-      sha256 = "1ab208awll2gnrs37p7k9nwp44sc30swibw75x9jh1w16nklpapa";
-      name = "threadweaver-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kparts-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/xjiy5yxbmd4g4l61qyrbdrakzxgsrhlb-kparts-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kparts-5.7.0.tar.xz";
-      sha256 = "0ws8mk1q0sd36b3ac39s4xyzhlbh897s0hkw9kyp8yk0779g09sg";
-      name = "kparts-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "sonnet-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/zz72jdhabwv1wj8mr910lfl17w11ap3i-sonnet-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/sonnet-5.7.0.tar.xz";
-      sha256 = "11q0zfpcmvjs994cdcp5rg49lzibi7jaz0jb8h7s5kf27nc96w0r";
-      name = "sonnet-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdewebkit-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vyjpw6zsscf23xq0c4dgbldn3vizh4pj-kdewebkit-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdewebkit-5.7.0.tar.xz";
-      sha256 = "04zb2a6dj89inxppf081hzkzwlyxcsrb3j4x2y6jz8zfpsnnhkxz";
-      name = "kdewebkit-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kguiaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/1gns8ry1kiiww0lfs8m5yc8ki2sh550c-kguiaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kguiaddons-5.7.0.tar.xz";
-      sha256 = "0f63vn1f5wafzxhc50lr59qd31jav512nwh7y37jl95mrc5yjjrb";
-      name = "kguiaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "plasma-framework-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/mmwxm2jyi8lyir7g6ws8hjhzcmxkkb08-plasma-framework-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/plasma-framework-5.7.0.tar.xz";
-      sha256 = "0r5kks3a0b4cl599r2qlsigdr83psbgjw5xki480xs6caznmqd1m";
-      name = "plasma-framework-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdoctools-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/d1vx0maspgndbczfshwh3498qxwk9ca5-kdoctools-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdoctools-5.7.0.tar.xz";
-      sha256 = "01lshra3jjqklbvld004pnj4pic8yrrpgbsy1yxfdfsccnrdf9di";
-      name = "kdoctools-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjobwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/r9q0s6cpwbhjkgrji86gylmj4mfwvikl-kjobwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kjobwidgets-5.7.0.tar.xz";
-      sha256 = "033y6cmdc8gzckqmxmasmpirfzsg0ga58hf88crrp8y21a03hary";
-      name = "kjobwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcrash-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/12105y95jb4xyf4c1z8ya6d81k7z5bji-kcrash-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcrash-5.7.0.tar.xz";
-      sha256 = "0jq4rqicrvzmj8fra1zhk9b76b0x043z1ny5hf3ikyy9k4axay8z";
-      name = "kcrash-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemviews-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/2wrbbn9rr9xwqkiagiccpmr7v37c6icd-kitemviews-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kitemviews-5.7.0.tar.xz";
-      sha256 = "1ib6hlj7nv84all4j7p6k5ai5n4yslf2i2h2gwyiff2h55p2a686";
-      name = "kitemviews-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kio-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/fv1l1v4ld92shbih8cjlxyab272aygmq-kio-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kio-5.7.0.tar.xz";
-      sha256 = "0xf43ff41rgrqhici0mw2y2n4h97gkbgdngfngyzgm1vs3xq8wpl";
-      name = "kio-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/difsiryniivbnlh4j2jwssywv2ijb03s-kwidgetsaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwidgetsaddons-5.7.0.tar.xz";
-      sha256 = "19z5wr5dyq4kmry6iss85zpvjhh9a3pa6vmhbcag61sdid0nfsqx";
-      name = "kwidgetsaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kapidox-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/d7f0aaamjvv67g9p5dhw98zwqg5sdl3q-kapidox-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kapidox-5.7.0.tar.xz";
-      sha256 = "1zv91a68lzh1rb12if7c67y0gy2004kh3jlcvfy270cd9rxmkywd";
-      name = "kapidox-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kimageformats-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/09c46cmhryzqnn32kxwfjblmf5fnm7pm-kimageformats-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kimageformats-5.7.0.tar.xz";
-      sha256 = "00gga2yhpdrc9y73zhs3r6vpqb5blc9r7by72i0cap5ac040a4la";
-      name = "kimageformats-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdeclarative-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ylm05pqs3izryr45qqa37r82r76l1h3l-kdeclarative-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdeclarative-5.7.0.tar.xz";
-      sha256 = "13m1pf92508sk4rl54v2pwic99snj2r0sjvmxvzv11cfrddjkr5g";
-      name = "kdeclarative-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kemoticons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/msbryhpxvbp8165gyf4cp27f2fjrk09z-kemoticons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kemoticons-5.7.0.tar.xz";
-      sha256 = "1k5436xc0fv4xx66lzpy2kx7qgzbdv6n56xif1jl85x66gfvfvdv";
-      name = "kemoticons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcompletion-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/pnvb112ryqxy1q2yrrz72jak5lhm374p-kcompletion-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcompletion-5.7.0.tar.xz";
-      sha256 = "1d8q2b8rdk7dmmhnjnkg16dc6bgnq2ahss2n1z2l6fcm305zvyfh";
-      name = "kcompletion-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfig-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/cq1lbqzf4ihy8jnk2jab31wb3dljmpdz-kconfig-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kconfig-5.7.0.tar.xz";
-      sha256 = "0mvdz5vxzqb1vxiy7llgnyi1yyl5jmdyq35v1sf55gb84gyghrgh";
-      name = "kconfig-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kpackage-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/ph932zwlra3rsjxh37rx0i1pshk08icc-kpackage-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kpackage-5.7.0.tar.xz";
-      sha256 = "0w6ljqs2knm9jvy3hkyk0iiy295mc0dpifvxyqcq4fqj9yvkrxgq";
-      name = "kpackage-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knotifications-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/6ppkdiwvy2y3wwxrja117pinmc4lv92a-knotifications-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knotifications-5.7.0.tar.xz";
-      sha256 = "0z9bs21mn9i5jya0dh1sr0vvn362bz64nhbwnwkb5vgy0sl2n923";
-      name = "knotifications-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcoreaddons-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/63phhh1pcqlsqiqs9399vqfz7c7yw6ry-kcoreaddons-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcoreaddons-5.7.0.tar.xz";
-      sha256 = "00byxkbwm3gvlharmqvn94jw7l1c1yjv4naczqgqcppl97h0zqyb";
-      name = "kcoreaddons-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kitemmodels-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/cgxjl2p9p0qmmn6vsb357pvn01zyblr2-kitemmodels-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kitemmodels-5.7.0.tar.xz";
-      sha256 = "0y3zis7rh40nrv135zb3lvl4ix4bqqvby6kcy3b1llxcmhvaglph";
-      name = "kitemmodels-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kded-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/icy79l7w5vqwmwmg21zji3y8sqpzwcq2-kded-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kded-5.7.0.tar.xz";
-      sha256 = "0146ldipacy43xypl5zshbf751bfi2mkaa5m8hcva4ygmps0xzp3";
-      name = "kded-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kconfigwidgets-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/lz8kkfgzz18myibj3wcijai5qs0jw03p-kconfigwidgets-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kconfigwidgets-5.7.0.tar.xz";
-      sha256 = "073rv7i04p21ifwfbhikib555067iivzybnrxw6mgb5hxgph8ggv";
-      name = "kconfigwidgets-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdelibs4support-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/3p606b334sbng7a1ppc9wc9gjw4v0y59-kdelibs4support-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kdelibs4support-5.7.0.tar.xz";
-      sha256 = "1vl6s0bd0ykzbbnd6fq7vfxg7aly0k04wr15wlikkapgx3v0h9b5";
-      name = "kdelibs4support-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "khtml-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vrdx48h2r0fvjc7h2xzsjihs57gnny38-khtml-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/khtml-5.7.0.tar.xz";
-      sha256 = "0flr8qz6nws5h52ghxrzxzmn9y85mlms4n0wzh1kski1sszv62i6";
-      name = "khtml-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjs-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/sipm1kyl3lwy2fw7lcjn2n2s8qpxhag7-kjs-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kjs-5.7.0.tar.xz";
-      sha256 = "1wjhl4j5y8q55bcgzlq3m0w1kafkivfgcdvi96f9rqyr7ij5ry9h";
-      name = "kjs-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "krunner-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vid0xggxw5liig84p5jgwf3mafkyk7n5-krunner-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/krunner-5.7.0.tar.xz";
-      sha256 = "113bxzzvjw1xxkq54nizb4g4rvbbaj58zfwcz6x0pvz5jfz65b7c";
-      name = "krunner-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kmediaplayer-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/629r99dj85wah0cqvpljy45n3zniqys3-kmediaplayer-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kmediaplayer-5.7.0.tar.xz";
-      sha256 = "1bdws01m37bbip4j897nwi49jakwl9j4hp3xxls15r2h5q4wylc3";
-      name = "kmediaplayer-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kross-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/8m4vp5riqrj4b1n2wvydvlz43902f01y-kross-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kross-5.7.0.tar.xz";
-      sha256 = "1larhjl2mi5v5a9a5m216idnyvxkbb9ln1czfvsg18nizai9b0bj";
-      name = "kross-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kjsembed-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/vcmsl5zz6lv1p92vw1k30wlzp0cr43f0-kjsembed-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/portingAids/kjsembed-5.7.0.tar.xz";
-      sha256 = "1717d4q4wf182s8rlf76wj7pgzmrh6j1na9myg2pqpa9564nmald";
-      name = "kjsembed-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "networkmanager-qt-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/rnixw65cmqlkkxmcn21rc73zwk4b0zg2-networkmanager-qt-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/networkmanager-qt-5.7.0.tar.xz";
-      sha256 = "1lx1vjsp25hfrg8pvpw3k17sxr9y57m4mgzikaxkh704z826npjk";
-      name = "networkmanager-qt-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "ktexteditor-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/m5spysm05hv2ncy392msym59jxd056qi-ktexteditor-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/ktexteditor-5.7.0.tar.xz";
-      sha256 = "0ii2aw2kzvxqwlm3cjil8shkr1yfmfcwr3hvrvk99zv6mw0j8kq3";
-      name = "ktexteditor-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kdnssd-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/pabbzdlfgyl58llh6m0l1j5w3r4anpv7-kdnssd-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kdnssd-5.7.0.tar.xz";
-      sha256 = "120rclq82fnjz5z8q3rn9jbmql3fqpr64yspggl6ccv0f2v513dy";
-      name = "kdnssd-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "karchive-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/z31cgnvxh50m6m7xcpv087zmpdn1la8q-karchive-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/karchive-5.7.0.tar.xz";
-      sha256 = "0ppq4ml77bf9n9q216dcsmw9ipmqqaazbaaxxvqn5hmqx9j63mmq";
-      name = "karchive-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kauth-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/6axbcm8958m691k3jsk3ci41h97aymq3-kauth-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kauth-5.7.0.tar.xz";
-      sha256 = "1254rbagpcp3dpdfjcxr7b07n5dqc0iw93xgpafkhxzn0h687hg2";
-      name = "kauth-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kwallet-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/7p63gkx0brvnwhzsg2laqnbrq7lgdggr-kwallet-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kwallet-5.7.0.tar.xz";
-      sha256 = "19bmdc7hdvr6bxwrmlhnkclqn6dzlrdg7k870y6p4rhyrj3nvc1h";
-      name = "kwallet-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kiconthemes-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/h02fsp21lh2dbd3yvpavqh1vgwc6m87v-kiconthemes-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kiconthemes-5.7.0.tar.xz";
-      sha256 = "111rdj347sf1g09zdnss4cq68ks71jxw0b22hnczqq9p60qcj1jg";
-      name = "kiconthemes-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "frameworkintegration-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/khjj7d173y5qlqqi2z6sc7zmkv5cx5lc-frameworkintegration-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/frameworkintegration-5.7.0.tar.xz";
-      sha256 = "0d0s03y99nk8cqnsz4w5v1d06bq5dl5395wgkcrchzcwqspk7z72";
-      name = "frameworkintegration-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "extra-cmake-modules-1.7.0.tar.xz" ".tar";
-    store = "/nix/store/ga7k0viqdz58drznxba2mjjq4qf0gnj1-extra-cmake-modules-1.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/extra-cmake-modules-1.7.0.tar.xz";
-      sha256 = "1lgx13y00b9mv2p10p7bbzx12aav65i4ggcnyaqmp7pv867y33f8";
-      name = "extra-cmake-modules-1.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "solid-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/rl9gv6hcsxalys9mnm00x34grsclnzh2-solid-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/solid-5.7.0.tar.xz";
-      sha256 = "0adzqbcwnqg0f2jbrsy4sqv0p94ikijm6id1yrd89nvn0iiiip14";
-      name = "solid-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kcmutils-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/dql6c4ljy6jkr7zsksrq5wpmqhxsgz37-kcmutils-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kcmutils-5.7.0.tar.xz";
-      sha256 = "1b0rzydyhbv7jk9amj45iryl4r2iy5k2zh8g7qwbwig8jywfhwqs";
-      name = "kcmutils-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "knewstuff-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/jwckk8a1mpy4mp785mbssy0mkn3zc6b6-knewstuff-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/knewstuff-5.7.0.tar.xz";
-      sha256 = "0wg3fg2kyq2j8n2qmahw30binm9pxaqvvydsxpcj97fl0wcaffgl";
-      name = "knewstuff-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kactivities-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/1s1bl23mrah31k3vqw40vfs6f79b0wnp-kactivities-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kactivities-5.7.0.tar.xz";
-      sha256 = "1d42i0a015qsr4d4rhr574xixfw1w0dgl4qag6slsj6fm5asny19";
-      name = "kactivities-5.7.0.tar.xz";
-    };
-  }
-  {
-    name = stdenv.lib.nameFromURL "kglobalaccel-5.7.0.tar.xz" ".tar";
-    store = "/nix/store/i6ja196cyzixsxbyg6bdivizs75y8pvb-kglobalaccel-5.7.0.tar.xz";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.7/kglobalaccel-5.7.0.tar.xz";
-      sha256 = "0jlknk3g07x9y4vl4n82hy4msfaavqy51fpj1yffya8zbb59c29y";
-      name = "kglobalaccel-5.7.0.tar.xz";
-    };
-  }
-]
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh b/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh
deleted file mode 100755
index fef8b701d01..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/manifest.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../../.. -A autonix.manifest) \
-    http://download.kde.org/stable/frameworks/5.7/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch
deleted file mode 100644
index 9a22c0bdbcd..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/plasma-framework/plasma-framework-external-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
-index 07b3c90..84417e3 100644
---- a/src/plasma/package.cpp
-+++ b/src/plasma/package.cpp
-@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
-       servicePrefix("plasma-applet-"),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/renames.nix b/pkgs/development/libraries/kde-frameworks-5.7/renames.nix
deleted file mode 100644
index 58ade4e62ac..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/renames.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "plasma-framework";
-"CTest" = "attica";
-"ECM" = "extra-cmake-modules";
-"KDED" = "kded";
-"KF5Activities" = "kactivities";
-"KF5Archive" = "karchive";
-"KF5Attica" = "attica";
-"KF5Auth" = "kauth";
-"KF5Bookmarks" = "kbookmarks";
-"KF5Codecs" = "kcodecs";
-"KF5Completion" = "kcompletion";
-"KF5Config" = "kconfig";
-"KF5ConfigWidgets" = "kconfigwidgets";
-"KF5CoreAddons" = "kcoreaddons";
-"KF5Crash" = "kcrash";
-"KF5DBusAddons" = "kdbusaddons";
-"KF5DNSSD" = "kdnssd";
-"KF5Declarative" = "kdeclarative";
-"KF5DesignerPlugin" = "kdesignerplugin";
-"KF5DocTools" = "kdoctools";
-"KF5Emoticons" = "kemoticons";
-"KF5FrameworkIntegration" = "frameworkintegration";
-"KF5GlobalAccel" = "kglobalaccel";
-"KF5GuiAddons" = "kguiaddons";
-"KF5I18n" = "ki18n";
-"KF5IconThemes" = "kiconthemes";
-"KF5IdleTime" = "kidletime";
-"KF5Init" = "kinit";
-"KF5ItemModels" = "kitemmodels";
-"KF5ItemViews" = "kitemviews";
-"KF5JS" = "kjs";
-"KF5JobWidgets" = "kjobwidgets";
-"KF5JsEmbed" = "kjsembed";
-"KF5KCMUtils" = "kcmutils";
-"KF5KDE4Support" = "kdelibs4support";
-"KF5KDELibs4Support" = "kdelibs4support";
-"KF5KHtml" = "khtml";
-"KF5KIO" = "kio";
-"KF5Kross" = "kross";
-"KF5MediaPlayer" = "kmediaplayer";
-"KF5NetworkManagerQt" = "networkmanager-qt";
-"KF5NewStuff" = "knewstuff";
-"KF5Notifications" = "knotifications";
-"KF5NotifyConfig" = "knotifyconfig";
-"KF5Package" = "kpackage";
-"KF5Parts" = "kparts";
-"KF5Plasma" = "plasma-framework";
-"KF5PlasmaQuick" = "plasma-framework";
-"KF5Plotting" = "kplotting";
-"KF5Pty" = "kpty";
-"KF5Runner" = "krunner";
-"KF5Service" = "kservice";
-"KF5Solid" = "solid";
-"KF5Sonnet" = "sonnet";
-"KF5Su" = "kdesu";
-"KF5TextEditor" = "ktexteditor";
-"KF5TextWidgets" = "ktextwidgets";
-"KF5ThreadWeaver" = "threadweaver";
-"KF5UnitConversion" = "kunitconversion";
-"KF5Wallet" = "kwallet";
-"KF5WebKit" = "kdewebkit";
-"KF5WidgetsAddons" = "kwidgetsaddons";
-"KF5WindowSystem" = "kwindowsystem";
-"KF5XmlGui" = "kxmlgui";
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36..00000000000
--- a/pkgs/development/libraries/kde-frameworks-5.7/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/development/libraries/kde-frameworks-5.9/default.nix b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
index 0f5504fe057..397eec61a78 100644
--- a/pkgs/development/libraries/kde-frameworks-5.9/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.9/default.nix
@@ -195,6 +195,10 @@ let
         patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
       };
 
+      networkmanager-qt = super.networkmanager-qt // {
+        propagatedBuildInputs = with pkgs; super.networkmanager-qt.propagatedBuildInputs ++ [ networkmanager ];
+      };
+
     };
 
   kf5 = generateCollection ./. {
diff --git a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch b/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch
new file mode 100644
index 00000000000..49edbf63a54
--- /dev/null
+++ b/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch
@@ -0,0 +1,224 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8217cba..a6c1d70 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ else(APPLE)
+   endif(${BUILD_FOR_ARM})
+ endif(APPLE)
+ 
+-set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-unused-parameter -Wno-null-dereference -Wno-unused-local-typedefs -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}")
++set(CMAKE_CXX_FLAGS "--std=c++11 -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}")
+ 
+ set(TEST_BINARY "kinetic_client_test")
+ set(TEST_BINARY_PATH ${kinetic_cpp_client_BINARY_DIR}/${TEST_BINARY})
+@@ -50,103 +50,16 @@ set(GENERATED_SOURCES_PATH ${kinetic_cpp_client_SOURCE_DIR}/src/main/generated)
+ set(PREFIX "${CMAKE_BINARY_DIR}/vendor")
+ set(EXTERNAL_PREFIX "${kinetic_cpp_client_BINARY_DIR}/vendor")
+ 
+-include(ExternalProject)
+-
+-set(KINETIC_PROTO_VERSION "3.0.0")
+-set(KINETIC_PROTO_MD5 "85ca027b870811a297c1f6d792498934")
+-
+-ExternalProject_add(
+-    kinetic-proto
+-    PREFIX ${PREFIX}
+-    DOWNLOAD_COMMAND curl -L https://github.com/Seagate/kinetic-protocol/archive/${KINETIC_PROTO_VERSION}.tar.gz -o kinetic-proto.tar.gz && openssl md5 kinetic-proto.tar.gz | grep -q ${KINETIC_PROTO_MD5} && rm -rf kinetic-proto && mkdir -p kinetic-proto && tar -xz --strip-components 1 -C kinetic-proto -f kinetic-proto.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ""
+-    INSTALL_COMMAND ""
+-)
+-
+-ExternalProject_add(
+-    gflags
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gflags-2.0-no-svn-files.tar.gz"
+-    URL_MD5 "9084829124e02a7e6be0f0f824523423"
+-    CONFIGURE_COMMAND ../gflags/configure --prefix=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
+-)
+-
+-ExternalProject_add(
+-    glog
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/glog-0.3.3.tar.gz"
+-    URL_MD5 "a6fd2c22f8996846e34c763422717c18"
+-    PATCH_COMMAND sh ${kinetic_cpp_client_SOURCE_DIR}/patches/apply-glog-patches.sh ${kinetic_cpp_client_SOURCE_DIR}
+-    CONFIGURE_COMMAND ../glog/configure --prefix=${EXTERNAL_PREFIX} --with-gflags=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
+-    DEPENDS gflags
+-)
+-
+-ExternalProject_add(
+-    gtest
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gtest-1.6.0.zip"
+-    URL_MD5 "4577b49f2973c90bf9ba69aa8166b786"
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gtest -I../gtest/include -c ../gtest/src/gtest-all.cc && ar -rv libgtest.a gtest-all.o && ranlib libgtest.a
+-    INSTALL_COMMAND ""
+-)
+-
+-ExternalProject_add(
+-    gmock
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gmock-1.6.0.zip"
+-    URL_MD5 "f547f47321ca88d3965ca2efdcc2a3c1"
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ""
+-    BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gmock -I../gmock/include -I../gtest -I../gtest/include -c ../gmock/src/gmock-all.cc && ar -rv libgmock.a gmock-all.o && ranlib libgmock.a
+-    INSTALL_COMMAND ""
+-    DEPENDS gtest
+-)
+-
+-ExternalProject_add(
+-    openssl
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/openssl-1.0.1g.tar.gz"
+-    URL_MD5 "de62b43dfcd858e66a74bee1c834e959"
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${OPENSSL_CONFIGURE_COMMAND} --prefix=${EXTERNAL_PREFIX} ${BUILD_PIC_COMPILER_FLAG}
+-    BUILD_COMMAND touch apps/openssl && touch openssl.pc && make ${CHILD_MAKE_FLAGS} build_libs libssl.pc libcrypto.pc
+-    INSTALL_COMMAND make install_sw
+-)
+-
+-# The protobuf build requires the existence of a protoc binary that can be
+-# executed on the host machine. To handle cross compilation, we always build
+-# protobuf once for the host so that we have a suitable copy of protoc.
+-ExternalProject_add(
+-    protoc
+-    PREFIX ${EXTERNAL_PREFIX}/host
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2"
+-    URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4"
+-    CONFIGURE_COMMAND ../protoc/configure --prefix=${EXTERNAL_PREFIX}/host --enable-static
+-)
+-
+ # Protobuf code generation rules
+-set(PROTOC_PATH "${PREFIX}/host/bin/protoc")
+-set(PROTO_DIR "${CMAKE_BINARY_DIR}/vendor/src/kinetic-proto")
++set(PROTOC_PATH "protoc")
++set(PROTO_DIR "${CMAKE_BINARY_DIR}/kinetic-proto")
+ set(PROTO_ORIG_PATH "${PROTO_DIR}/kinetic.proto")
+ set(PROTO_MODIFIED_PATH "${PROTO_DIR}/kinetic_client.proto")
+-ExternalProject_add(
+-    protobuf
+-    PREFIX ${EXTERNAL_PREFIX}
+-    URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2"
+-    URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4"
+-    CONFIGURE_COMMAND ../protobuf/configure --prefix=${EXTERNAL_PREFIX} --enable-static --with-protoc=${PROTOC_PATH} ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS}
+-    DEPENDS protoc
+-)
+ 
+ add_custom_command(
+     COMMENT "Compiling protobuf"
+     OUTPUT ${GENERATED_SOURCES_PATH}/kinetic_client.pb.h ${GENERATED_SOURCES_PATH}/kinetic_client.pb.cc
+     COMMAND mkdir -p ${GENERATED_SOURCES_PATH} && sed 's/com\\.seagate\\.kinetic\\.proto/com.seagate.kinetic.client.proto/' ${PROTO_ORIG_PATH} > ${PROTO_MODIFIED_PATH} && ${PROTOC_PATH} -I=${PROTO_DIR} --cpp_out=${GENERATED_SOURCES_PATH} ${PROTO_MODIFIED_PATH}
+-    DEPENDS kinetic-proto protoc protobuf
+ )
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_SOURCES_PATH})
+ 
+@@ -157,21 +70,10 @@ include_directories(
+ 
+     src/test/mock
+     src/test
+-
+-    ${EXTERNAL_PREFIX}/include
+-    ${EXTERNAL_PREFIX}/src/gmock/include
+-    ${EXTERNAL_PREFIX}/src/gtest/include
+ )
+ 
+ set(LIBRARY_DEPENDENCIES
+     kinetic_client
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libglog.a
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libgflags.a
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libssl.a
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libcrypto.a
+-    ${CMAKE_BINARY_DIR}/vendor/lib/libprotobuf.a
+-    ${CMAKE_BINARY_DIR}/vendor/src/gtest/libgtest.a
+-    ${CMAKE_BINARY_DIR}/vendor/src/gmock/libgmock.a
+     ${CMAKE_THREAD_LIBS_INIT}
+     dl
+ )
+@@ -180,12 +82,68 @@ set(LIBRARY_DEPENDENCIES
+ # Otherwise glog uses the standard glibc unwinder and there is no dependency.
+ find_library(LIBUNWIND "unwind")
+ if(LIBUNWIND)
+-    set(LIBRARY_DEPENDENCIES 
+-        ${LIBRARY_DEPENDENCIES} 
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
+         ${LIBUNWIND}
+     )
+ endif()
+ 
++find_library(LIBSSL "ssl")
++if(LIBSSL)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBSSL}
++    )
++endif()
++
++find_library(LIBCRYPTO "crypto")
++if(LIBCRYPTO)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBCRYPTO}
++    )
++endif()
++
++find_library(LIBPROTOBUF "protobuf")
++if(LIBPROTOBUF)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBPROTOBUF}
++    )
++endif()
++
++find_library(LIBGLOG "glog")
++if(LIBGLOG)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBGLOG}
++    )
++endif()
++
++find_library(LIBGFLAGS "gflags")
++if(LIBGFLAGS)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBGFLAGS}
++    )
++endif()
++
++find_library(LIBGMOCK "gmock")
++if(LIBGMOCK)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBGMOCK}
++    )
++endif()
++
++find_library(LIBGTEST "gtest")
++if(LIBGTEST)
++    set(LIBRARY_DEPENDENCIES
++        ${LIBRARY_DEPENDENCIES}
++		${LIBGTEST}
++    )
++endif()
++
+ add_library(kinetic_client
+     src/main/generated/kinetic_client.pb.cc
+     src/main/hmac_provider.cc
+diff --git a/src/test/kinetic_cpp_client_test.cc b/src/test/kinetic_cpp_client_test.cc
+index 2079fab..c5004a2 100644
+--- a/src/test/kinetic_cpp_client_test.cc
++++ b/src/test/kinetic_cpp_client_test.cc
+@@ -22,6 +22,7 @@
+ 
+ #include <iostream>
+ 
++#include "gflags/gflags.h"
+ #include "gtest/gtest.h"
+ #include "glog/logging.h"
+ 
diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix
new file mode 100644
index 00000000000..9a11c85bd76
--- /dev/null
+++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog
+, google-gflags, gmock, gtest
+}:
+
+let
+  protoTar = fetchurl {
+    url = "http://github.com/Seagate/kinetic-protocol/archive/3.0.0.tar.gz";
+    sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48";
+  };
+in
+stdenv.mkDerivation rec {
+  name = "kinetic-cpp-client-2015-04-14";
+
+  src = fetchgit {
+    url = "git://github.com/Seagate/kinetic-cpp-client.git";
+    rev = "015085a5c89db0398f80923053f36b9e0611e107";
+    sha256 = "15iwlfjwnyswiwssdjg6qiflhddh66nv07xji4yhz1s4vqhk3nrx";
+  };
+
+  patches = [ ./build-fix.patch ];
+
+  postPatch = ''
+    mkdir -p build/kinetic-proto
+    tar -x --strip-components 1 -C build/kinetic-proto -f ${protoTar}
+  '';
+
+  nativeBuildInputs = [ cmake protobuf ];
+  buildInputs = [ libunwind glog google-gflags gmock gtest ];
+
+  # The headers and library include from these and there is no provided pc file
+  propagatedBuildInputs = [ protobuf openssl ];
+
+  cmakeFlags = [
+    "-DBUILD_SHARED_LIBS=true"
+  ];
+
+  preCheck = ''
+    # The checks cannot find libkinetic_client.so otherwise
+    export LD_LIBRARY_PATH="$(pwd)"
+  '';
+
+  installPhase = ''
+    # There is no included install script so do our best
+    mkdir -p $out/lib
+    cp libkinetic_client.so $out/lib
+    cp -r ../include $out
+    cp ../src/main/generated/kinetic_client.pb.h $out/include
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Seagate/kinetic-cpp-client;
+    description = "code for producing C and C++ kinetic clients";
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index 44e800b6f1e..72b364bb364 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib
+{ lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib, libcap
 , usePulseAudio }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig ] ++
+    [ pkgconfig libcap ] ++
     lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]);
 
   meta = {
diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix
new file mode 100644
index 00000000000..bc21237e238
--- /dev/null
+++ b/pkgs/development/libraries/libasyncns/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libasyncns-0.8";
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/libasyncns/${name}.tar.gz";
+    sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://0pointer.de/lennart/projects/libasyncns/;
+    description = "a C library for Linux/Unix for executing name service queries asynchronously";
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix
index 73ca029a631..51f62b9bd5f 100644
--- a/pkgs/development/libraries/libavc1394/default.nix
+++ b/pkgs/development/libraries/libavc1394/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
   meta = { 
     description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set";
     homepage = http://sourceforge.net/projects/libavc1394/;
-    license = [ "GPL" "LGPL" ];
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index e69cd4ed2ac..0d9474e585e 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null
+{ stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
 , alsaLib, pulseaudio, gstreamer, gst_plugins_base, libvorbis }:
 
 stdenv.mkDerivation rec {
@@ -9,8 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
   };
 
-  buildInputs = # ToDo: gstreamer not found (why?), add (g)udev?
-    [ pkgconfig libtool alsaLib pulseaudio /*gstreamer gst_plugins_base*/ libvorbis gtk ];
+  buildInputs = [
+    pkgconfig libtool alsaLib pulseaudio libvorbis gtk libcap
+    /*gstreamer gst_plugins_base*/      # ToDo: gstreamer not found (why?), add (g)udev?
+  ];
 
   configureFlags = "--disable-oss";
 
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 9cdf9d411cc..1a3c33eb80a 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -2,11 +2,11 @@
 , clutter_gtk, libsoup /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
-  name = "libchamplain-0.12.2";
+  name = "libchamplain-0.12.10";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.2.tar.xz;
-    sha256 = "0bkyzm378gh6qs7grr2vgzrl4z1pi99yysy8iwzdqzs0bs3rfgyj";
+    url = "mirror://gnome/sources/libchamplain/0.12/${name}.tar.xz";
+    sha256 = "019b8scnx7d3wdylmpk9ihzh06w25b63x9cn8nhj6kjx82rcwlxz";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix
new file mode 100644
index 00000000000..5d5a9e49381
--- /dev/null
+++ b/pkgs/development/libraries/libclthreads/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, }:
+
+stdenv.mkDerivation rec {
+  name = "libclthreads-${version}";
+  version = "2.4.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clthreads-${version}.tar.bz2";
+    sha256 = "1s8xx99z6llv46cvkllmd72v2pkzbfl5gngcql85mf14mxkdb7x6";
+  };
+
+  configurePhase = ''
+    sed -e "s@/usr/local@$out@" -i Makefile
+    sed -e "s@/usr/bin/install@install@" -i Makefile
+    sed -e "s@/sbin/ldconfig@ldconfig@" -i Makefile
+    sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile
+  '';
+
+  meta = {
+    description = "zita thread library";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix
new file mode 100644
index 00000000000..7d0e4596dd0
--- /dev/null
+++ b/pkgs/development/libraries/libclxclient/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, libclthreads, libXft, libX11, xlibs }:
+
+stdenv.mkDerivation rec {
+  name = "libclxclient-${version}";
+  version = "3.9.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/clxclient-${version}.tar.bz2";
+    sha256 = "14l7xrh964gllymraq4n5pgax94p5jsfjslqi5c6637zc4lmgnl0";
+  };
+
+  buildInputs = [
+    libclthreads libXft libX11 xlibs.xproto
+  ];
+
+  configurePhase = ''
+    cpp -v
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${xlibs.xproto}/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libXft}/include"
+    echo $NIX_CFLAGS_COMPILE
+    sed -e "s@/usr/local@$out@" -i Makefile
+    sed -e "s@#include <clthreads.h>@#include <${libclthreads}/include>@" -i clxclient.h
+    sed -e "s@ldconfig@@" -i Makefile
+    sed -e "s@SUFFIX :=.*@SUFFIX =@" -i Makefile
+  '';
+
+  fixupPhase = ''
+    ln $out/lib/libclxclient.so $out/lib/libclxclient.so.3
+  '';
+
+  meta = {
+    description = "zita X11 library";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.lgpl21;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 841edd3dff6..bcc9e9f673f 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -20,9 +20,9 @@ stdenv.mkDerivation {
   buildInputs = [ autoconf automake libtool pkgconfig perl git libevent openssl];
 
   meta = {
-    description = "C client library for Couchbase.";
+    description = "C client library for Couchbase";
     homepage = "https://github.com/couchbase/libcouchbase";
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.unix;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index 8836b0bffa2..ccc0a199654 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libdbi
-, mysql ? null, sqlite ? null, postgresql ? null
+, libmysql ? null, sqlite ? null, postgresql ? null
 }:
 
 with stdenv.lib;
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0m680h8cc4428xin4p733azysamzgzcmv4psjvraykrsaz6ymlj3";
   };
 
-  buildInputs = [ libdbi sqlite postgresql ]
-    ++ optional (mysql != null) mysql.lib;
+  buildInputs = [ libdbi libmysql sqlite postgresql ];
 
   postPatch = ''
     sed -i '/SQLITE3_LIBS/ s/-lsqlite/-lsqlite3/' configure;
@@ -25,10 +24,10 @@ stdenv.mkDerivation rec {
     "--enable-libdbi"
     "--with-dbi-incdir=${libdbi}/include"
     "--with-dbi-libdir=${libdbi}/lib"
-  ] ++ optionals (mysql != null) [
+  ] ++ optionals (libmysql != null) [
     "--with-mysql"
-    "--with-mysql-incdir=${mysql.lib}/include/mysql"
-    "--with-mysql-libdir=${mysql.lib}/lib/mysql"
+    "--with-mysql-incdir=${libmysql}/include/mysql"
+    "--with-mysql-libdir=${libmysql}/lib/mysql"
   ] ++ optionals (postgresql != null) [
     "--with-pgsql"
     "--with-pgsql_incdir=${postgresql}/include"
diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix
index 3213c0634ba..e8c374297d3 100644
--- a/pkgs/development/libraries/libdv/default.nix
+++ b/pkgs/development/libraries/libdv/default.nix
@@ -1,28 +1,31 @@
-{ composableDerivation, fetchurl }:
-
-let inherit (composableDerivation) edf; in
-
-composableDerivation.composableDerivation {} {
-
-  flags = { }
-    # TODO! implement flags
-    # I want to get kino and cinelerra working. That's why I don't spend more time on this now
-    // edf { name = "libtool_lock"; } #avoid locking (might break parallel builds)
-    // edf { name ="asm"; } #disable use of architecture specific assembly code
-    // edf { name ="sdl"; } #enable use of SDL for display
-    // edf { name ="gtk"; } #disable use of gtk for display
-    // edf { name ="xv"; } #disable use of XVideo extension for display
-    // edf { name ="gprof"; }; #enable compiler options for gprof profiling
+{ stdenv, fetchurl, popt }:
 
+stdenv.mkDerivation rec {
   name = "libdv-1.0.0";
 
   src = fetchurl {
-    url = mirror://sourceforge/libdv/libdv-1.0.0.tar.gz;
+    url = "mirror://sourceforge/libdv/${name}.tar.gz";
     sha256 = "1fl96f2xh2slkv1i1ix7kqk576a0ak1d33cylm0mbhm96d0761d3";
   };
 
-  meta = {
+  # This fixes an undefined symbol: _sched_setscheduler error on compile.
+  # See the apple docs: http://cl.ly/2HeF bottom of the "Finding Imported Symbols" section
+  LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup";
+
+  configureFlags = [
+    "--disable-asm"
+    "--disable-sdl"
+    "--disable-gtk"
+    "--disable-xv"
+    "--disable-gprof"
+  ];
+
+  buildInputs = [ popt ];
+
+  meta = with stdenv.lib; {
     description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards";
     homepage = http://sourceforge.net/projects/libdv/;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index 9eee0d40654..61bb15dde7d 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, groff }:
 
 stdenv.mkDerivation rec {
-  name = "libedit-20140620-3.1";
+  name = "libedit-20150325-3.1";
 
   src = fetchurl {
     url = "http://www.thrysoee.dk/editline/${name}.tar.gz";
-    sha256 = "1wnapwcpl4yq8p95j898jl0hsr39if28qzm5a7zwkbplihm9nax2";
+    sha256 = "1if8zi9h52m80ck796an28rrqfljk2n8cn25m3fl0prwz155x2n8";
   };
 
   # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
@@ -23,5 +23,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.thrysoee.dk/editline/";
     description = "A port of the NetBSD Editline library (libedit)";
     license = licenses.bsd3; 
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index fd16866ccee..9a003de80f1 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.3.1";
+  name = "libevdev-1.4.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "0hr6xjp7vcnr7lnr1il03235rcslqb95yv7j88qh51q0bwcpcz2b";
+    sha256 = "11dfiz7pkb2jbavr1ba8phn86qavvgf1xwlxmfs69mqxlz4x6yai";
   };
 
   buildInputs = [ python ];
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 57cf1738342..74524164dd0 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, python }:
+{ stdenv, fetchFromGitHub, autoreconfHook, python }:
 
-let version = "2.0.21"; in
+let version = "2.0.22"; in
 stdenv.mkDerivation {
   name = "libevent-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/downloads/libevent/libevent/libevent-${version}-stable.tar.gz";
-    sha256 = "1xblymln9vihdmf1aqkp8chwvnhpdch3786bh30bj75slnl31992";
+  src = fetchFromGitHub {
+    owner = "libevent";
+    repo = "libevent";
+    rev = "release-${version}-stable";
+    sha256 = "1x2437af9j870i7l37dav1i2g9z93lbz406kyimx4nq5qcx5463p";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ python ];
+
   patchPhase = ''
-    substituteInPlace event_rpcgen.py \
-      --replace "/usr/bin/env python2" "${python}/bin/python"
+    patchShebangs event_rpcgen.py
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Event notification library";
 
     longDescription =
@@ -29,7 +33,8 @@ stdenv.mkDerivation {
          the event loop.
       '';
 
-    license = "mBSD";
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix
index 0be604c6246..530b04e8b42 100644
--- a/pkgs/development/libraries/libffcall/default.nix
+++ b/pkgs/development/libraries/libffcall/default.nix
@@ -1,38 +1,28 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchcvs }:
 
-  version = a.lib.attrByPath ["version"] "2009-05-27" a; 
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
-  src = a.fetchcvs {
+stdenv.mkDerivation rec {
+  name = "libffcall-${version}";
+  version = "2009-05-27";
+  src = fetchcvs {
     cvsRoot = ":pserver:anonymous@cvs.savannah.gnu.org:/sources/libffcall";
     module = "ffcall";
     date = version;
-    sha256 = "91bcb5a20c85a9ccab45886aae8fdbbcf1f20f995ef898e8bdd2964448daf724";
+    sha256 = "097pv94495njppl9iy2yk47z5wdwvf7swsl88nmwrac51jibbg4i";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  doConfigure = a.fullDepEntry (''
+  configurePhase = ''
     for i in ./configure */configure; do
       cwd="$PWD"
-      cd "$(dirname "$i")"; 
+      cd "$(dirname "$i")";
       ( test -f Makefile && make distclean ) || true
       ./configure --prefix=$out
       cd "$cwd"
     done
-  '') a.doConfigure.deps;
+  '';
 
-  name = "libffcall-" + version;
   meta = {
     description = "Foreign function call library";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 586d48a8daa..23ccfc69df4 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libgpg-error-1.18";
+  name = "libgpg-error-1.19";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "0408v19h3h0q6w61g51hgbdg6cyw81nyzkh70qfprvsc3pkddwcz";
+    sha256 = "12wpqhjlsw4iaanifbqm2kich6c7x7lm8a7zhy6x5ifm6c9hw4jk";
   };
 
   postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";
diff --git a/pkgs/development/libraries/libibverbs/default.nix b/pkgs/development/libraries/libibverbs/default.nix
index 38f94e7992d..5ce1e5cbdf6 100644
--- a/pkgs/development/libraries/libibverbs/default.nix
+++ b/pkgs/development/libraries/libibverbs/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://www.openfabrics.org/;
     license = licenses.bsd2;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ freebsd;
     maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 5aea194e39d..44aa546fe00 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.29";
+  name = "libidn-1.30";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c";
+    sha256 = "0lxh5r1z8gsk4jxx3rv8aasjv8p53j4y04kvfn2w30a0syagrf9r";
   };
 
   doCheck = ! stdenv.isDarwin;
diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix
index d1337604260..2cba1b0dd3c 100644
--- a/pkgs/development/libraries/libiec61883/default.nix
+++ b/pkgs/development/libraries/libiec61883/default.nix
@@ -11,11 +11,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ pkgconfig ];
-  
+
   propagatedBuildInputs = [ libraw1394 ];
 
-  meta = { 
+  meta = with stdenv.lib; {
     homepage = http://www.linux1394.org;
-    license = "LGPL";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index a05d176554e..c1519ca5b83 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, gnutls, libgcrypt,
-  libtasn1, libplist, readline }:
+{ stdenv, fetchurl, python, pkgconfig, usbmuxd, glib, libgcrypt,
+  libtasn1, libplist, readline, libusbmuxd, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "libimobiledevice-1.0.7";
+  name = "libimobiledevice-1.2.0";
 
   nativeBuildInputs = [ python libplist.swig pkgconfig ];
   buildInputs = [ readline ];
-  propagatedBuildInputs = [ usbmuxd glib gnutls libgcrypt libtasn1 libplist ];
+  propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
 
   patchPhase = ''sed -e 's@1\.3\.21@@' -i configure'';
   passthru.swig = libplist.swig;
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.bz2";
-    sha256 = "15jznqc52yfwkbw19hgv3r1qd4gcymakbfkyizmr6v4n0sn27n0f";
+    sha256 = "0dqhy4qwj30mw8pwckvjmgnj1qqrh6p8c6jknmhvylshhzh0ssvq";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 80ad7879e10..0c55353c30c 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-0.13.0";
+  name = "libinput-0.14.1";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "06n6ih2bfr957rprsgjxhi6f7m96wmf4kgac8y0ispsjvrzszv3c";
+    sha256 = "0r0v5jqbnwgndq6ns3ss3kv1438ny302m7bg1najcl1dpqp21v9b";
   };
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 1293c2245ac..26aa974a7ee 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  name = "libksba-1.3.2";
+  name = "libksba-1.3.3";
 
   src = fetchurl {
     url = "mirror://gnupg/libksba/${name}.tar.bz2";
-    sha256 = "01l4hvcknk9nb4bvyb6aqaid19jg0wv3ik54j1b89hnzamwm75gb";
+    sha256 = "11kp3h9l3b8ikydkcdkwgx45r662zi30m26ra5llyhfh6kz5yzqc";
   };
 
   propagatedBuildInputs = [ libgpgerror ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 100f91d966f..54862e0482b 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.72";
+  version = "0.7.73";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2";
-    sha256 = "1ndfag9a7yl8j1iwxgd2d8slwzc0ifmzg9zf8lg7fsqsa9c3s7m6";
+    sha256 = "1c7yc9m4fdrfdlb80g6157sa8s0wlv892pixrfdzfljsqayxnl6k";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];
diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index 3e95f944caf..2146562c5cb 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchurl, texinfo }:
+{ stdenv, fetchurl, texinfo, alsaLib, pulseaudio }:
 
 stdenv.mkDerivation rec {
   name = "libmikmod-3.3.7";
-
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/mikmod/libmikmod/3.3.7/libmikmod-3.3.7.tar.gz";
+    url = "mirror://sourceforge/mikmod/${name}.tar.gz";
     sha256 = "18nrkf5l50hfg0y50yxr7bvik9f002lhn8c00nbcp6dgm5011x2c";
   };
 
-  buildInputs = [ texinfo ];
+  buildInputs = [ texinfo ]
+    ++ stdenv.lib.optional stdenv.isLinux [ alsaLib pulseaudio ];
+  propagatedBuildInputs =
+    stdenv.lib.optional stdenv.isLinux pulseaudio;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lasound";
 
   meta = with stdenv.lib; {
     description = "A library for playing tracker music module files";
diff --git a/pkgs/development/libraries/libmodplug/default.nix b/pkgs/development/libraries/libmodplug/default.nix
index c1fb0033aa9..600d7faace2 100644
--- a/pkgs/development/libraries/libmodplug/default.nix
+++ b/pkgs/development/libraries/libmodplug/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
     description = "MOD playing library";
     homepage    = "http://modplug-xmms.sourceforge.net/";
     license     = licenses.publicDomain;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
     maintainers = with maintainers; [ raskin ];
   };
 
diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
index 197892897f3..97319840975 100644
--- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libmnl ];
 
   meta = {
-    description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure.";
+    description = "Userspace library that provides the programming interface to the user-space connection tracking helper infrastructure";
     longDescription = ''
       libnetfilter_cthelper is the userspace library that provides the programming interface
       to the user-space helper infrastructure available since Linux kernel 3.6. With this
diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
index 0626e91b8ba..2920cbd9785 100644
--- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
+++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig libmnl ];
 
   meta = {
-    description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure.";
+    description = "Userspace library that provides the programming interface to the connection tracking timeout infrastructure";
     longDescription = ''
       libnetfilter_cttimeout is the userspace library that provides the programming
       interface to the fine-grain connection tracking timeout infrastructure.
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 557e448e2d4..460aaa2b0ec 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fixedPoint ? false, withCustomModes ? false }:
+{ stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }:
 
 let
   version = "1.1";
@@ -16,9 +16,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Open, royalty-free, highly versatile audio codec";
     license = stdenv.lib.licenses.bsd3;
     homepage = http://www.opus-codec.org/;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix
index 6ff5d816776..334748d668c 100644
--- a/pkgs/development/libraries/libosmpbf/default.nix
+++ b/pkgs/development/libraries/libosmpbf/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/scrosby/OSM-binary;
-    description = "C library to read and write OpenStreetMap PBF files.";
+    description = "C library to read and write OpenStreetMap PBF files";
     license = stdenv.lib.licenses.lgpl3;
   };
 }
diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix
index 95da6dfb749..0b9b7bd2f54 100644
--- a/pkgs/development/libraries/libplist/default.nix
+++ b/pkgs/development/libraries/libplist/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, cmake, libxml2, swig2, python, glib }:
+{ stdenv, fetchurl, pkgconfig, libxml2, swig2, python, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libplist-1.3";
+  name = "libplist-1.12";
 
-  nativeBuildInputs = [ cmake swig2 ];
+  nativeBuildInputs = [ pkgconfig swig2 ];
 
-  patches = [ ./swig.patch ];
+  #patches = [ ./swig.patch ];
 
   propagatedBuildInputs = [ libxml2 glib python ];
 
   passthru.swig = swig2;
 
   src = fetchurl {
-    url = "http://github.com/downloads/JonathanBeck/libplist/${name}.tar.bz2";
-    sha256 = "1c5nwp9jbsp5kx8avmmsr5g7qdngnqlplh2sjbygmhydb6n8lb4q";
+    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    sha256 = "1gj4nv0bvdm5y2sqm2vj2rn44k67ahw3mh6q614qq4nyngfdxzqf";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/libraw1394/default.nix b/pkgs/development/libraries/libraw1394/default.nix
index 81cac5be709..bd6cbc3682c 100644
--- a/pkgs/development/libraries/libraw1394/default.nix
+++ b/pkgs/development/libraries/libraw1394/default.nix
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0w5sw06p51wfq2ahgql93ljkkp3hqprifzcxq8dq71c8zcbgyg58";
   };
 
-  meta = { 
+  meta = with stdenv.lib; {
     description = "Library providing direct access to the IEEE 1394 bus through the Linux 1394 subsystem's raw1394 user space interface";
     homepage = "https://ieee1394.wiki.kernel.org/index.php/Libraries#libraw1394";
-    license = ["GPL" "LGPL"];
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/librdmacm/default.nix b/pkgs/development/libraries/librdmacm/default.nix
index 843ff62530b..498463b2aea 100644
--- a/pkgs/development/libraries/librdmacm/default.nix
+++ b/pkgs/development/libraries/librdmacm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.openfabrics.org/;
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ freebsd;
     license = licenses.bsd2;
     maintainers = with maintainers; [ wkennington ];
   };
diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix
index 2abe01decb7..314508cc5c2 100644
--- a/pkgs/development/libraries/librep/default.nix
+++ b/pkgs/development/libraries/librep/default.nix
@@ -1,18 +1,17 @@
-
-	{ stdenv, fetchgit
+{ stdenv, fetchurl
 , pkgconfig, autoreconfHook
 , readline, texinfo
 , gdbm, gmp, libffi }:
 
 with stdenv.lib;
-stdenv.mkDerivation rec {
 
-  name = "librep-git-2015-02-15";
+stdenv.mkDerivation rec {
+  name = "librep-${version}";
+  version = "0.92.5";
 
-  src = fetchgit {
-    url = "https://github.com/SawfishWM/librep.git";
-    rev = "a1f2db721aa5055e90f6a76fde625946340ed8cf";
-    sha256 = "c91484d02b2408becc8961997c3d6404aefa8e1f8af4621a8b5f7622b1857fa6";
+  src = fetchurl {
+    url = "https://github.com/SawfishWM/librep/archive/${name}.tar.gz";
+    sha256 = "1ly425cgs0yi3lb5l84v3bacljw7m2nmzgky3acy1anp709iwi76";
   };
 
   buildInputs = [ pkgconfig autoreconfHook readline texinfo ];
@@ -25,15 +24,12 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    description = "Lisp system for Sawfish";
+    description = "Fast, lightweight, and versatile Lisp environment";
     longDescription = ''
-      This is librep, a Lisp system for UNIX, needed by Sawfish window manager.
-      It contains a Lisp interpreter, byte-code compiler and virtual machine.
-      Applications may use the Lisp interpreter as an extension language,
-      or it may be used for stand-alone scripts.
-
-      The Lisp dialect was originally inspired by Emacs Lisp, but with the worst
-      features removed. It also borrows many ideas from Scheme.
+      librep is a Lisp system for UNIX, comprising an
+      interpreter, a byte-code compiler, and a virtual
+      machine. It can serve as an application extension language
+      but is also suitable for standalone scripts.
     '';
     homepage = http://sawfish.wikia.com;
     license = licenses.gpl2;
diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix
new file mode 100644
index 00000000000..76daf7d748b
--- /dev/null
+++ b/pkgs/development/libraries/librsync/0.9.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "librsync-0.9.7";
+  
+  src = fetchurl {
+    url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz;
+    sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6";
+  };
+
+  configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared";
+
+  crossAttrs = {
+    dontStrip = true;
+  };
+
+  meta = {
+    homepage = http://librsync.sourceforge.net/;
+    license = stdenv.lib.licenses.lgpl2Plus;
+    description = "Implementation of the rsync remote-delta algorithm";
+  };
+}
diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix
new file mode 100644
index 00000000000..3d8699918e1
--- /dev/null
+++ b/pkgs/development/libraries/libs3/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, curl, libxml2 }:
+
+stdenv.mkDerivation {
+  name = "libs3-2015-01-09";
+
+  src = fetchFromGitHub {
+    owner = "bji";
+    repo = "libs3";
+    rev = "4d21fdc0857b88c964649b321057d7105d1e4da3";
+    sha256 = "1c33h8lzlpmsbkymd2dac9g8hqhd6j6yzdjrhha8bcqyys6vcpy3";
+  };
+
+  buildInputs = [ curl libxml2 ];
+
+  DESTDIR = "\${out}";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/bji/libs3;
+    description = "a library for interfacing with amazon s3";
+    licenses = licenses.gpl3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index c4bdc23f937..b9aa9522564 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage    = http://www.mega-nerd.com/libsndfile/;
     license     = licenses.lgpl2Plus;
     maintainers = with maintainers; [ lovek323 ];
-    platfomrs   = platforms.unix;
+    platforms   = platforms.unix;
 
     longDescription = ''
       Libsndfile is a C library for reading and writing files containing
diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix
new file mode 100644
index 00000000000..edc3d3df9cb
--- /dev/null
+++ b/pkgs/development/libraries/libusbmuxd/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, libplist }:
+
+stdenv.mkDerivation rec {
+  name = "libusbmuxd-1.0.10";
+  src = fetchurl {
+    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    sha256 = "1wn9zq2224786mdr12c5hxad643d29wg4z6b7jn888jx4s8i78hs";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libplist ];
+
+  meta = {
+    homepage = "http://www.libimobiledevice.org";
+  };
+}
diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 4da60397444..a6da96dc863 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";
-
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index a7c80077e79..6a475667078 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -1,149 +1,148 @@
-{stdenv, fetchurl, bash, perl, yasm
-, vp8Support ? true # VP8
+{stdenv, fetchFromGitHub, perl, yasm
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
-, vp9Support ? true # VP9
 , vp9DecoderSupport ? true # VP9 decoder
 , vp9EncoderSupport ? true # VP9 encoder
 , extraWarningsSupport ? false # emit non-fatal warnings
 , werrorSupport ? false # treat warnings as errors (not available with all compilers)
-, installBinsSupport ? true # install binaries (vpxdec & vpxenc)
-, installLibsSupport ? true # install libraries
-, installSrcsSupport ? false # install sources
 , debugSupport ? false # debug mode
 , gprofSupport ? false # gprof profiling instrumentation
 , gcovSupport ? false # gcov coverage instrumentation
+, sizeLimitSupport ? true # limit max size to allow in the decoder
 , optimizationsSupport ? true # compiler optimization flags
 , runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
 , thumbSupport ? false # build arm assembly in thumb mode
-, libsSupport ? true # build librares
 , examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
 , fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
-, codecSrcsSupport ? false # codec library source code
 , debugLibsSupport ? false # include debug version of each library
-, md5Support ? true # support for output of checksum data
 , postprocSupport ? true # postprocessing
-, vp9PostprocSupport ? true # VP9 specific postprocessing
 , multithreadSupport ? true # multithreaded decoding & encoding
 , internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
 , memTrackerSupport ? false # track memory usage
+, spatialResamplingSupport ? true # spatial sampling (scaling)
 , realtimeOnlySupport ? false # build for real-time encoding
 , ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding
 , errorConcealmentSupport ? false # decoder conceals losses
 , smallSupport ? false # favor smaller binary over speed
 , postprocVisualizerSupport ? false # macro block/block level visualizers
 , unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests
+, webmIOSupport ? true # input from and output to webm container
+, libyuvSupport ? true # libyuv
+, decodePerfTestsSupport ? false # build decoder perf tests with unit tests
+, encodePerfTestsSupport ? false # build encoder perf tests with unit tests
 , multiResEncodingSupport ? false # multiple-resolution encoding
 , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
-, decryptSupport ? false
+, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
+, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
 , experimentalSupport ? false # experimental features
 # Experimental features
-, experimentalMultipleArfSupport ? false
-, experimentalNon420Support ? false
-, experimentalAlphaSupport ? false
+, experimentalSpatialSvcSupport ? false # Spatial scalable video coding
+, experimentalFpMbStatsSupport ? false
+, experimentalEmulateHardwareSupport ? false
 }:
 
-assert (vp8Support || vp9Support);
-assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport);
-assert vp8DecoderSupport -> vp8Support;
-assert vp8EncoderSupport -> vp8Support;
-assert vp9DecoderSupport -> vp9Support;
-assert vp9EncoderSupport -> vp9Support;
-assert installLibsSupport -> libsSupport;
-# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc)
-assert installBinsSupport -> examplesSupport;
-assert examplesSupport -> md5Support;
-assert vp9PostprocSupport -> (vp9Support && postprocSupport);
-assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport;
-assert postprocVisualizerSupport -> postprocSupport;
-assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport;
-assert unitTestsSupport -> ((curl != null) && (coreutils != null));
-assert (experimentalMultipleArfSupport || experimentalNon420Support || experimentalAlphaSupport) -> experimentalSupport;
-assert stdenv.isCygwin -> unitTestsSupport;
-
 let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
+  inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin;
+  inherit (stdenv.lib) enableFeature optional optionals;
 in
 
-with stdenv.lib;
+assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support
+
+assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
+assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
+/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
+   Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
+   but is only executed if spatialResamplingSupport is enabled */
+assert spatialResamplingSupport;
+assert postprocVisualizerSupport -> postprocSupport;
+assert unitTestsSupport -> curl != null && coreutils != null;
+assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
+assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
+
 stdenv.mkDerivation rec {
   name = "libvpx-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
-  src = fetchurl {
-    url = "http://webm.googlecode.com/files/libvpx-v${version}.tar.bz2";
-    sha1 = "191b95817aede8c136cc3f3745fb1b8c50e6d5dc";
+  src = fetchFromGitHub {
+    owner = "webmproject";
+    repo = "libvpx";
+    rev = "v${version}";
+    sha256 = "1y8cf2q5ij8z8ab5j36m18rbs62aah6sw6shzbs3jr70ja0z6n8s";
   };
 
-  patchPhase = ''
-    patchShebangs .
-  '';
-
-  nativeBuildInputs = [ bash perl yasm ];
-
-  buildInputs = [ ]
-    ++ optional unitTestsSupport coreutils
-    ++ optional unitTestsSupport curl;
+  patchPhase = ''patchShebangs .'';
 
   configureFlags = [
-    (mkFlag vp8Support "vp8")
-    (mkFlag vp8EncoderSupport "vp8-encoder")
-    (mkFlag vp8DecoderSupport "vp8-decoder")
-    (mkFlag vp9Support "vp9")
-    (mkFlag vp9EncoderSupport "vp9-encoder")
-    (mkFlag vp9DecoderSupport "vp9-decoder")
-    (mkFlag extraWarningsSupport "extra-warnings")
-    (mkFlag werrorSupport "werror")
+    (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
+    (enableFeature vp8EncoderSupport "vp8-encoder")
+    (enableFeature vp8DecoderSupport "vp8-decoder")
+    (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
+    (enableFeature vp9EncoderSupport "vp9-encoder")
+    (enableFeature vp9DecoderSupport "vp9-decoder")
+    (enableFeature extraWarningsSupport "extra-warnings")
+    (enableFeature werrorSupport "werror")
     "--disable-install-docs"
-    (mkFlag installBinsSupport "install-bins")
-    (mkFlag installLibsSupport "install-libs")
-    (mkFlag installSrcsSupport "install-srcs")
-    (mkFlag debugSupport "debug")
-    (mkFlag gprofSupport "gprof")
-    (mkFlag gcovSupport "gcov")
+    (enableFeature examplesSupport "install-bins")
+    "--enable-install-libs"
+    "--disable-install-srcs"
+    (enableFeature debugSupport "debug")
+    (enableFeature gprofSupport "gprof")
+    (enableFeature gcovSupport "gcov")
     # Required to build shared libraries
-    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic")
-    (mkFlag (stdenv.isx86_64 || !stdenv.isDarwin || stdenv.isCygwin) "use-x86inc")
-    (mkFlag optimizationsSupport "optimizations")
-    (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect")
-    (mkFlag thumbSupport "thumb")
-    (mkFlag libsSupport "libs")
-    (mkFlag examplesSupport "examples")
+    (enableFeature (!isCygwin) "pic")
+    (enableFeature (isi686 || isx86_64) "use-x86inc")
+    (enableFeature optimizationsSupport "optimizations")
+    (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
+    (enableFeature thumbSupport "thumb")
+    "--enable-libs"
+    (enableFeature examplesSupport "examples")
     "--disable-docs"
     "--as=yasm"
-    (mkFlag fastUnalignedSupport "fast-unaligned")
-    (mkFlag codecSrcsSupport "codec-srcs")
-    (mkFlag debugLibsSupport "debug-libs")
-    (mkFlag md5Support "md5")
-    (mkFlag stdenv.isMips "dequant-tokens")
-    (mkFlag stdenv.isMips "dc-recon")
-    (mkFlag postprocSupport "postproc")
-    (mkFlag vp9PostprocSupport "vp9-postproc")
-    (mkFlag multithreadSupport "multithread")
-    (mkFlag internalStatsSupport "internal-stats")
-    (mkFlag memTrackerSupport "mem-tracker")
-    /* If --enable-spatial-resampling not enabled, build will fail with undeclared variable errors.
-       Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
-       but is only executed if --enable-spatial-resampling is enabled */
-    "--enable-spatial-resampling"
-    (mkFlag realtimeOnlySupport "realtime-only")
-    (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking")
-    (mkFlag errorConcealmentSupport "error-concealment")
+    # Limit default decoder max to WHXGA
+    (if sizeLimitSupport then "--size-limit=5120x3200" else null)
+    (enableFeature fastUnalignedSupport "fast-unaligned")
+    "--disable-codec-srcs"
+    (enableFeature debugLibsSupport "debug-libs")
+    (enableFeature isMips "dequant-tokens")
+    (enableFeature isMips "dc-recon")
+    (enableFeature postprocSupport "postproc")
+    (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
+    (enableFeature multithreadSupport "multithread")
+    (enableFeature internalStatsSupport "internal-stats")
+    (enableFeature memTrackerSupport "mem-tracker")
+    (enableFeature spatialResamplingSupport "spatial-resampling")
+    (enableFeature realtimeOnlySupport "realtime-only")
+    (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
+    (enableFeature errorConcealmentSupport "error-concealment")
     # Shared libraries are only supported on ELF platforms
-    (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static")
-    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared")
-    (mkFlag smallSupport "small")
-    (mkFlag postprocVisualizerSupport "postproc-visualizer")
-    (mkFlag unitTestsSupport "unit-tests")
-    (mkFlag multiResEncodingSupport "multi-res-encoding")
-    (mkFlag temporalDenoisingSupport "temporal-denoising")
-    (mkFlag decryptSupport "decrypt")
-    (mkFlag experimentalSupport "experimental")
+    (if isDarwin || isCygwin then
+       "--enable-static --disable-shared"
+     else
+       "--disable-static --enable-shared")
+    (enableFeature smallSupport "small")
+    (enableFeature postprocVisualizerSupport "postproc-visualizer")
+    (enableFeature unitTestsSupport "unit-tests")
+    (enableFeature webmIOSupport "webm-io")
+    (enableFeature libyuvSupport "libyuv")
+    (enableFeature decodePerfTestsSupport "decode-perf-tests")
+    (enableFeature encodePerfTestsSupport "encode-perf-tests")
+    (enableFeature multiResEncodingSupport "multi-res-encoding")
+    (enableFeature temporalDenoisingSupport "temporal-denoising")
+    (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising")
+    (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
+    (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
+    (enableFeature (experimentalSpatialSvcSupport ||
+                    experimentalFpMbStatsSupport ||
+                    experimentalEmulateHardwareSupport) "experimental")
     # Experimental features
-    (mkFlag experimentalMultipleArfSupport "multiple-arf")
-    (mkFlag experimentalNon420Support "non420")
-    (mkFlag experimentalAlphaSupport "alpha")
-  ];
+  ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
+    ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
+    ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
+
+  nativeBuildInputs = [ perl yasm ];
+
+  buildInputs = [ ]
+    ++ optionals unitTestsSupport [ coreutils curl ];
 
   enableParallelBuilding = true;
 
@@ -163,7 +162,8 @@ stdenv.mkDerivation rec {
       # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
       "--force-target=${stdenv.cross.config}${(
               if isDarwin then (
-                if stdenv.cross.osxMinVersion == "10.9"  then "13"
+                if      stdenv.cross.osxMinVersion == "10.10" then "14"
+                else if stdenv.cross.osxMinVersion == "10.9"  then "13"
                 else if stdenv.cross.osxMinVersion == "10.8"  then "12"
                 else if stdenv.cross.osxMinVersion == "10.7"  then "11"
                 else if stdenv.cross.osxMinVersion == "10.6"  then "10"
@@ -174,11 +174,11 @@ stdenv.mkDerivation rec {
     ];
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = http://www.webmproject.org/;
     license     = licenses.bsd3;
-    maintainers = with maintainers; [ codyopel lovek323 ];
+    maintainers = with maintainers; [ codyopel ];
     platforms   = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index fd7f9150e1d..31b1c197e9f 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -1,15 +1,10 @@
 {stdenv, fetchgit, perl, yasm
-, vp8Support ? true # VP8
 , vp8DecoderSupport ? true # VP8 decoder
 , vp8EncoderSupport ? true # VP8 encoder
-, vp9Support ? true # VP9
 , vp9DecoderSupport ? true # VP9 decoder
 , vp9EncoderSupport ? true # VP9 encoder
 , extraWarningsSupport ? false # emit non-fatal warnings
 , werrorSupport ? false # treat warnings as errors (not available with all compilers)
-, installBinsSupport ? true # install binaries (vpxdec & vpxenc)
-, installLibsSupport ? true # install libraries
-, installSrcsSupport ? false # install sources
 , debugSupport ? false # debug mode
 , gprofSupport ? false # gprof profiling instrumentation
 , gcovSupport ? false # gcov coverage instrumentation
@@ -17,13 +12,10 @@
 , optimizationsSupport ? true # compiler optimization flags
 , runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime
 , thumbSupport ? false # build arm assembly in thumb mode
-, libsSupport ? true # build librares
 , examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples)
 , fastUnalignedSupport ? true # use unaligned accesses if supported by hardware
-, codecSrcsSupport ? false # codec library source code
 , debugLibsSupport ? false # include debug version of each library
 , postprocSupport ? true # postprocessing
-, vp9PostprocSupport ? true # VP9 specific postprocessing
 , multithreadSupport ? true # multithreaded decoding & encoding
 , internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders)
 , memTrackerSupport ? false # track memory usage
@@ -40,7 +32,6 @@
 , encodePerfTestsSupport ? false # build encoder perf tests with unit tests
 , multiResEncodingSupport ? false # multiple-resolution encoding
 , temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising
-, vp9TemporalDenoisingSupport ? true # VP9 specific temporal denoising
 , coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range
 , vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9
 , experimentalSupport ? false # experimental features
@@ -50,118 +41,109 @@
 , experimentalEmulateHardwareSupport ? false
 }:
 
-assert (vp8Support || vp9Support);
-assert (vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport);
-assert vp8DecoderSupport -> vp8Support;
-assert vp8EncoderSupport -> vp8Support;
-assert vp9DecoderSupport -> vp9Support;
-assert vp9EncoderSupport -> vp9Support;
-assert installLibsSupport -> libsSupport;
-# libvpx will not build binaries if examplesSupport is not enabled (ie. vpxdec & vpxenc)
-assert installBinsSupport -> examplesSupport;
-assert vp9PostprocSupport -> (vp9Support && postprocSupport);
-assert (internalStatsSupport && vp9Support) -> vp9PostprocSupport;
+let
+  inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin;
+  inherit (stdenv.lib) enableFeature optional optionals;
+in
+
+assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support
+
+assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
+assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
 /* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors.
    Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl,
    but is only executed if spatialResamplingSupport is enabled */
 assert spatialResamplingSupport;
 assert postprocVisualizerSupport -> postprocSupport;
-assert (postprocVisualizerSupport && vp9Support) -> vp9PostprocSupport;
-assert unitTestsSupport -> ((curl != null) && (coreutils != null));
-assert vp9TemporalDenoisingSupport -> (vp9Support && temporalDenoisingSupport);
-assert vp9HighbitdepthSupport -> vp9Support;
-assert (experimentalSpatialSvcSupport || experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) -> experimentalSupport;
-assert stdenv.isCygwin -> (unitTestsSupport && webmIOSupport && libyuvSupport);
+assert unitTestsSupport -> curl != null && coreutils != null;
+assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport);
+assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
-let
-  mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}";
-in
-
-with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libvpx-git";
+  name = "libvpx-git-${version}";
+  version = "2015-2-12";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/webm/libvpx";
   /* DO NOT under any circumstance ever just bump the git commit without
      confirming changes have not been made to the configure system */
-    rev = "f4c29ae9ea16c502c980a81ca9683327d5051929"; # 2015-2-12
+    rev = "f4c29ae9ea16c502c980a81ca9683327d5051929";
     sha256 = "1d5m3dryfdrsf3mi6bcbsndyhihzksqalzfvi21fbxxkk1imsb9x";
   };
 
-  patchPhase = ''
-    patchShebangs .
-  '';
-
-  nativeBuildInputs = [ perl yasm ];
-
-  buildInputs = [ ]
-    ++ optional unitTestsSupport coreutils
-    ++ optional unitTestsSupport curl;
+  patchPhase = ''patchShebangs .'';
 
   configureFlags = [
-    (mkFlag vp8Support "vp8")
-    (mkFlag vp8EncoderSupport "vp8-encoder")
-    (mkFlag vp8DecoderSupport "vp8-decoder")
-    (mkFlag vp9Support "vp9")
-    (mkFlag vp9EncoderSupport "vp9-encoder")
-    (mkFlag vp9DecoderSupport "vp9-decoder")
-    (mkFlag extraWarningsSupport "extra-warnings")
-    (mkFlag werrorSupport "werror")
+    (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
+    (enableFeature vp8EncoderSupport "vp8-encoder")
+    (enableFeature vp8DecoderSupport "vp8-decoder")
+    (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9")
+    (enableFeature vp9EncoderSupport "vp9-encoder")
+    (enableFeature vp9DecoderSupport "vp9-decoder")
+    (enableFeature extraWarningsSupport "extra-warnings")
+    (enableFeature werrorSupport "werror")
     "--disable-install-docs"
-    (mkFlag installBinsSupport "install-bins")
-    (mkFlag installLibsSupport "install-libs")
-    (mkFlag installSrcsSupport "install-srcs")
-    (mkFlag debugSupport "debug")
-    (mkFlag gprofSupport "gprof")
-    (mkFlag gcovSupport "gcov")
+    (enableFeature examplesSupport "install-bins")
+    "--enable-install-libs"
+    "--disable-install-srcs"
+    (enableFeature debugSupport "debug")
+    (enableFeature gprofSupport "gprof")
+    (enableFeature gcovSupport "gcov")
     # Required to build shared libraries
-    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "pic")
-    (mkFlag (stdenv.isi686 || stdenv.isx86_64) "use-x86inc")
-    (mkFlag optimizationsSupport "optimizations")
-    (mkFlag runtimeCpuDetectSupport "runtime-cpu-detect")
-    (mkFlag thumbSupport "thumb")
-    (mkFlag libsSupport "libs")
-    (mkFlag examplesSupport "examples")
+    (enableFeature (!isCygwin) "pic")
+    (enableFeature (isi686 || isx86_64) "use-x86inc")
+    (enableFeature optimizationsSupport "optimizations")
+    (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect")
+    (enableFeature thumbSupport "thumb")
+    "--enable-libs"
+    (enableFeature examplesSupport "examples")
     "--disable-docs"
     "--as=yasm"
     # Limit default decoder max to WHXGA
-    (if sizeLimitSupport then "--size-limit=5120x3200" else "")
-    (mkFlag fastUnalignedSupport "fast-unaligned")
-    (mkFlag codecSrcsSupport "codec-srcs")
-    (mkFlag debugLibsSupport "debug-libs")
-    (mkFlag stdenv.isMips "dequant-tokens")
-    (mkFlag stdenv.isMips "dc-recon")
-    (mkFlag postprocSupport "postproc")
-    (mkFlag vp9PostprocSupport "vp9-postproc")
-    (mkFlag multithreadSupport "multithread")
-    (mkFlag internalStatsSupport "internal-stats")
-    (mkFlag memTrackerSupport "mem-tracker")
-    (mkFlag spatialResamplingSupport "spatial-resampling")
-    (mkFlag realtimeOnlySupport "realtime-only")
-    (mkFlag ontheflyBitpackingSupport "onthefly-bitpacking")
-    (mkFlag errorConcealmentSupport "error-concealment")
+    (if sizeLimitSupport then "--size-limit=5120x3200" else null)
+    (enableFeature fastUnalignedSupport "fast-unaligned")
+    "--disable-codec-srcs"
+    (enableFeature debugLibsSupport "debug-libs")
+    (enableFeature isMips "dequant-tokens")
+    (enableFeature isMips "dc-recon")
+    (enableFeature postprocSupport "postproc")
+    (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc")
+    (enableFeature multithreadSupport "multithread")
+    (enableFeature internalStatsSupport "internal-stats")
+    (enableFeature memTrackerSupport "mem-tracker")
+    (enableFeature spatialResamplingSupport "spatial-resampling")
+    (enableFeature realtimeOnlySupport "realtime-only")
+    (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking")
+    (enableFeature errorConcealmentSupport "error-concealment")
     # Shared libraries are only supported on ELF platforms
-    (mkFlag (stdenv.isDarwin || stdenv.isCygwin) "static")
-    (mkFlag (!stdenv.isDarwin && !stdenv.isCygwin) "shared")
-    (mkFlag smallSupport "small")
-    (mkFlag postprocVisualizerSupport "postproc-visualizer")
-    (mkFlag unitTestsSupport "unit-tests")
-    (mkFlag webmIOSupport "webm-io")
-    (mkFlag libyuvSupport "libyuv")
-    (mkFlag decodePerfTestsSupport "decode-perf-tests")
-    (mkFlag encodePerfTestsSupport "encode-perf-tests")
-    (mkFlag multiResEncodingSupport "multi-res-encoding")
-    (mkFlag temporalDenoisingSupport "temporal-denoising")
-    (mkFlag vp9TemporalDenoisingSupport "vp9-temporal-denoising")
-    (mkFlag coefficientRangeCheckingSupport "coefficient-range-checking")
-    (mkFlag (vp9HighbitdepthSupport && !stdenv.isi686) "vp9-highbitdepth")
-    (mkFlag experimentalSupport "experimental")
+    (if isDarwin || isCygwin then
+       "--enable-static --disable-shared"
+     else
+       "--disable-static --enable-shared")
+    (enableFeature smallSupport "small")
+    (enableFeature postprocVisualizerSupport "postproc-visualizer")
+    (enableFeature unitTestsSupport "unit-tests")
+    (enableFeature webmIOSupport "webm-io")
+    (enableFeature libyuvSupport "libyuv")
+    (enableFeature decodePerfTestsSupport "decode-perf-tests")
+    (enableFeature encodePerfTestsSupport "encode-perf-tests")
+    (enableFeature multiResEncodingSupport "multi-res-encoding")
+    (enableFeature temporalDenoisingSupport "temporal-denoising")
+    (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising")
+    (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking")
+    (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth")
+    (enableFeature (experimentalSpatialSvcSupport ||
+                    experimentalFpMbStatsSupport ||
+                    experimentalEmulateHardwareSupport) "experimental")
     # Experimental features
-    (mkFlag experimentalSpatialSvcSupport "spatial-svc")
-    (mkFlag experimentalFpMbStatsSupport "fp-mb-stats")
-    (mkFlag experimentalEmulateHardwareSupport "emulate-hardware")
-  ];
+  ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
+    ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
+    ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
+
+  nativeBuildInputs = [ perl yasm ];
+
+  buildInputs = [ ]
+    ++ optionals unitTestsSupport [ coreutils curl ];
 
   enableParallelBuilding = true;
 
@@ -193,7 +175,7 @@ stdenv.mkDerivation rec {
     ];
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = http://www.webmproject.org/;
     license     = licenses.bsd3;
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index e5682219dba..8abacf6f1c8 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, yacc, flex, xkeyboard_config, libxcb }:
 
 stdenv.mkDerivation rec {
-  name = "libxkbcommon-0.4.2";
+  name = "libxkbcommon-0.4.3";
 
   src = fetchurl {
     url = "http://xkbcommon.org/download/${name}.tar.xz";
-    sha256 = "0mw9ljc5fbqbhnm884w7ns5pf6f2rqj9ww5xcaps9nzdgsq73z50";
+    sha1 = "2251adc7425c816ec7af4f1c3776a619a53293b6";
   };
 
   buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 153096ee45c..0d70a6502fe 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,49 +1,63 @@
-{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }:
+{ stdenv, fetchurl, findXMLCatalogs
 
-assert pythonSupport -> python != null;
+# Optional Dependencies
+, icu ? null, python ? null, readline ? null, zlib ? null, xz ? null
+}:
 
 #TODO: share most stuff between python and non-python builds, perhaps via multiple-output
 
 let
-  version = "2.9.2";
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optIcu = shouldUsePkg icu;
+  optPython = shouldUsePkg python;
+  optReadline = shouldUsePkg readline;
+  optZlib = shouldUsePkg zlib;
+  optXz = shouldUsePkg xz;
+
+  sitePackages = if optPython == null then null else
+    "\${out}/lib/${python.libPrefix}/site-packages";
 in
-
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "libxml2-${version}";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${name}.tar.gz";
     sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
   };
 
-  buildInputs = stdenv.lib.optional pythonSupport python
-    # Libxml2 has an optional dependency on liblzma.  However, on impure
-    # platforms, it may end up using that from /usr/lib, and thus lack a
-    # RUNPATH for that, leading to undefined references for its users.
-    ++ (stdenv.lib.optional stdenv.isFreeBSD xz);
-
-  propagatedBuildInputs = [ zlib findXMLCatalogs ];
+  buildInputs = [ optIcu optPython optReadline optZlib optXz ];
+  propagatedBuildInputs = [ findXMLCatalogs ];
 
-  passthru = { inherit pythonSupport version; };
+  configureFlags = [
+    (mkWith (optIcu != null)      "icu"                optIcu)
+    (mkWith (optPython != null)   "python"             optPython)
+    (mkWith (optPython != null)   "python-install-dir" sitePackages)
+    (mkWith (optReadline != null) "readline"           optReadline)
+    (mkWith (optZlib != null)     "zlib"               optZlib)
+    (mkWith (optXz != null)       "lzma"               optXz)
+  ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
-    license = "bsd";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ eelco wkennington ];
   };
 
-} // stdenv.lib.optionalAttrs pythonSupport {
-  configureFlags = "--with-python=${python}";
-
-  # this is a pair of ugly hacks to make python stuff install into the right place
-  preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$out"'';
-  installFlags = ''pythondir="$(out)/lib/${python.libPrefix}/site-packages"'';
-
-} // stdenv.lib.optionalAttrs (!pythonSupport) {
-  configureFlags = "--with-python=no"; # otherwise build impurity bites us
-})
-
+  passthru = {
+    inherit version;
+    pythonSupport = python != null;
+  };
+}
diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix
index 785ed0db7d7..81e836aa46d 100644
--- a/pkgs/development/libraries/libxmlxx/default.nix
+++ b/pkgs/development/libraries/libxmlxx/default.nix
@@ -1,22 +1,26 @@
-{ stdenv, fetchurl
-, pkgconfig, libxml2, glibmm, perl }:
+{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }:
+
 stdenv.mkDerivation rec {
-  name = "libxml++-2.37.2";
+  name = "libxml++-2.38.0";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml++/2.37/${name}.tar.xz";
-    sha256 = "0fvpm95iapi5qrz6sil6vnqqdrsd7f9a16c415hzr44f2ji10gmv";
+    url = "mirror://gnome/sources/libxml++/2.38/${name}.tar.xz";
+    sha256 = "0ihk7fprpshs0gp38x2m5jhvrph3iwr0wy1h1qqvh3rjblzv162n";
   };
 
-  buildInputs = [ pkgconfig glibmm perl ];
+  nativeBuildInputs = [ pkgconfig perl ];
+
+  buildInputs = [ glibmm ];
 
   propagatedBuildInputs = [ libxml2 ];
 
   configureFlags = "--disable-documentation"; #doesn't build without this for some reason
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://libxmlplusplus.sourceforge.net/;
     description = "C++ wrapper for the libxml2 XML parser library";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.phreedom ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ phreedom wkennington ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index 7b4d3d6287a..4bc9e8ed1c4 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxmp-4.2.7";
+  name = "libxmp-4.3.8";
 
   meta = with stdenv.lib; {
     description = "Extended module player library";
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
-    sha256 = "1isv8498869w8wc18lagi1p40z4blx684r21j9cligkfyrmri536";
+    sha256 = "0h06091hlpgc6ds4pjmfq8sx4snw7av3nhny180q4pwfyasjb6ny";
   };
 }
diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix
index 2fdeee7b5dc..11b77ae0815 100644
--- a/pkgs/development/libraries/libzen/default.nix
+++ b/pkgs/development/libraries/libzen/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }:
 
-let version = "0.4.30"; in
+let version = "0.4.31"; in
 
 stdenv.mkDerivation {
   name = "libzen-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2";
-    sha256 = "1ripvyzz2lw9nx2j8mkjgjfpabrz6knwxri52asqf1abnszbry64";
+    sha256 = "1d54bn561dipf16ki1bfq5r72j5bmz1yyx4n1v85jv4qc4cfvl4z";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig ];
diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix
index d84e0219294..9654dea3725 100644
--- a/pkgs/development/libraries/lirc/default.nix
+++ b/pkgs/development/libraries/lirc/default.nix
@@ -18,12 +18,18 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-driver=devinput"
-    "--sysconfdir=$(out)/etc"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
     "--enable-sandboxed"
   ];
 
   makeFlags = [ "m4dir=$(out)/m4" ];
 
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
+  ];
+
   meta = with stdenv.lib; {
     description = "Allows to receive and send infrared signals";
     homepage = http://www.lirc.org/;
diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix
index edb914123e1..e03535ba979 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/pkgs/development/libraries/luabind/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/luabind/luabind;
-    description = "Luabind is a library that helps you create bindings between C++ and Lua.";
+    description = "A library that helps you create bindings between C++ and Lua";
     license = stdenv.lib.licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index a2891f9207d..8cf0744a0d1 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "mailcore2-${version}";
 
-  version = "0.5";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner  = "MailCore";
     repo   = "mailcore2";
     rev    = version;
-    sha256 = "1f2kpw8ha4j43jlimw0my9b7x1gbik7yyg1m87q6nhbbsci78qly";
+    sha256 = "1k0l59cdk8np4pff1my07dp7ivf3nchlhcpvm9xizp0my9rqgbxb";
   };
 
   buildInputs = [
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1fe3bef6481..0b602c687bf 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
 with { inherit (stdenv.lib) optional optionalString; };
 
 let
-  version = "10.5.3";
+  version = "10.5.4";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
   clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
       "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz"
     ];
-    sha256 = "18ibj4c8zmg738md8phmq3va40ycsjdilg76ylw35h7mwhdyw0c7";
+    sha256 = "00v89jna7m6r2w1yrnx09isc97r2bd1hkn4jib445n1078zp47mm";
   };
 
   prePatch = "patchShebangs .";
diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix
index a6aae14e5c3..6d5e36d726c 100644
--- a/pkgs/development/libraries/nettle/default.nix
+++ b/pkgs/development/libraries/nettle/default.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "3.0";
+  version = "3.1.1";
 
   src = fetchurl {
     url = "mirror://gnu/nettle/nettle-${version}.tar.gz";
-    sha256 = "04yrpjz33vrj6j0zxc153b00f93i8hs41syr1ryp7sr64fyw0lcn";
+    sha256 = "0k1x57zviysvi91lkk66cg8v819vywm5g5yqs22wppfqcifx5m2z";
   };
 })
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 76629c80b96..6044f978402 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (rec {
   patches = stdenv.lib.optional (stdenv.system == "i686-cygwin")
               ./cygwin.patch;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Cryptographic library";
 
     longDescription = ''
@@ -48,12 +48,12 @@ stdenv.mkDerivation (rec {
         I/O.
      '';
 
-     license = stdenv.lib.licenses.gpl2Plus;
+     license = licenses.gpl2Plus;
 
      homepage = http://www.lysator.liu.se/~nisse/nettle/;
 
-     maintainers = [ ];
-     platforms = stdenv.lib.platforms.all;
+     maintainers = with maintainers; [ wkennington ];
+     platforms = platforms.all;
   };
 }
 
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index d86a55b78bd..d91a905f7ba 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.18";
+  version = "3.18.1";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_RTM/src/${name}.tar.gz";
-    sha256 = "0h0xy9kvd2s8r438q4dfn25cgvv5dc1hkm9lb4bgrxpr5bxv13b1";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_1_RTM/src/${name}.tar.gz";
+    sha256 = "10d005ca1b143a8b77032a169c595d06cf42d16d54809558ea30f1ffe73fef70";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];
diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index 4eab7a683af..a81d95e6b98 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, 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";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "0bysdijvi9n0jk74iklbfhbp0kvv81a727lcfd5q03q2hkzjfm18";
   };
 
   buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 14d88e381b3..7fe57af5710 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     ++ optional enablePrefix "--enable-mpirun-prefix-by-default"
     ;
   meta = {
-    homePage = http://www.open-mpi.org/;
+    homepage = http://www.open-mpi.org/;
     description = "Open source MPI-2 implementation";
     longDescription = "The Open MPI Project is an open source MPI-2 implementation that is developed and maintained by a consortium of academic, research, and industry partners. Open MPI is therefore able to combine the expertise, technologies, and resources from all across the High Performance Computing community in order to build the best MPI library available. Open MPI offers advantages for system and software vendors, application developers and computer science researchers.";
     maintainers = [ stdenv.lib.maintainers.mornfall ];
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 0ecbc109d39..eefed304134 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -1,22 +1,27 @@
 { stdenv, fetchurl, libiconv, pkgconfig, libffi, libtasn1 }:
 
 stdenv.mkDerivation rec {
-  name = "p11-kit-0.20.2";
+  name = "p11-kit-0.23.1";
 
   src = fetchurl {
     url = "${meta.homepage}releases/${name}.tar.gz";
-    sha256 = "0z7gwmsj9hcmpk3ai2lwla59y3h9jc13xmqk5rijnv645zcm3v84";
+    sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5";
   };
 
-  postInstall = "rm -frv $out/share/gtk-doc";
+  buildInputs = [ pkgconfig libffi libtasn1 libiconv ];
 
-  configureFlags = "--without-libtasn1";
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--without-trust-paths"
+  ];
 
-  buildInputs = [ pkgconfig libffi libtasn1 libiconv ];
+  installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://p11-glue.freedesktop.org/;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = platforms.all;
+    maintainers = with maintainers; [ urkud wkennington ];
+    license = licenses.mit;
   };
 }
diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix
new file mode 100644
index 00000000000..4b8cedd90c7
--- /dev/null
+++ b/pkgs/development/libraries/pcg-c/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchzip }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "0.94";
+  name = "pcg-c-${version}";
+
+  src = fetchzip {
+    url = "http://www.pcg-random.org/downloads/${name}.zip";
+    sha256 = "0smm811xbvs03a5nc2668zd0178wnyri2h023pqffy767bpy1vlv";
+  };
+
+  enableParallelBuilding = true;
+
+  patches = [
+    ./prefix-variable.patch
+    ];
+
+  preInstall = ''
+    sed -i s,/usr/local,$out, Makefile
+    mkdir -p $out/lib $out/include
+  '';
+
+  meta = {
+    description = "A family of better random number generators";
+    homepage = "http://www.pcg-random.org/";
+    license = stdenv.lib.licenses.asl20;
+    longDescription = ''
+      PCG is a family of simple fast space-efficient statistically good
+      algorithms for random number generation. Unlike many general-purpose RNGs,
+      they are also hard to predict.
+    '';
+    platforms = platforms.unix;
+    maintainers = [ maintainers.linus ];
+    repositories.git = git://github.com/imneme/pcg-c.git;
+  };
+}
diff --git a/pkgs/development/libraries/pcg-c/prefix-variable.patch b/pkgs/development/libraries/pcg-c/prefix-variable.patch
new file mode 100644
index 00000000000..bfdcdfa7b17
--- /dev/null
+++ b/pkgs/development/libraries/pcg-c/prefix-variable.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index dddea44..fdb9401 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,8 +30,8 @@ all:
+ PREFIX = /usr/local
+ 
+ install: all
+-	install src/libpcg_random.a $PREFIX/lib
+-	install -m 0644 include/pcg_variants.h $PREFIX/include
++	install src/libpcg_random.a ${PREFIX}/lib
++	install -m 0644 include/pcg_variants.h ${PREFIX}/include
+ 
+ test:   all
+ 	cd test-low; $(MAKE) test
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 9c7659efcec..a1be2afcd6c 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "This project is a QML port of qtermwidget";
     homepage = "https://github.com/Swordifish90/qmltermwidget";
-    licenses = with stdenv.lib.licenses; [ gpl2 ];
+    license = with stdenv.lib.licenses; [ gpl2 ];
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ skeidel ];
   };
diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 63ba58f2343..e9d506f58fe 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://qpdf.sourceforge.net/; 
     description = "A C++ library and set of programs that inspect and manipulate the structure of PDF files";
-    licenses = licenses.artistic2;
+    license = licenses.artistic2;
     maintainers = maintainers.abbradar;
     platforms = platforms.all;
   };
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 8c91db74f95..8c7301e3c40 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qscintilla";
-  version = "2.8.4";
+  version = "2.9";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
-    sha256 = "03z8mc7wpk0hyza9b45pyf523gdk0qsqaywkprmp6ffc81s2sywv";
+    sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
   };
 
   buildInputs = [ qt ];
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 06ff3fe66d4..a65cbeed3fd 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -180,6 +180,6 @@ stdenv.mkDerivation rec {
     description = "A cross-platform application framework for C++";
     license     = licenses.lgpl21Plus; # or gpl3
     maintainers = with maintainers; [ lovek323 phreedom sander urkud ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch b/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch
new file mode 100644
index 00000000000..63066658f0f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/0013-xdg_config_dirs.patch
@@ -0,0 +1,42 @@
+diff --git a/qsettings.cpp b/qsettings.cpp
+index 35b3ed4..210dfeb 100644
+--- a/qsettings.cpp
++++ b/qtbase/src/corelib/io/qsettings.cpp
+@@ -1174,6 +1174,24 @@ QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
+     if (!application.isEmpty())
+         confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
+     confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
++
++#if !defined(Q_OS_WIN)
++    // Add directories specified in $XDG_CONFIG_DIRS
++    const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
++    if (!pathEnv.isEmpty()) {
++        const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
++        if (!pathEntries.isEmpty()) {
++            int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
++            for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
++                const QString& path = pathEntries.at(k);
++                if (!application.isEmpty())
++                    confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
++                confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
++            }
++        }
++    }
++#endif
++
+ #else
+     QString confName = getPath(format, QSettings::UserScope) + org;
+     if (!application.isEmpty())
+diff --git a/qsettings_p.h b/qsettings_p.h
+index a28b583..b2a240d 100644
+--- a/qsettings_p.h
++++ b/qtbase/src/corelib/io/qsettings_p.h
+@@ -244,7 +244,7 @@ public:
+         F_Organization = 0x1,
+         F_User = 0x0,
+         F_System = 0x2,
+-        NumConfFiles = 4
++        NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
+ #else
+         SandboxConfFile = 0,
+         NumConfFiles = 1
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index bc342f605bc..746889f279d 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -67,6 +67,7 @@ stdenv.mkDerivation {
       (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; })
       (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; })
       (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; })
+      ./0013-xdg_config_dirs.patch
     ];
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix
index 71ec5e77a73..0cb62914b7f 100644
--- a/pkgs/development/libraries/qt-mobility/default.nix
+++ b/pkgs/development/libraries/qt-mobility/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchurl, qt4, libX11, coreutils, bluez, perl }:
+{ stdenv, fetchFromGitHub, qt4, libX11, coreutils, bluez, perl }:
 # possible additional dependencies: pulseaudio udev networkmanager immerson qmf
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
   name = "qt-mobility-${version}";
-  download = "qt-mobility-opensource-src-${version}";
-  src = fetchurl {
-    url =  "http://get.qt.nokia.com/qt/add-ons/${download}.tar.gz";
-    sha256 = "ee3c88975e04139ac9589f76d4be646d44fcbc4c8c1cf2db621abc154cf0ba44";
+  src = fetchFromGitHub {
+    owner = "qtproject";
+    repo = "qt-mobility";
+    rev = "v${version}";
+    sha256 = "14713pbscysd6d0b9rgm7gg145jzwvgdn22778pf2v13qzvfmy1i";
   };
 
   NIX_CFLAGS_COMPILE="-fpermissive";
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
   preBuild = ''
     for i in connectivity contacts feedback gallery location multimedia organizer publishsubscribe sensors serviceframework systeminfo; do
       substituteInPlace plugins/declarative/$i/Makefile --replace "${qt4}/lib/qt4/imports/" "$out/lib/qt4/imports/"
+    done
   '';
 
   # Features files (*.prf) are not installed on nixos
diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix
new file mode 100644
index 00000000000..98619854c1e
--- /dev/null
+++ b/pkgs/development/libraries/qxt/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, which, coreutils, fetchzip, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "qxt-${version}";
+  version = "0.6.2";
+  
+  src = fetchzip {
+    url = "http://dev.libqxt.org/libqxt/get/v${version}.tar.gz";
+    sha256 = "0zmqfn0h8cpky7wgaaxlfh0l89r9r0isi87587kaicyap7a6kxwz";
+  };
+
+  buildInputs = [ qt4 which ];
+
+  patchPhase = ''
+    patchShebangs configure
+    substituteInPlace configure --replace "/bin/pwd" "${coreutils}/bin/pwd"
+  '';
+
+  prefixKey = "-prefix ";
+
+  meta = {
+    homepage = http://libqxt.org;
+    description = "An extension library for Qt";
+    longDescription = ''
+      An extension library for Qt providing a suite of cross-platform utility
+      classes to add functionality not readily available in the Qt toolkit by Qt
+      Development Frameworks, Nokia.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ forkk ];
+  };
+}
diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix
new file mode 100644
index 00000000000..84a7a9b4ccf
--- /dev/null
+++ b/pkgs/development/libraries/rabbitmq-c/0.4.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, openssl, popt, xmlto }:
+
+stdenv.mkDerivation rec {
+  version = "0.4.1";
+  name = "rabbitmq-c-${version}";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93";
+  };
+
+  buildInputs = [ cmake openssl popt xmlto ];
+
+  meta = {
+    description = "RabbitMQ C AMQP client library";
+    homepage = https://github.com/alanxz/rabbitmq-c;
+    license = with stdenv.lib.licenses; mit;
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix
index 3ca7cab6c38..f5e7f23c108 100644
--- a/pkgs/development/libraries/readosm/default.nix
+++ b/pkgs/development/libraries/readosm/default.nix
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An open source library to extract valid data from within an Open Street Map input file";
     homepage = https://www.gaia-gis.it/fossil/readosm;
-    license = [ "GPLv2+" "LGPLv2+" "MPL1.1" ];
-    licenses = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
+    license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
   };
 }
diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix
index 070baf7ae79..888a81a390e 100644
--- a/pkgs/development/libraries/rep-gtk/default.nix
+++ b/pkgs/development/libraries/rep-gtk/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchgit, pkgconfig, autoreconfHook, librep, gtk2 }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, librep, gtk2 }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
 
-  name = "rep-gtk-git-2015-02-15";
+  name = "rep-gtk-${version}";
+  version = "0.90.8.2";
 
-  src = fetchgit {
-    url = "https://github.com/SawfishWM/rep-gtk.git";
-    rev = "74ac3504f2bbbcc9ded005ab97cbf94cdc47924d";
-    sha256 = "edb47c5b6d09201d16a8f0616d18690ff0a37dca56d31c6e635b286bd0b6a031";
+  src = fetchurl {
+    url = "https://github.com/SawfishWM/rep-gtk/archive/${name}.tar.gz";
+    sha256 = "0pkpp7pj22c8hkyyivr9qw6q08ad42alynsf54ixdy6p9wn4qs1r";
   };
 
   buildInputs = [ pkgconfig autoreconfHook ];
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
new file mode 100644
index 00000000000..88d94ec0f2c
--- /dev/null
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitHub
+
+# Optional Arguments
+, snappy ? null, google-gflags ? null, zlib ? null, bzip2 ? null, lz4 ? null
+, numactl ? null
+
+# Malloc implementation
+, jemalloc ? null, gperftools ? null
+}:
+
+let
+  malloc = if jemalloc != null then jemalloc else gperftools;
+in
+stdenv.mkDerivation rec {
+  name = "rocksdb-${version}";
+  version = "3.10";
+
+  src = fetchFromGitHub {
+    owner = "facebook";
+    repo = "rocksdb";
+    rev = "v${version}";
+    sha256 = "1px345x9cyaxyjlzsf3bcxixvfaxn9x3ysq7biajyfhk8wq1n4p0";
+  };
+
+  buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];
+
+  postPatch = ''
+    # Hack to fix typos
+    sed -i 's,#inlcude,#include,g' build_tools/build_detect_platform
+  '';
+
+  # Environment vars used for building certain configurations
+  PORTABLE = "1";
+  USE_SSE = "1";
+  JEMALLOC_LIB = stdenv.lib.optionalString (malloc == jemalloc) "-ljemalloc";
+
+  buildFlags = [
+    "static_lib"
+    "shared_lib"
+  ];
+
+  installFlags = [
+    "INSTALL_PATH=\${out}"
+  ];
+
+  postInstall = ''
+    # Might eventually remove this when we are confident in the build process
+    echo "BUILD CONFIGURATION FOR SANITY CHECKING"
+    cat make_config.mk
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://rocksdb.org;
+    description = "A library that provides an embeddable, persistent key-value store for fast storage";
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/sbc/default.nix b/pkgs/development/libraries/sbc/default.nix
index 06411c1f22a..0dc9c1afd2b 100644
--- a/pkgs/development/libraries/sbc/default.nix
+++ b/pkgs/development/libraries/sbc/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchurl, libsndfile, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "sbc-1.1";
+  name = "sbc-1.3";
 
   src = fetchurl {
     url = "http://www.kernel.org/pub/linux/bluetooth/${name}.tar.xz";
-    sha256 = "1ipvkhilyhdbd2nzq0la6l7q361l0zm0c6kvga2a0y89q8nssc4s";
+    sha256 = "02ckd2z51z0h85qgv7x8vv8ybp5czm9if1z78411j53gaz7j4476";
   };
 
-  buildInputs = [ pkgconfig libsndfile ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libsndfile ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "SubBand Codec Library";
-
     homepage = http://www.bluez.org/;
-
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix
index 296c5f6b920..01bb3371f5e 100644
--- a/pkgs/development/libraries/science/math/arpack/default.nix
+++ b/pkgs/development/libraries/science/math/arpack/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     homepage = "http://forge.scilab.org/index.php/p/arpack-ng/";
     description = ''
       A collection of Fortran77 subroutines to solve large scale eigenvalue
-      problems.
+      problems
     '';
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 8dc2b542be7..e779957a6fb 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -1,47 +1,45 @@
 { stdenv, fetchurl, gfortran, perl, liblapack, config }:
 
-# Minimum CPU requirements:
-# x86: Pentium 4 (Prescott, circa 2004)
-# x86_64: Opteron (circa 2003)
-# These are the settings used for the generic builds. Performance will
-# be poor on modern systems. The goal of the Hydra builds is simply to
-# support as many systems as possible. OpenBLAS may support older
-# CPU architectures, but you will need to set 'config.openblas.target'
-# and 'config.openblas.preferLocalBuild', which will build it on your
-# local machine.
+with stdenv.lib;
 
 let local = config.openblas.preferLocalBuild or false;
-    localTarget = config.openblas.target or "";
+    binary =
+      {
+        i686-linux = "32";
+        x86_64-linux = "64";
+      }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+    genericFlags =
+      [
+        "DYNAMIC_ARCH=1"
+        "NUM_THREADS=64"
+        "BINARY=${binary}"
+      ];
+    localFlags = config.openblas.flags or
+      optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
 in
 stdenv.mkDerivation rec {
-  version = "0.2.13";
+  version = "0.2.14";
 
   name = "openblas-${version}";
   src = fetchurl {
     url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}";
-    sha256 = "1asg5mix13ipxgj5h2yj2p0r8km1di5jbcjkn5gmhb37nx7qfv6k";
+    sha256 = "0av3pd96j8rx5i65f652xv9wqfkaqn0w4ma1gvbyz73i6j2hi9db";
     name = "openblas-${version}.tar.gz";
   };
 
   preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz";
 
-  buildInputs = [gfortran perl];
-
-  cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system);
-
-  target = if local then localTarget else
-    if cpu == "i686" then "PRESCOTT" else
-    if cpu == "x86_64" then "OPTERON" else
-     # allow autodetect
-      "";
-
-  makeFlags = [
-    "${if target != "" then "TARGET=" else ""}${target}"
-    "FC=gfortran"
-    "CC=gcc"
-    ''PREFIX="''$(out)"''
-    "INTERFACE64=1"
-  ];
+  nativeBuildInputs = [gfortran perl];
+
+  makeFlags =
+    (if local then localFlags else genericFlags)
+    ++
+    [
+      "FC=gfortran"
+      "CC=gcc"
+      ''PREFIX="''$(out)"''
+      "INTERFACE64=1"
+    ];
 
   meta = with stdenv.lib; {
     description = "Basic Linear Algebra Subprograms";
diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 844505cb359..7d4ce161620 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, fetchgit, cmake, mesa, libX11, freetype, libjpeg, openal, libsndfile
-, glew, libXrandr, libXrender
+{ stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, libsndfile
+, glew, libXrandr, libXrender, udev
 }:
 stdenv.mkDerivation rec {
-  name = "sfml-git-20110428";
-  src = fetchgit {
-    url = "http://github.com/LaurentGomila/SFML.git";
-    rev = "6eac4256f3be353f51ee";
-    sha256 = "1b4f1901e0e482dbc0ad60e2821af766fb8ce093de51d678918ac2a0fb6e8587";
+  name = "sfml-2.2";
+  src = fetchurl {
+    url = "https://github.com/LaurentGomila/SFML/archive/2.2.tar.gz";
+    sha256 = "1xbpzkqwgbsjdda7n3c2z5m16bhppz1z9rbhmhb8r1im7s95hd2l";
   };
-  buildInputs = [ cmake mesa libX11 freetype libjpeg openal libsndfile glew
-                  libXrandr libXrender
+  buildInputs = [ cmake libX11 freetype libjpeg openal libsndfile glew
+                  libXrandr libXrender udev
                 ];
-  patchPhase = "
-    substituteInPlace CMakeLists.txt --replace '\${CMAKE_ROOT}/Modules' 'share/cmake-2.8/Modules'
-  ";
   meta = with stdenv.lib; {
     homepage = http://www.sfml-dev.org/;
     description = "Simple and fast multimedia library";
     longDescription = ''
-      SFML provides a simple interface to the various components of your PC, to
-      ease the development of games and multimedia applications. It is composed
-      of five modules: system, window, graphics, audio and network.
+      SFML is a simple, fast, cross-platform and object-oriented multimedia API.
+      It provides access to windowing, graphics, audio and network.
+      It is written in C++, and has bindings for various languages such as C, .Net, Ruby, Python.
     '';
     license = licenses.zlib;
     maintainers = [ maintainers.astsmtl ];
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 4804adc82e9..8ddd6114efd 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, 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";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "04xfa4yhcaj63ymagmlx77fakrx3wb8ss42m15pmwjaiyi2xndx3";
   };
 
   buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix
index 9ac8a7d56f4..94c3687e2d4 100644
--- a/pkgs/development/libraries/spatialite-tools/default.nix
+++ b/pkgs/development/libraries/spatialite-tools/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A complete sqlite3-compatible CLI front-end for libspatialite";
     homepage = https://www.gaia-gis.it/fossil/spatialite-tools;
-    licenses = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
+    license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
   };
 }
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 6aceef78eea..8e3cf899e40 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -1,19 +1,34 @@
-{ stdenv, fetchurl, libogg }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw, speexdsp }:
 
 stdenv.mkDerivation rec {
-  name = "speex-1.2rc1";
+  name = "speex-1.2rc2";
 
   src = fetchurl {
     url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
-    sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
+    sha256 = "14g8ph39inkrif749lzjm089g7kwk0hymq1a3i9ch5gz8xr7r8na";
   };
 
-  buildInputs = [ libogg ];
+  postPatch = ''
+    sed -i '/AC_CONFIG_MACRO_DIR/i PKG_PROG_PKG_CONFIG' configure.ac
+  '';
 
-  outputs = [ "dev" "out" "bin" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
 
-  meta = {
-    homepage = http://www.speex.org/;
-    description = "A audio compression codec designed for speech";
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ fftw speexdsp ];
+
+  # TODO: Remove this will help with immediate backward compatability
+  propagatedBuildInputs = [ speexdsp ];
+
+  configureFlags = [
+    "--with-fft=gpl-fftw3"
+  ];
+
+  meta = with stdenv.lib; {
+    hompage = http://www.speex.org/;
+    description = "an Open Source/Free Software patent-free audio compression format designed for speech";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/speexdsp/build-fix.patch b/pkgs/development/libraries/speexdsp/build-fix.patch
new file mode 100644
index 00000000000..13cd5e7d21a
--- /dev/null
+++ b/pkgs/development/libraries/speexdsp/build-fix.patch
@@ -0,0 +1,24 @@
+diff --git a/libspeexdsp/Makefile.am b/libspeexdsp/Makefile.am
+index d0499b9..42e8d50 100644
+--- a/libspeexdsp/Makefile.am
++++ b/libspeexdsp/Makefile.am
+@@ -29,7 +29,7 @@ noinst_HEADERS = 	arch.h 	bfin.h \
+ 	pseudofloat.h smallft.h vorbis_psy.h resample_sse.h resample_neon.h
+ 
+ libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEXDSP_LT_CURRENT@:@SPEEXDSP_LT_REVISION@:@SPEEXDSP_LT_AGE@
+-libspeexdsp_la_LIBADD = $(LIBM)
++libspeexdsp_la_LIBADD = @FFT_LIBS@ $(LIBM)
+ 
+ if BUILD_EXAMPLES
+ noinst_PROGRAMS = testdenoise testecho testjitter testresample
+diff --git a/speexdsp.pc.in b/speexdsp.pc.in
+index 6c6d26f..d40d856 100644
+--- a/speexdsp.pc.in
++++ b/speexdsp.pc.in
+@@ -11,5 +11,5 @@ Version: @PACKAGE_VERSION@
+ Requires: @FFT_PKGCONFIG@
+ Conflicts:
+ Libs: -L${libdir} -lspeexdsp
+-Libs.private: @LIBM@
++Libs.private: @FFT_LIBS@ @LIBM@
+ Cflags: -I${includedir}
diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
new file mode 100644
index 00000000000..1a9a6d486f3
--- /dev/null
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, fftw }:
+
+stdenv.mkDerivation rec {
+  name = "speexdsp-1.2rc3";
+  
+  src = fetchurl {
+    url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
+    sha256 = "1wcjyrnwlkayb20zdhp48y260rfyzg925qpjpljd5x9r01h8irja";
+  };
+
+  patches = [ ./build-fix.patch ];
+  
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ fftw ];
+
+  configureFlags = [
+    "--with-fft=gpl-fftw3"
+  ];
+
+  meta = with stdenv.lib; {
+    hompage = http://www.speex.org/;
+    description = "an Open Source/Free Software patent-free audio compression format designed for speech";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 98a71993253..d161fab31b6 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.8.8.3";
+  name = "sqlite-3.8.9";
 
   src = fetchurl {
-    url = "http://sqlite.org/2015/sqlite-autoconf-3080803.tar.gz";
-    sha1 = "2fe3f6226a2a08a2e814b97cd53e36bb3c597112";
+    url = "http://sqlite.org/2015/sqlite-autoconf-3080900.tar.gz";
+    sha1 = "p6vwiqalhk7ybcx5p8n322vhd3idww6v";
   };
 
   buildInputs = lib.optionals interactive [ readline ncurses ];
diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix
index b387c59efa1..23590f17ca8 100644
--- a/pkgs/development/libraries/stxxl/default.nix
+++ b/pkgs/development/libraries/stxxl/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/stxxl/stxxl;
-    description = "STXXL is an implementation of the C++ standard template library STL for external memory (out-of-core) computations.";
+    description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations";
     license = stdenv.lib.licenses.boost;
   };
 }
diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix
index db863d951a6..baa7e288178 100644
--- a/pkgs/development/libraries/tevent/default.nix
+++ b/pkgs/development/libraries/tevent/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    description = "an event system based on the talloc memory management library.";
+    description = "An event system based on the talloc memory management library";
     homepage = http://tevent.samba.org/;
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/development/libraries/tk/default.nix b/pkgs/development/libraries/tk/default.nix
index e44514d5abf..5f07befcfa5 100644
--- a/pkgs/development/libraries/tk/default.nix
+++ b/pkgs/development/libraries/tk/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, tcl, libXft, fontconfig }:
 
 stdenv.mkDerivation {
-  name = "tk-8.6.4";
+  name = "tk-${tcl.version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/tcl/tk8.6.4-src.tar.gz";
+    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";
     sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
   };
 
@@ -25,8 +25,10 @@ stdenv.mkDerivation {
 
   inherit tcl;
 
-  passthru = {
-    libPrefix = "tk8.6";
+  passthru = rec {
+    inherit (tcl) release version;
+    libPrefix = "tk${tcl.release}";
+    libdir = "lib/${libPrefix}";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index 6d6aaed79a0..2dfe41869a2 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,12 +1,11 @@
-{ stdenv, fetchgit, cmake, pkgconfig }:
+{ stdenv, fetchurl, 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";
+  src = fetchurl {
+    url = "mirror://samba/cwrap/${name}.tar.gz";
+    sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn";
   };
 
   buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
diff --git a/pkgs/development/libraries/webkitgtk/2.4.6.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index b4645f50818..5c868838c99 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.6.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
+{ stdenv, fetchurl, autoreconfHook, perl, python, ruby, bison, gperf, flex
 , pkgconfig, which, gettext, gobjectIntrospection
 , gtk2, gtk3, wayland, libwebp, enchant, sqlite
 , libxml2, libsoup, libsecret, libxslt, harfbuzz
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.4.6";
+  version = "2.4.8";
 
   meta = with stdenv.lib; {
     description = "Web content rendering engine, GTK+ port";
@@ -21,10 +21,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0mqlq4ivh921k92xjsp5pdvbg9vf75qjliqmx81qwrm2sjl4mvvg";
+    sha256 = "08xxqsxpa63nzgbsz63vrdxdxgpysyiy7jdcjb57k1hprdcibwb8";
   };
 
-  patches = [ ./webcore-svg-libxml-cflags.patch ];
+  patches = [ ./webkitgtk-2.4-gmutexlocker.patch ./bug140241.patch ];
 
   CC = "cc";
 
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
     patchShebangs Tools/gtk
   '';
 
+  # patch *.in between autoreconf and configure
+  postAutoreconf = "patch -p1 < ${./webcore-svg-libxml-cflags.patch}";
+
   configureFlags = with stdenv.lib; [
     "--disable-geolocation"
     (optionalString enableIntrospection "--enable-introspection")
@@ -43,7 +46,7 @@ stdenv.mkDerivation rec {
   dontAddDisableDepTrack = true;
 
   nativeBuildInputs = [
-    perl python ruby bison gperf flex
+    autoreconfHook/*bug140241.patch*/ perl python ruby bison gperf flex
     pkgconfig which gettext gobjectIntrospection
   ];
 
@@ -58,5 +61,8 @@ stdenv.mkDerivation rec {
     (if withGtk2 then gtk2 else gtk3)
   ];
 
-  #enableParallelBuilding = true; # build problems on Hydra
+  # Probably OK now, see:
+  # https://bugs.webkit.org/show_bug.cgi?id=79498
+  enableParallelBuilding = true;
 }
+
diff --git a/pkgs/development/libraries/webkitgtk/bug140241.patch b/pkgs/development/libraries/webkitgtk/bug140241.patch
new file mode 100644
index 00000000000..8d8c1bae0be
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/bug140241.patch
@@ -0,0 +1,59 @@
+@@ -, +, @@ 
+        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=140241
+        Reviewed by NOBODY (OOPS!).
+        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
+        just when WebKit2 is enabled and we are not building for X11.
+        * GNUmakefile.list.am:
+---
+ Source/WebCore/ChangeLog           | 12 ++++++++++++
+ Source/WebCore/GNUmakefile.list.am |  8 ++++++++
+ 2 files changed, 20 insertions(+)
+--- a/Source/WebCore/ChangeLog	
++++ a/Source/WebCore/ChangeLog	
+@@ -1,3 +1,15 @@ 
++2015-01-16  Tomas Popela  <tpopela@redhat.com>
++
++        REGRESSION(r177885): [GTK][WK1] Cannot compile 2.4.8 when WK2 is disabled
++        https://bugs.webkit.org/show_bug.cgi?id=140241
++
++        Reviewed by NOBODY (OOPS!).
++
++        We have to compile the PluginPackageNone.cpp and PluginViewNone.cpp
++        just when WebKit2 is enabled and we are not building for X11.
++
++        * GNUmakefile.list.am:
++
+ 2014-11-10  Csaba Osztrogonác  <ossy@webkit.org>
+ 
+         Crash in WebCore::Node::getFlag
+--- a/Source/WebCore/GNUmakefile.list.am	
++++ a/Source/WebCore/GNUmakefile.list.am	
+@@ -6254,9 +6254,13 @@ endif # END USE_GLX
+ endif # END TARGET_X11
+ 
+ if TARGET_WAYLAND
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ endif # END TARGET_WAYLAND
+ 
+ if TARGET_X11_OR_WAYLAND
+@@ -6305,9 +6309,13 @@ webcoregtk_sources += \
+ endif # END TARGET_WIN32
+ 
+ if TARGET_QUARTZ
++if !TARGET_X11
++if ENABLE_WEBKIT2
+ webcore_sources += \
+ 	Source/WebCore/plugins/PluginPackageNone.cpp \
+ 	Source/WebCore/plugins/PluginViewNone.cpp
++endif # END ENABLE_WEBKIT2
++endif # END !TARGET_X11
+ platformgtk_sources += \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
+ 	Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index f67e3f2468b..54502610887 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.6.5";
+  version = "2.8.0";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "14vmqq6hr3jzphay49984kj22vlqhpsjmwh1krdm9k57rqbq0rdi";
+    sha256 = "05b8mkr1mv1w5vi5vyczzirgf5nr6qavrdwbcaiv0dghylwx5yh5";
   };
 
   patches = [ ./finding-harfbuzz-icu.patch ];
@@ -47,5 +47,5 @@ stdenv.mkDerivation rec {
     libsoup gtk3
   ];
 
-  # enableParallelBuilding = true; # build problems on Hydra
+  enableParallelBuilding = true; # build problems on Hydra
 }
diff --git a/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
new file mode 100644
index 00000000000..1acfb87bfbc
--- /dev/null
+++ b/pkgs/development/libraries/webkitgtk/webkitgtk-2.4-gmutexlocker.patch
@@ -0,0 +1,276 @@
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp.orig	2015-04-13 18:39:20.763864030 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.cpp	2015-04-13 18:43:29.756164227 +0200
+@@ -118,7 +118,7 @@
+     WebKitVideoSink* sink = reinterpret_cast<WebKitVideoSink*>(data);
+     WebKitVideoSinkPrivate* priv = sink->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+     GstBuffer* buffer = priv->buffer;
+     priv->buffer = 0;
+     priv->timeoutId = 0;
+@@ -140,7 +140,7 @@
+     WebKitVideoSink* sink = WEBKIT_VIDEO_SINK(baseSink);
+     WebKitVideoSinkPrivate* priv = sink->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+ 
+     if (priv->unlocked)
+         return GST_FLOW_OK;
+@@ -279,7 +279,7 @@
+ 
+ static void unlockBufferMutex(WebKitVideoSinkPrivate* priv)
+ {
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+ 
+     if (priv->buffer) {
+         gst_buffer_unref(priv->buffer);
+@@ -305,7 +305,7 @@
+     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+ 
+     {
+-        GMutexLocker lock(priv->bufferMutex);
++        WebCore::GMutexLocker lock(priv->bufferMutex);
+         priv->unlocked = false;
+     }
+ 
+@@ -330,7 +330,7 @@
+ {
+     WebKitVideoSinkPrivate* priv = WEBKIT_VIDEO_SINK(baseSink)->priv;
+ 
+-    GMutexLocker lock(priv->bufferMutex);
++    WebCore::GMutexLocker lock(priv->bufferMutex);
+     priv->unlocked = false;
+     return TRUE;
+ }
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp.orig	2015-04-13 18:36:44.258046776 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp	2015-04-13 18:44:10.004374397 +0200
+@@ -316,7 +316,7 @@
+ #if USE(ACCELERATED_COMPOSITING) && USE(TEXTURE_MAPPER_GL) && !USE(COORDINATED_GRAPHICS)
+ PassRefPtr<BitmapTexture> MediaPlayerPrivateGStreamerBase::updateTexture(TextureMapper* textureMapper)
+ {
+-    GMutexLocker lock(m_bufferMutex);
++    WebCore::GMutexLocker lock(m_bufferMutex);
+     if (!m_buffer)
+         return nullptr;
+ 
+@@ -366,7 +366,7 @@
+     g_return_if_fail(GST_IS_BUFFER(buffer));
+ 
+     {
+-        GMutexLocker lock(m_bufferMutex);
++        WebCore::GMutexLocker lock(m_bufferMutex);
+         gst_buffer_replace(&m_buffer, buffer);
+     }
+ 
+@@ -398,7 +398,7 @@
+     if (!m_player->visible())
+         return;
+ 
+-    GMutexLocker lock(m_bufferMutex);
++    WebCore::GMutexLocker lock(m_bufferMutex);
+     if (!m_buffer)
+         return;
+ 
+--- webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp.orig	2015-04-13 18:37:20.083233858 +0200
++++ webkitgtk-2.4.8/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp	2015-04-13 18:44:37.753519299 +0200
+@@ -346,7 +346,7 @@
+ 
+     switch (propID) {
+     case PROP_IRADIO_MODE: {
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         priv->iradioMode = g_value_get_boolean(value);
+         break;
+     }
+@@ -364,7 +364,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(object);
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     switch (propID) {
+     case PROP_IRADIO_MODE:
+         g_value_set_boolean(value, priv->iradioMode);
+@@ -417,7 +417,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     bool seeking = priv->seekID;
+ 
+@@ -476,7 +476,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     priv->startID = 0;
+     priv->corsAccessCheck = CORSNoCheck;
+@@ -573,7 +573,7 @@
+         return ret;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     switch (transition) {
+     case GST_STATE_CHANGE_READY_TO_PAUSED:
+         GST_DEBUG_OBJECT(src, "READY->PAUSED");
+@@ -604,7 +604,7 @@
+         gst_query_parse_duration(query, &format, NULL);
+ 
+         GST_DEBUG_OBJECT(src, "duration query in format %s", gst_format_get_name(format));
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         if (format == GST_FORMAT_BYTES && src->priv->size > 0) {
+             gst_query_set_duration(query, format, src->priv->size);
+             result = TRUE;
+@@ -612,7 +612,7 @@
+         break;
+     }
+     case GST_QUERY_URI: {
+-        GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++        WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+         gst_query_set_uri(query, src->priv->uri);
+         result = TRUE;
+         break;
+@@ -653,7 +653,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(handler);
+     gchar* ret;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     ret = g_strdup(src->priv->uri);
+     return ret;
+ }
+@@ -668,7 +668,7 @@
+         return FALSE;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     g_free(priv->uri);
+     priv->uri = 0;
+@@ -704,7 +704,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->needDataID)
+         return FALSE;
+@@ -725,7 +725,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Need more data: %u", length);
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (priv->needDataID || !priv->paused) {
+         return;
+     }
+@@ -739,7 +739,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->enoughDataID)
+         return FALSE;
+@@ -760,7 +760,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Have enough data");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (priv->enoughDataID || priv->paused) {
+         return;
+     }
+@@ -774,7 +774,7 @@
+ 
+     ASSERT(isMainThread());
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     // already stopped
+     if (!priv->seekID)
+         return FALSE;
+@@ -792,7 +792,7 @@
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+     GST_DEBUG_OBJECT(src, "Seeking to offset: %" G_GUINT64_FORMAT, offset);
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (offset == priv->offset && priv->requestedOffset == priv->offset)
+         return TRUE;
+ 
+@@ -811,7 +811,7 @@
+ void webKitWebSrcSetMediaPlayer(WebKitWebSrc* src, WebCore::MediaPlayer* player)
+ {
+     ASSERT(player);
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     src->priv->player = player;
+ }
+ 
+@@ -841,7 +841,7 @@
+ 
+     mapGstBuffer(buffer);
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     priv->buffer = adoptGRef(buffer);
+     locker.unlock();
+ 
+@@ -867,7 +867,7 @@
+         return;
+     }
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     priv->corsAccessCheck = corsAccessCheck;
+ 
+@@ -966,7 +966,7 @@
+     WebKitWebSrc* src = WEBKIT_WEB_SRC(m_src);
+     WebKitWebSrcPrivate* priv = src->priv;
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+ 
+     GST_LOG_OBJECT(src, "Have %lld bytes of data", priv->buffer ? static_cast<long long>(gst_buffer_get_size(priv->buffer.get())) : length);
+ 
+@@ -1035,7 +1035,7 @@
+ 
+     GST_DEBUG_OBJECT(src, "Have EOS");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     if (!priv->seekID) {
+         locker.unlock();
+         gst_app_src_end_of_stream(priv->appsrc);
+@@ -1194,7 +1194,7 @@
+ 
+     GST_ERROR_OBJECT(src, "Request was blocked");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     uri.reset(g_strdup(src->priv->uri));
+     locker.unlock();
+ 
+@@ -1208,7 +1208,7 @@
+ 
+     GST_ERROR_OBJECT(src, "Cannot show URL");
+ 
+-    GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
++    WebCore::GMutexLocker locker(GST_OBJECT_GET_LOCK(src));
+     uri.reset(g_strdup(src->priv->uri));
+     locker.unlock();
+ 
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix
new file mode 100644
index 00000000000..803c552b487
--- /dev/null
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "webrtc-audio-processing-0.1";
+
+  src = fetchurl {
+    url = "http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/${name}.tar.xz";
+    sha256 = "1p7yg8n39wwdfr52br2dq3bh8iypfx9md99mh1i9g2v8qbwm4jzd";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing;
+    description = "a more Linux packaging friendly copy of the AudioProcessing module from the WebRTC project";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix
index 7c9829af771..395a4040153 100644
--- a/pkgs/development/libraries/wiredtiger/default.nix
+++ b/pkgs/development/libraries/wiredtiger/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     homepage = http://wiredtiger.com/;
     description = "";
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    platforms = intersectLists platforms.unix platforms.x86_64;
     maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 30fbdcd1e8d..a2af56cbca6 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -1,7 +1,56 @@
-{ callPackage, ... } @ args:
+{ stdenv, fetchurl, cmake, yasm
+, debugSupport ? false # Run-time sanity checks (debugging)
+, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
+, werrorSupport ? false # Warnings as errors
+, ppaSupport ? false # PPA profiling instrumentation
+, vtuneSupport ? false # Vtune profiling instrumentation
+, custatsSupport ? false # Internal profiling of encoder work
+, cliSupport ? true # Build standalone CLI application
+, unittestsSupport ? false # Unit tests
+}:
 
-callPackage ./generic.nix (args // {
-  version = "1.5";
-  rev = "9f0324125f53a12f766f6ed6f98f16e2f42337f4";
-  sha256 = "1nyim0l975faj7926s4wba8yvjy4rvx005zb7krv0gb5p84nzgi7";
-})
\ No newline at end of file
+let
+  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
+  inherit (stdenv) is64bit;
+in
+
+stdenv.mkDerivation rec {
+  name = "x265-${version}";
+  version = "1.6";
+
+  src = fetchurl {
+    url = "https://github.com/videolan/x265/archive/${version}.tar.gz";
+    sha256 = "17c1phwmgcvvh9bakh1249rj2js77nr7y9igg34i3f8hsrdc4x0w";
+  };
+
+  patchPhase = ''
+    sed -i 's/unknown/${version}/g' source/cmake/version.cmake
+  '';
+
+  cmakeFlags = [
+    (mkFlag debugSupport "CHECKED_BUILD")
+    "-DSTATIC_LINK_CRT=OFF"
+    (mkFlag (highbitdepthSupport && is64bit) "HIGH_BIT_DEPTH")
+    (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
+    (mkFlag ppaSupport "ENABLE_PPA")
+    (mkFlag vtuneSupport "ENABLE_VTUNE")
+    (mkFlag custatsSupport "DETAILED_CU_STATS")
+    "-DENABLE_SHARED=ON"
+    (mkFlag cliSupport "ENABLE_CLI")
+    (mkFlag unittestsSupport "ENABLE_TESTS")
+  ];
+
+  preConfigure = ''
+    cd source
+  '';
+
+  nativeBuildInputs = [ cmake yasm ];
+
+  meta = with stdenv.lib; {
+    description = "Library for encoding h.265/HEVC video streams";
+    homepage    = http://x265.org;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ codyopel ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/x265/generic.nix b/pkgs/development/libraries/x265/generic.nix
deleted file mode 100644
index 2779b581143..00000000000
--- a/pkgs/development/libraries/x265/generic.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ stdenv, fetchhg, cmake, yasm
-, rev , sha256, version
-, debugSupport ? false # Run-time sanity checks (debugging)
-, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel
-, werrorSupport ? false # Warnings as errors
-, ppaSupport ? false # PPA profiling instrumentation
-, vtuneSupport ? false # Vtune profiling instrumentation
-, custatsSupport ? false # Internal profiling of encoder work
-, cliSupport ? true # Build standalone CLI application
-, unittestsSupport ? false # Unit tests
-, ...
-}:
-
-let
-  mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF";
-in
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "x265-${version}";
-
-  src = fetchhg {
-    url = "https://bitbucket.org/multicoreware/x265/src";
-    inherit rev;
-    inherit sha256;
-  };
-
-  patchPhase = ''
-    sed -i 's/unknown/${version}/g' source/cmake/version.cmake
-  '';
-
-  cmakeFlags = with stdenv.lib; [
-    (mkFlag debugSupport "CHECKED_BUILD")
-    "-DSTATIC_LINK_CRT=OFF"
-    (mkFlag (highbitdepthSupport && stdenv.isx86_64) "HIGH_BIT_DEPTH")
-    (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
-    (mkFlag ppaSupport "ENABLE_PPA")
-    "-DENABLE_SHARED=ON"
-    (mkFlag cliSupport "ENABLE_CLI")
-    (mkFlag unittestsSupport "ENABLE_TESTS")
-  ];
-
-  preConfigure = ''
-    cd source
-  '';
-
-  nativeBuildInputs = [ cmake yasm ];
-
-  meta = {
-    description = "Library for encoding h.265/HEVC video streams";
-    homepage    = http://x265.org;
-    license     = licenses.gpl2;
-    maintainers = with maintainers; [ codyopel ];
-    platforms   = platforms.all;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/development/libraries/x265/hg.nix b/pkgs/development/libraries/x265/hg.nix
deleted file mode 100644
index d26df82b3e3..00000000000
--- a/pkgs/development/libraries/x265/hg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "2015-2-11"; # Date of commit used Y-M-D
-  rev = "9ab104096834f51bd799ea1cf1160092f8182944";
-  sha256 = "1j4k6ylglrzng5rz29qx2z06amdrq8wyzvqhm4ivfzvpndfniim6";
-})
\ No newline at end of file
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
index f3b91f442de..56bcba8297d 100644
--- a/pkgs/development/libraries/xmlrpc-c/default.nix
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchurl, curl }:
+{ stdenv, fetchurl, curl, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "xmlrpc-c-1.25.30";
+  name = "xmlrpc-c-1.33.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/xmlrpc-c/${name}.tgz";
-    sha256 = "161gj237baagy5jaa08m54zfyvilb19gql0i5c9ysl3xqm7fvrla";
+    sha256 = "0makq1zpfqnrj6xx1xc7wi4mh115ri9p4yz2rbvjhj0il4y8l4ah";
   };
 
-  buildInputs = [ curl ];
+  buildInputs = [ curl libxml2 ];
+
+  configureFlags = [
+    "--enable-libxml2-backend"
+  ];
 
   # Build and install the "xmlrpc" tool (like the Debian package)
   postInstall = ''
diff --git a/pkgs/development/libraries/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/zita-alsa-pcmi/default.nix
new file mode 100644
index 00000000000..2f5b9183f66
--- /dev/null
+++ b/pkgs/development/libraries/zita-alsa-pcmi/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl , alsaLib, }:
+
+stdenv.mkDerivation rec {
+  name = "zita-alsa-pcmi-${version}";
+  version = "0.2.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "1rgv332g82rrrlm4vdam6p2pyrisxbi7b3izfaa0pcjglafsy7j9";
+  };
+
+  buildInputs = [ alsaLib ];
+
+  buildPhase = ''
+    cd libs
+    make PREFIX="$out"
+
+    # create lib link for building apps
+    ln -s libzita-alsa-pcmi.so.$version libzita-alsa-pcmi.so
+
+    # apps
+    cd ../apps
+    CXXFLAGS+=" -I../libs" \
+    LDFLAGS+=" -L../libs" \
+    make PREFIX="$out"
+  '';
+
+  installPhase = ''
+    mkdir "$out"
+    mkdir "$out/lib"
+    mkdir "$out/include"
+    mkdir "$out/bin"
+
+    cd ../libs
+
+    # libs
+    install -Dm755 libzita-alsa-pcmi.so.$version \
+      "$out/lib/libzita-alsa-pcmi.so.$version"
+
+    # link
+    ln -s libzita-alsa-pcmi.so.$version \
+      "$out/lib/libzita-alsa-pcmi.so"
+    ln -s libzita-alsa-pcmi.so.$version \
+      "$out/lib/libzita-alsa-pcmi.so.0"
+
+    # header
+    install -Dm644 zita-alsa-pcmi.h \
+      "$out/include/zita-alsa-pcmi.h"
+
+    # apps
+    install -Dm755 ../apps/alsa_delay \
+      "$out/bin/alsa_delay"
+    install -Dm755 ../apps/alsa_loopback \
+      "$out/bin/alsa_delay"
+  '';
+
+  meta = {
+    description = "The successor of clalsadrv, provides easy access to ALSA PCM devices";
+    version = "${version}";
+    homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 706c74b6ce6..e19d8cdfcb2 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation (rec {
   meta = with stdenv.lib; {
     description = "Lossless data-compression library";
     license = licenses.zlib;
+    platforms = platforms.all;
   };
 } // (if stdenv.isDarwin then {
   postInstall = ''
diff --git a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
index 6452bd5d95a..05376c1e9a3 100755
--- a/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
+++ b/pkgs/development/lisp-modules/clwrapper/cl-wrapper.sh
@@ -40,6 +40,8 @@ NIX_LISP_ASDF_REGISTRY_CODE="
     )
 "
 
+NIX_LISP_ASDF="${NIX_LISP_ASDF:-@asdf@}"
+
 [ -z "$NIX_LISP_SKIP_CODE" ] && "$NIX_LISP_COMMAND" $NIX_LISP_EARLY_OPTIONS \
 	$NIX_LISP_EXEC_CODE "(load \"$NIX_LISP_ASDF/lib/common-lisp/asdf/build/asdf.lisp\")" \
 	$NIX_LISP_EXEC_CODE "$NIX_LISP_ASDF_REGISTRY_CODE" \
diff --git a/pkgs/development/lisp-modules/clwrapper/default.nix b/pkgs/development/lisp-modules/clwrapper/default.nix
index 9641dc305be..be1f1f93a02 100644
--- a/pkgs/development/lisp-modules/clwrapper/default.nix
+++ b/pkgs/development/lisp-modules/clwrapper/default.nix
@@ -6,9 +6,9 @@ stdenv.mkDerivation {
 
   installPhase=''
     mkdir -p "$out"/bin
-    cp ${./cl-wrapper.sh} "$out"/bin/cl-wrapper.sh
     cp ${./common-lisp.sh} "$out"/bin/common-lisp.sh
     substituteAll "${./build-with-lisp.sh}" "$out/bin/build-with-lisp.sh"
+    substituteAll "${./cl-wrapper.sh}" "$out/bin/cl-wrapper.sh"
     chmod a+x "$out"/bin/*
   '';
 
diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index e423344fb16..d7bd2348244 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -20,7 +20,7 @@ let lispPackages = rec {
   clx = buildLispPackage rec {
     baseName = "clx";
     version = "git-20150117";
-    description = "An implementation of the X Window System protocol in Lisp.";
+    description = "An implementation of the X Window System protocol in Lisp";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -36,11 +36,11 @@ let lispPackages = rec {
     version = "darcs-2014-11-01";
     description = "Iteration package for Common Lisp";
     deps = [];
-    src = pkgs.fetchdarcs {
-      url = "http://common-lisp.net/project/iterate/darcs/iterate";
+    src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs {
+      url = "https://common-lisp.net/project/iterate/darcs/iterate";
       sha256 = "0gm05s3laiivsqgqjfj1rkz83c2c0jyn4msfgbv6sz42znjpam25";
       context = ./iterate.darcs-context;
-    };
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";}));
     overrides = x: {
       configurePhase="buildPhase(){ true; }";
     };
@@ -52,7 +52,7 @@ let lispPackages = rec {
     description = "A collection of portable public domain utilities";
     deps = [];
     src = pkgs.fetchgit {
-      url = "git://common-lisp.net/projects/alexandria/alexandria.git";
+      url = "https://gitlab.common-lisp.net/alexandria/alexandria.git";
       sha256 = "1d981a243f9d4d3c9fd86cc47698050507ff615b87b9a710449abdb4234e501b";
       rev = ''2b1eb4067fb34bc501e527de75d09166a8ba9ceb'';
     };
@@ -98,7 +98,7 @@ let lispPackages = rec {
   clx-truetype = buildLispPackage rec {
     baseName = "clx-truetype";
     version = "git-20141112";
-    description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.";
+    description = "clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension";
     deps = [cl-fad cl-store cl-vectors clx trivial-features zpb-ttf];
     # Source type: git
     src = pkgs.fetchgit {
@@ -178,7 +178,7 @@ let lispPackages = rec {
   trivial-features = buildLispPackage rec {
     baseName = "trivial-features";
     version = "git-20141112";
-    description = "Ensures consistent *FEATURES* across multiple CLs.";
+    description = "Ensures consistent *FEATURES* across multiple CLs";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -238,7 +238,7 @@ let lispPackages = rec {
         export CL_SOURCE_REGISTRY="$CL_SOURCE_REGISTRY:$out/lib/common-lisp/query-fs"
 	export HOME=$PWD
 	build-with-lisp.sh sbcl \
-	  ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/:\2/g')" \
+	  ":query-fs $(echo "$linkedSystems" | sed -re 's/(^| )([^ :])/ :\2/g')" \
 	  "$out/bin/query-fs" \
 	  "(query-fs:run-fs-with-cmdline-args)"
       '';
@@ -280,7 +280,7 @@ let lispPackages = rec {
   babel = buildLispPackage rec {
     baseName = "babel";
     version = "git-20141113";
-    description = "Babel, a charset conversion library.";
+    description = "A charset conversion library";
     deps = [alexandria trivial-features];
     # Source type: git
     src = pkgs.fetchgit {
@@ -308,10 +308,10 @@ let lispPackages = rec {
     description = "A UTF-8 encoding library";
     deps = [];
     # Source type: darcs
-    src = pkgs.fetchdarcs {
+    src = (pkgs.lib.overrideDerivation (pkgs.fetchdarcs {
       url = ''http://common-lisp.net/project/trivial-utf-8/darcs/trivial-utf-8/'';
       sha256 = "1jz27gz8gvqdmvp3k9bxschs6d5b3qgk94qp2bj6nv1d0jc3m1l1";
-    };
+    }) (x: {SSL_CERT_FILE=pkgs.cacert + "/etc/ca-bundle.crt";}));
   };
 
   cl-fuse-meta-fs = buildLispPackage rec {
@@ -408,7 +408,7 @@ let lispPackages = rec {
   trivial-gray-streams = buildLispPackage rec {
     baseName = "trivial-gray-streams";
     version = "git-20141113";
-    description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).";
+    description = "Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams)";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -421,7 +421,7 @@ let lispPackages = rec {
   cl-ssl = buildLispPackage rec {
     baseName = "cl+ssl";
     version = "git-20141113";
-    description = "Common Lisp interface to OpenSSL.";
+    description = "Common Lisp interface to OpenSSL";
     deps = [bordeaux-threads cffi flexi-streams trivial-garbage trivial-gray-streams];
     # Source type: git
     src = pkgs.fetchgit {
@@ -448,7 +448,7 @@ let lispPackages = rec {
   trivial-garbage = buildLispPackage rec {
     baseName = "trivial-garbage";
     version = "git-20141113";
-    description = "Portable finalizers, weak hash-tables and weak pointers.";
+    description = "Portable finalizers, weak hash-tables and weak pointers";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -461,7 +461,7 @@ let lispPackages = rec {
   cl-base64 = buildLispPackage rec {
     baseName = "cl-base64";
     version = "git-20141113";
-    description = "Base64 encoding and decoding with URI support.";
+    description = "Base64 encoding and decoding with URI support";
     deps = [];
     # Source type: git
     src = pkgs.fetchgit {
@@ -547,5 +547,18 @@ let lispPackages = rec {
       cvsRoot = '':pserver:anonymous:anonymous@common-lisp.net:/project/cl-smtp/cvsroot'';
     };
   };
+
+  md5 = buildLispPackage rec {
+    baseName = "md5";
+    version = "git-20150415";
+    description = "The MD5 Message-Digest Algorithm RFC 1321";
+    deps = [];
+    # Source type: git
+    src = pkgs.fetchgit {
+      url = ''https://github.com/pmai/md5'';
+      sha256 = "f64d7e36c54da649bb1d574b92cdb907291224fb3d8565b3708703a81820367b";
+      rev = ''9d6f82f7121c87fb7e3b314987ba93900d300dc6'';
+    };
+  };
 };
 in lispPackages
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index ab64ad589db..76e160fb0da 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -32,6 +32,12 @@ stdenv.mkDerivation {
             patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
         done
     ''}
+
+    mkdir -p $out/bin
+    for i in adb fastboot
+    do
+        ln -sf $out/platform-tools/$i $out/bin/$i
+    done
   '';
   
   buildInputs = [ unzip ];
diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix
index 5445fd1e110..e81c94d8b24 100644
--- a/pkgs/development/ocaml-modules/jsonm/default.nix
+++ b/pkgs/development/ocaml-modules/jsonm/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format";
     homepage = http://erratique.ch/software/jsonm;
-    licenses = stdenv.lib.licenses.bsd3;
+    license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ vbgl ];
     platforms = ocaml.meta.platforms;
   };
diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix
new file mode 100644
index 00000000000..d77c3f68115
--- /dev/null
+++ b/pkgs/development/ocaml-modules/magic-mime/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchzip, ocaml, findlib }:
+
+let version = "1.0.0"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-magic-mime-${version}";
+
+  src = fetchzip {
+    url = "https://github.com/mirage/ocaml-magic-mime/archive/v${version}.tar.gz";
+    sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/mirage/ocaml-magic-mime;
+    description = "Convert file extensions to MIME types";
+    platforms = ocaml.meta.platforms;
+    license = stdenv.lib.licenses.isc;
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix
index f1166d1c324..00c0d472f9a 100644
--- a/pkgs/development/ocaml-modules/pgocaml/default.nix
+++ b/pkgs/development/ocaml-modules/pgocaml/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre}:
+{ stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre }:
 
 stdenv.mkDerivation {
-  name = "ocaml-pgocaml-2.1";
+  name = "ocaml-pgocaml-2.2";
   src = fetchurl {
-    url = http://forge.ocamlcore.org/frs/download.php/1413/pgocaml-2.1.tgz;
-    sha256 = "0m7whlmhm7z58pfaarvkyiwaylmrz05aj6fr773zd9xlv07ljiym";
+    url = http://forge.ocamlcore.org/frs/download.php/1506/pgocaml-2.2.tgz;
+    sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh";
   };
 
-  buildInputs = [ocaml findlib camlp4];
-  propagatedBuildInputs = [calendar csv ocaml_pcre];
+  buildInputs = [ ocaml findlib camlp4 ];
+  propagatedBuildInputs = [ calendar csv ocaml_pcre ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 45e54496b9c..b8a09492eab 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
 
-  version = "2014.11.29";
+  version = "2014.11.29-2";
 
   name = "pharo-vm-core-i386-${version}";
   system = "x86_32-linux";
@@ -13,17 +13,22 @@ stdenv.mkDerivation rec {
 
   sources10Zip = fetchurl {
     url = http://files.pharo.org/sources/PharoV10.sources.zip;
-    md5 = "3476222a0345a6f8f8b6093b5e3b30fb";
+    sha256 = "0aijhr3w5w3jzmnpl61g6xkwyi2l1mxy0qbvr9k3whz8zlrsijh2";
   };
 
   sources20Zip = fetchurl {
     url = http://files.pharo.org/sources/PharoV20.sources.zip;
-    md5 = "a145b0733f9d68d9ce6a76270b6b9ec8";
+    sha256 = "1xsc0p361pp8iha5zckppw29sbapd706wbvzvgjnkv2n6n1q5gj7";
   };
 
   sources30Zip = fetchurl {
     url = http://files.pharo.org/sources/PharoV30.sources.zip;
-    md5 = "bb0a66b8968ef7d0da97ec86331f68c8";
+    sha256 = "08d9a7gggwpwgrfbp7iv5896jgqz3vgjfrq19y3jw8k10pva98ak";
+  };
+
+  sources40Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV40.sources.zip;
+    sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd";
   };
 
   # Building
@@ -74,6 +79,7 @@ stdenv.mkDerivation rec {
     unzip ${sources10Zip} -d $prefix/lib/pharo-vm/
     unzip ${sources20Zip} -d $prefix/lib/pharo-vm/
     unzip ${sources30Zip} -d $prefix/lib/pharo-vm/
+    unzip ${sources40Zip} -d $prefix/lib/pharo-vm/
   '';
 
   buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xlibs.libX11 xlibs.libICE xlibs.libSM alsaLib cairo ];
diff --git a/pkgs/development/python-modules/dbus/default.nix b/pkgs/development/python-modules/dbus/default.nix
index bc386e7e5ac..5bcdc54583d 100644
--- a/pkgs/development/python-modules/dbus/default.nix
+++ b/pkgs/development/python-modules/dbus/default.nix
@@ -18,5 +18,6 @@ if isPyPy then throw "dbus-python not supported for interpreter ${python.executa
   meta = {
     description = "Python DBus bindings";
     license = stdenv.lib.licenses.mit;
+    platforms = dbus.meta.platforms;
   };
 }
diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 20fb2ec496b..b962e9f8472 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -62,10 +62,10 @@ if disabled then throw "${name} not supported for interpreter ${python.executabl
   ] ++ buildInputs ++ pythonPath
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
-  # propagate python to active setup-hook in nix-shell
-  propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python ];
+  # propagate python/setuptools to active setup-hook in nix-shell
+  propagatedBuildInputs = propagatedBuildInputs ++ [ recursivePthLoader python setuptools ];
 
-  pythonPath = [ setuptools ] ++ pythonPath;
+  pythonPath = pythonPath;
 
   configurePhase = attrs.configurePhase or ''
     runHook preConfigure
diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index e343536b8fa..220ddf26b30 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -26,12 +26,7 @@ wrapPythonProgramsIn() {
             # dont wrap EGG-INFO scripts since they are called from python
             if echo "$i" | grep -v EGG-INFO/scripts; then
                 echo "wrapping \`$i'..."
-                sed -i "$i" -re '1 {
-                    /^#!/!b; :r
-                    /\\$/{N;b r}
-                    /__future__|^ *(#.*)?$/{n;b r}
-                    /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"'
-                }'
+                sed -i "$i" -re '@magicalSedExpression@'
                 wrapProgram "$i" \
                     --prefix PYTHONPATH ":" $program_PYTHONPATH \
                     --prefix PATH ":" $program_PATH
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 1661152664f..23cc654d6a5 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -21,7 +21,7 @@ AFLPsim = derive { name="AFLPsim"; version="0.3-4"; sha256="0xqp1d3cn8rcrsx0yipq
 AGD = derive { name="AGD"; version="0.32"; sha256="1jjkclqylh43vm1bj1g4cml7a84sxdl94kmhxgmk04rdkmgf8c47"; depends=[gamlss gamlss_dist]; };
 AGSDest = derive { name="AGSDest"; version="2.2"; sha256="00kf786i72bc4a80qswq1iazwqi709pxvzadgfih511plgir6ik2"; depends=[ldbounds]; };
 AICcmodavg = derive { name="AICcmodavg"; version="2.0-3"; sha256="1a9jbf3vd77hsf98smjgqchhkc9z8qqp12c1mflln3l0pxx0vk8q"; depends=[lattice MASS Matrix nlme unmarked VGAM xtable]; };
-AID = derive { name="AID"; version="1.4"; sha256="1wj2jmqla0b2y9hrvl5i69bncdx1xjdd7if69j6dy1dnxv6clx1z"; depends=[MASS tseries nortest]; };
+AID = derive { name="AID"; version="1.5"; sha256="0fpgq2ahl0mdj0sb0p39z2ksslsiwm3hma8d09jmggi3yjbrgqq7"; depends=[MASS tseries nortest]; };
 AIM = derive { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival survival]; };
 ALDqr = derive { name="ALDqr"; version="0.5"; sha256="0294d6cjfl5m63jhrv4rbh7npwrbmmw5101jz5bbwihhj94qcxp9"; depends=[HyperbolicDist]; };
 ALKr = derive { name="ALKr"; version="0.5.3.1"; sha256="09df3vx2q0sn8fwz2cc9lckzwrf2hgbglzyn376d6nkrm6gq792a"; depends=[MASS Rcpp Rcpp]; };
@@ -38,7 +38,7 @@ AR1seg = derive { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0by
 ARPobservation = derive { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
 ARTP = derive { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
 ARTool = derive { name="ARTool"; version="0.9.3"; sha256="188k3whgm93jm2kpvh711d4l73gickn9iwidz95srwdcdlf9cf1y"; depends=[lme4 car plyr pbkrtest]; };
-ASMap = derive { name="ASMap"; version="0.3-3"; sha256="011r1q6g3rwhxsgvzzb9y08zba0g18m1kgnzij6nm7qblhyvsk92"; depends=[qtl gtools fields lattice]; };
+ASMap = derive { name="ASMap"; version="0.4"; sha256="0nfycg62y6bq3z11ldkdfgv469k4zw6jl9mv7qlczm8f01dh5r1m"; depends=[qtl gtools fields lattice]; };
 ASPBay = derive { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp Rcpp RcppArmadillo]; };
 ATE = derive { name="ATE"; version="0.2.0"; sha256="1i46ivb7q61kq11z9v1rlnwad914nsdjcz9bagqx17vjk160mc0a"; depends=[]; };
 ATmet = derive { name="ATmet"; version="1.2"; sha256="047ibxxf5si45zw22zy8a1kpj36q0pd3bsmxwvn0dhf4h65ah0zz"; depends=[DiceDesign lhs metRology msm sensitivity]; };
@@ -53,6 +53,7 @@ AdaptFitOS = derive { name="AdaptFitOS"; version="0.54"; sha256="0h9jfq9mk5wd6v6
 AdaptiveSparsity = derive { name="AdaptiveSparsity"; version="1.4"; sha256="1az7isvalf3kmdiycrfl6s9k9xqk22k1mc6rh8v0jmcz402qyq8z"; depends=[Rcpp Rcpp RcppArmadillo]; };
 AdequacyModel = derive { name="AdequacyModel"; version="1.0.8"; sha256="1bpb6lwgkh5g82h4yaf5dh2jbl6f0vz36k22538rhb3kdld6w0i3"; depends=[]; };
 Agreement = derive { name="Agreement"; version="0.8-1"; sha256="1g29rxr8xsr0dh2r6c6j2bqs0q6snz9wz0hrnb92cxj27ili55yq"; depends=[R2HTML]; };
+Ake = derive { name="Ake"; version="1.0"; sha256="1dj598xfdyjqvysc39a0d5gizgk367c5lkddmwmsqa8zjmvpr15a"; depends=[]; };
 AlgDesign = derive { name="AlgDesign"; version="1.1-7.3"; sha256="0bl7mx4dnmkgs2x1fj7cqnrp7jx18mqwxyga0rzlniq12h8mc3fz"; depends=[]; };
 AllPossibleSpellings = derive { name="AllPossibleSpellings"; version="1.1"; sha256="0ksfm2pfjka3yjgcd257v7sns1niaylsfxvhhh2jwdi016cpdw10"; depends=[]; };
 AlleleRetain = derive { name="AlleleRetain"; version="1.3.1"; sha256="1k2iwns1wk5n02cii6p9prgdb6asys3vwiq5dq2i26fk2xr6j4gq"; depends=[]; };
@@ -77,20 +78,20 @@ AssotesteR = derive { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprc
 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]; };
+AutoSEARCH = derive { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[zoo lgarch]; };
 B2Z = derive { name="B2Z"; version="1.4"; sha256="0w7394vs883vb32gs6yhrc1kh5406rs851yb2gs8hqzxad1alvpn"; depends=[numDeriv coda mvtnorm]; };
 BACA = derive { name="BACA"; version="0.99.0"; sha256="19n6ajq6szpzwj36lfg7wrh2j3d3ikn13a1j3g2xvfy275qdmmm4"; depends=[ggplot2 rJava]; };
 BACCO = derive { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[emulator calibrator approximator]; };
 BACprior = derive { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[mvtnorm leaps boot]; };
 BAEssd = derive { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
-BAMMtools = derive { name="BAMMtools"; version="2.0.4"; sha256="1cy7lplw2i8dabipmjnclywh36agj37hmqcwsk0x99dl6k3mb3d7"; depends=[ape]; };
+BAMMtools = derive { name="BAMMtools"; version="2.0.5"; sha256="1xrhif8872w5rwiba5lc705162si3vflri2r6wj8n69qg979kvw0"; depends=[ape]; };
 BANFF = derive { name="BANFF"; version="0.3"; sha256="0z7hwplp12m8sypkndjkjkmanbh67h47k8j9wm60qg6nnyqry9np"; depends=[foreach doParallel DPpackage igraph mclust pscl tmvtnorm network coda]; };
 BANOVA = derive { name="BANOVA"; version="0.2"; sha256="1zgn9wxh4c89rris58hhj5fh37mmy8wjvligr02id7a1pcw177m3"; depends=[rjags runjags coda]; };
 BASIX = derive { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
 BAT = derive { name="BAT"; version="1.2.1"; sha256="073qqx2xmiccf4h7allfavmr2sxhvwc1njnkc0slmyn46nlsk7sl"; depends=[vegan spatstat nls2]; };
 BAYSTAR = derive { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[mvtnorm coda]; };
 BB = derive { name="BB"; version="2014.10-1"; sha256="1lig3vxhyxy8cnic5bczms8pajmdvwr2ijad1rkdndpglving7x0"; depends=[quadprog]; };
-BBEST = derive { name="BBEST"; version="0.1-3"; sha256="0ys314bbic4yvgfsbpdhy918z3zjpg2km96v9z6vipcm4vnmsj6a"; depends=[DEoptim aws ggplot2 reshape2 shiny]; };
+BBEST = derive { name="BBEST"; version="0.1-4"; sha256="0yqsz97lljlydhphiy0fb7vwbqxpjzn5v0v665c39dlprxv3jg3b"; depends=[DEoptim wmtsa ggplot2 reshape2 shiny]; };
 BBMM = derive { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; };
 BBRecapture = derive { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI locfit lme4 secr]; };
 BBmisc = derive { name="BBmisc"; version="1.9"; sha256="01ihbx6cfgqvz87kpy7yb9c7jlizdym3f0n16967x2imq73dazsb"; depends=[checkmate]; };
@@ -105,7 +106,7 @@ BEANSP = derive { name="BEANSP"; version="1.0"; sha256="0xcb81pk3iidb3dz9l4hm6cw
 BEDASSLE = derive { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[MASS matrixcalc emdbook]; };
 BEQI2 = derive { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[knitr markdown jsonlite xtable plyr reshape2]; };
 BEST = derive { name="BEST"; version="0.2.2"; sha256="160lvrd0zjm1lr8llra6lyz3qsmqhn3bpdlmwingwfimbpb754rz"; depends=[rjags coda]; };
-BGLR = derive { name="BGLR"; version="1.0.3"; sha256="02aw71r8khnkahqplycwziz7fh8hmnniq5bqnsk4fijv7z9gkbkg"; depends=[]; };
+BGLR = derive { name="BGLR"; version="1.0.4"; sha256="1bvk8iifvrcvnb0f1k3v9xxajljsz79ck95191p8alnda64cz0zf"; depends=[]; };
 BGPhazard = derive { name="BGPhazard"; version="1.2.2"; sha256="1v89pjigrjkin9vsf6sa0qhwxvn1a3dy2gqwq3sd9v6y0hrld6ng"; depends=[survival]; };
 BGSIMD = derive { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; };
 BH = derive { name="BH"; version="1.55.0-3"; sha256="0p3xbbnj4l844sgg59ply5ng8z42lbs6z8cghsr3bxbbv4w9lkbs"; depends=[]; };
@@ -151,7 +152,8 @@ BayesCR = derive { name="BayesCR"; version="2.0"; sha256="0cafind5vz81ryw1c7324h
 BayesComm = derive { name="BayesComm"; version="0.1-0"; sha256="17hnq4z451g2j3p73awllihhwsdy3grh6ki3qy9bkr064wvzbvcj"; depends=[Rcpp RcppArmadillo coda Rcpp RcppArmadillo]; };
 BayesDA = derive { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
 BayesFactor = derive { name="BayesFactor"; version="0.9.11-1"; sha256="0vq656q38vlf0ba8g23psk8as1y48y6s8yrvqrppbjx5d9wlm9wv"; depends=[coda Matrix pbapply mvtnorm stringr gtools MatrixModels Rcpp Rcpp RcppEigen]; };
-BayesGESM = derive { name="BayesGESM"; version="1.2"; sha256="1mbi4lb7bjpmkwc3ns3mfvmfqr85pfx85rkcq95pl91saxichs4s"; depends=[truncdist GIGrvg normalp Formula]; };
+BayesGESM = derive { name="BayesGESM"; version="1.3"; sha256="0lw593hqava5bhr8nfbh3qw63ilfr06zh58p2rw3nnv1ldrrzncv"; depends=[truncdist GIGrvg normalp Formula]; };
+BayesLCA = derive { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[e1071 coda fields nlme MCMCpack]; };
 BayesLogit = derive { name="BayesLogit"; version="0.5.1"; sha256="0nr215wzhqlfi32617mmqb6i3w5x1kh5fiy68k0xzdqjsyjr65m0"; depends=[]; };
 BayesMed = derive { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[R2jags QRM polspline MCMCpack]; };
 BayesMixSurv = derive { name="BayesMixSurv"; version="0.9"; sha256="0hqkqpzk21d2zh7pyn042w1s51wyszkmam0rwzgy0i9i51zjxwvz"; depends=[survival]; };
@@ -190,13 +192,13 @@ BioMark = derive { name="BioMark"; version="0.4.2"; sha256="17r4q2migmdk2vqfbr69
 BioPhysConnectoR = derive { name="BioPhysConnectoR"; version="1.6-10"; sha256="1cc22knlvbvwsrz2a7syk2ampm1ljc44ykv5wf0szhnh75pxg13l"; depends=[snow matrixcalc]; };
 BioStatR = derive { name="BioStatR"; version="2.0.0"; sha256="1k3z337lj8r06xgrqgi5h67hhkz2s5hggj6dhcciq26i1nzafsw6"; depends=[ggplot2]; };
 Biodem = derive { name="Biodem"; version="0.3"; sha256="0wfyypr46awki2nrvhcjwacmaxrr2wvhdv9hddnf10msssflvshc"; depends=[]; };
-BiodiversityR = derive { name="BiodiversityR"; version="2.5-1"; sha256="0nyss1apsgskg291dq66nv6a1q31vkl7w29aq7l2a13s2kqc0ikq"; depends=[vegan Rcmdr]; };
+BiodiversityR = derive { name="BiodiversityR"; version="2.5-2"; sha256="0l23nlibv7wjmkv1jnssaab3iwm2i5wrkzjji2x9rr5131aj82gn"; depends=[vegan Rcmdr]; };
 Biograph = derive { name="Biograph"; version="2.0.4"; sha256="1mik5yvbi28xnyzha8p3xjaa064x29wgn18yx766wha7djxxr353"; depends=[etm msm Epi lubridate reshape plyr survival mstate ggplot2]; };
 BlakerCI = derive { name="BlakerCI"; version="1.0-4"; sha256="1sa9qq5frjjcw46p3ankn7v3gj0gwn9lww6jacz8flf5qpplhn4l"; depends=[]; };
 BlandAltmanLeh = derive { name="BlandAltmanLeh"; version="0.1.0"; sha256="0y35zkxiallp4x09646qb8wj9bayh7mpnjg43qmzhxkm7l95b78r"; depends=[]; };
 Blaunet = derive { name="Blaunet"; version="1.0.1"; sha256="1qcp5wag4081pcjg5paryxz3hk3rqql15v891ppqc1injni7rljz"; depends=[network]; };
 BlockMessage = derive { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; };
-Bmix = derive { name="Bmix"; version="0.4"; sha256="0q6bxfdbvd3z3x4ifkmsqpfm8r5fx9jqxpyfgqlah9nkz0xjaf9z"; depends=[mvtnorm]; };
+Bmix = derive { name="Bmix"; version="0.5"; sha256="0cwp0z5841yqndpln8vc7wkbc8jgdwf0a772x4rgpihvg1g9qz5j"; depends=[mvtnorm]; };
 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=[]; };
@@ -206,7 +208,7 @@ BoomSpikeSlab = derive { name="BoomSpikeSlab"; version="0.5.2"; sha256="0n7kf0nk
 BootPR = derive { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
 Boruta = derive { name="Boruta"; version="4.0.0"; sha256="1r7bl4ab6swhks9cijhqn9gdhp2vjfhwb65fi5rzz0yvzxx97xi8"; depends=[randomForest rFerns]; };
 BradleyTerry2 = derive { name="BradleyTerry2"; version="1.0-6"; sha256="1080q7fw4yfl2y0jh3w2xz342i5yhhhavq40i3902bsmjj8g531d"; depends=[lme4 brglm gtools]; };
-BrailleR = derive { name="BrailleR"; version="0.16.1"; sha256="0jr7wb1jibf7bmv7bqxn94dc4ai7kd4hj88dcql8rnilkvmqyqwj"; depends=[nortest xtable moments knitr]; };
+BrailleR = derive { name="BrailleR"; version="0.18-1"; sha256="0v5y5v6b52kh4146bbhwpsnb5p435dk5nhv28sxi7r89fixbc20q"; depends=[nortest xtable moments knitr gridGraphics gridSVG]; };
 Brobdingnag = derive { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
 Brq = derive { name="Brq"; version="1.0"; sha256="0m01qw0mh9za1gx1vkbyvwny4k5fvmvs9dbp0504q8jqfqf4l1vj"; depends=[quantreg truncnorm]; };
 BsMD = derive { name="BsMD"; version="2013.0718"; sha256="1yvazqlbmm221r7nkhrhi309gkk6vx7ji5xlvf07klya2zg20gcj"; depends=[]; };
@@ -218,8 +220,9 @@ CALIBERrfimpute = derive { name="CALIBERrfimpute"; version="0.1-6"; sha256="036n
 CALINE3 = derive { name="CALINE3"; version="1.0-2"; sha256="07w1kb7wqdi1qslpvpmqcmq6da4h7sgwv3aih4brdprym61c3rkm"; depends=[]; };
 CAM = derive { name="CAM"; version="1.0"; sha256="07mmrz6j8cm6zgaw2zcxgkxb7abd651kb80526r271snjgvpr5bl"; depends=[glmnet mboost Matrix mgcv]; };
 CAMAN = derive { name="CAMAN"; version="0.72"; sha256="10qikirv73d03ssg3sb6w3ih92ms5726b5lqw3x7r5rpbl9179rh"; depends=[sp mvtnorm]; };
-CARBayes = derive { name="CARBayes"; version="4.0"; sha256="1v5pl1hfmmmlcnl324g45playkki20n33w4p5g536260kva74zly"; depends=[MASS Rcpp truncdist spam coda sp Rcpp]; };
+CARBayes = derive { name="CARBayes"; version="4.1"; sha256="0g4b44p3ybb92wrm42ws8yrrdzmxk454w6a3w20fbhfc2zprjilz"; depends=[MASS Rcpp CARBayesdata coda sp spam truncdist Rcpp]; };
 CARBayesST = derive { name="CARBayesST"; version="1.1"; sha256="03vp6qajag0ak4lcn0ddyxri3ndiwsc4yxi6ym5lr2v6kv674wl6"; depends=[Rcpp spam truncdist coda Rcpp]; };
+CARBayesdata = derive { name="CARBayesdata"; version="1.0"; sha256="19dhgkqpdcq1y866arb3qm7wbl348w66yl85kwajkmqgplx2pvaq"; depends=[sp shapefiles]; };
 CARE1 = derive { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
 CARLIT = derive { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
 CARramps = derive { name="CARramps"; version="0.1.2"; sha256="097xxvql6qglk6x4yi7xsvr15n0yj21613zv003z0mhgvqr1n5vf"; depends=[]; };
@@ -246,7 +249,7 @@ CHAT = derive { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3r
 CHCN = derive { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
 CHNOSZ = derive { name="CHNOSZ"; version="1.0.3.1"; sha256="0cmirnb8jkaxnscpkwm2a8yyzl9zaf3q323avpgg7fwwhr6c1l19"; depends=[]; };
 CHsharp = derive { name="CHsharp"; version="0.3"; sha256="0aa9v6yih6qmqsmc8zsl8k1wqsp3sp2bfwri3d37k06vfj7gwbh0"; depends=[scatterplot3d KernSmooth]; };
-CIDnetworks = derive { name="CIDnetworks"; version="0.8.0"; sha256="183mv0jq2l2zvqywxkdnmkclm7wix96fll9m4ypdp782i0qil2rr"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm Rcpp]; };
+CIDnetworks = derive { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[mvtnorm msm Rcpp igraph numDeriv pbivnorm MASS Rcpp]; };
 CIFsmry = derive { name="CIFsmry"; version="1.0.1"; sha256="118vyiiy4iqn86n9xf84n5hrwrhzhr1mdsmyg9sm6qq6dm7zg6la"; depends=[]; };
 CINID = derive { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
 CINOEDV = derive { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[R_matlab igraph ggplot2 reshape2]; };
@@ -279,7 +282,7 @@ CR = derive { name="CR"; version="1.0"; sha256="0smb2i560dwbxg3mp1svfxmaiw193pd3
 CRAC = derive { name="CRAC"; version="1.0"; sha256="0vnqmmmwakx5jnzqp20dng35p7rvmz3ypm2m7bs41m8nhh2wq1xa"; depends=[]; };
 CRF = derive { name="CRF"; version="0.3-8"; sha256="0w9wfjlx6hvd07k0iszfyip0vn0ca5ax2d5g7hsg6pm2isnzap8a"; depends=[Rglpk Matrix]; };
 CRM = derive { name="CRM"; version="1.1.1"; sha256="09h6xvqc2h2gxhdhc7592z93cnw16l549pn9i26ml0f0n20hljmf"; depends=[]; };
-CRTSize = derive { name="CRTSize"; version="0.4"; sha256="02g0799f8i123lihvz0w2qpwbkq22998sni0c392vyzvznfzagwa"; depends=[]; };
+CRTSize = derive { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; };
 CSS = derive { name="CSS"; version="1.0.2"; sha256="0p0c3gfj6p58hd4398kkpjg7rhx6wh5z6qddpqnvbm24acq7nrvh"; depends=[XML stringr]; };
 CTT = derive { name="CTT"; version="2.1"; sha256="0v8k54x9pib6hq3nz3m80g1a3p003f7bn8wnj9swwvacc90d6n44"; depends=[]; };
 CUMP = derive { name="CUMP"; version="1.0"; sha256="0dbpgm75nbd4h8rf3ca5n4mgdn3qm4yyf2d48vlihakzw6rqbpka"; depends=[]; };
@@ -311,12 +314,12 @@ CircNNTSR = derive { name="CircNNTSR"; version="2.1"; sha256="1rl17kw6bl5xf7pgsc
 CircStats = derive { name="CircStats"; version="0.2-4"; sha256="1f2pf1ppp843raa82s2qxm3xlcv6zpi578zc4pl0d7qyxqnh603s"; depends=[MASS boot]; };
 CityPlot = derive { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; };
 Ckmeans_1d_dp = derive { name="Ckmeans.1d.dp"; version="3.3.1"; sha256="0gzwcg6f3p1vr30lyniqiq4893kjxri4y2vjzh6qrldnay42kqf9"; depends=[]; };
-ClickClust = derive { name="ClickClust"; version="1.1.3"; sha256="03xcmz1php6hl5ic0ipda3lsdyk5aql23jbilril2h9kvwifbbsf"; depends=[]; };
+ClickClust = derive { name="ClickClust"; version="1.1.4"; sha256="17r8jzhzwqa5h04bxdcyv31jhk6c709sx5m1z53jh3yf9zmkilvi"; depends=[]; };
 ClimClass = derive { name="ClimClass"; version="1.0"; sha256="07jl8vwqyyj4q2hav8qbg69yjs73s3kbms5bd9hqs1y938rrp2l5"; depends=[geosphere ggplot2 reshape2]; };
 ClueR = derive { name="ClueR"; version="1.0"; sha256="1ak8pgbzm5xrk7pjnkbiqdwyvvyvrm6k6h50ycc86w3zy7fnqhds"; depends=[e1071]; };
 ClustOfVar = derive { name="ClustOfVar"; version="0.8"; sha256="17y8q2g4yjxs2jl1s8n5svxi021nlm0phs1g5hcnfxzpadq84wbs"; depends=[]; };
 ClustVarLV = derive { name="ClustVarLV"; version="1.3.2"; sha256="0lnrpvfkhsmjjaimxqjrvwv4wrh6mxl6ifr9dj1kfkmnparyp6fp"; depends=[Rcpp Rcpp]; };
-CoClust = derive { name="CoClust"; version="0.3-0"; sha256="0vcjy8mr8vfs5j1x0xz1zkjn6l08pg6r28ffbdvrqrbalnh87v3s"; depends=[copula gtools]; };
+CoClust = derive { name="CoClust"; version="0.3-1"; sha256="00i0dghd35s91kkkxj1ywa5i93752mfa5527ifclw4xxxshppva8"; depends=[copula gtools]; };
 CoImp = derive { name="CoImp"; version="0.2-3"; sha256="04n0drx98hi8hmlb5xwl87ylv03j1ld04vp9d8s5sphvm9bbx690"; depends=[copula nnet gtools locfit]; };
 CoinMinD = derive { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
 CollocInfer = derive { name="CollocInfer"; version="1.0.1"; sha256="0wfk3qw28msz3wqm5xmivjgi18kqv1s6w76vh71zq777d6a7al6i"; depends=[fda deSolve MASS Matrix spam]; };
@@ -335,12 +338,14 @@ CompareTests = derive { name="CompareTests"; version="1.0"; sha256="098axl20jid3
 Compind = derive { name="Compind"; version="1.0"; sha256="13gfsbjaciign8cswsibdj9a4rwj5afwrk4g1x4fyihfhnm4qx7m"; depends=[Benchmarking psych boot Hmisc MASS GPArotation lpSolve nonparaeff]; };
 Compounding = derive { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; };
 ConConPiWiFun = derive { name="ConConPiWiFun"; version="0.4.4"; sha256="1dq9nlg04xs2n9g62y4gbl8ay4vsa25d7d7dra7q8zq6a561hzz5"; depends=[Rcpp Rcpp]; };
+ConSpline = derive { name="ConSpline"; version="1.0"; sha256="04zwnnp8rmzacfl9skd1lybqwxja0527h4xwcx5ki2z8c0zvvpi8"; depends=[coneproj]; };
 Conake = derive { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; };
 CondReg = derive { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
 ConjointChecks = derive { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; };
 ConnMatTools = derive { name="ConnMatTools"; version="0.1.5"; sha256="02cv2rlfp9shwqc9nwb8278akmwv7yvviwl23jglzsyh721dpqkr"; depends=[]; };
 ConvCalendar = derive { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
 ConvergenceConcepts = derive { name="ConvergenceConcepts"; version="1.1"; sha256="0878fz33jxh5cf72lv0lga48wq2hqa4wz6m59111k59pzrsli344"; depends=[tkrplot lattice]; };
+Copula_Markov = derive { name="Copula.Markov"; version="1.0"; sha256="028rmpihyz9xr4r305lbcbb0y22jw1szmhw5iznv5zma507grbl3"; depends=[]; };
 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]; };
@@ -352,12 +357,12 @@ CountsEPPM = derive { name="CountsEPPM"; version="2.0"; sha256="0bwd2jc8g62xpvnn
 CovSel = derive { name="CovSel"; version="1.1"; sha256="13dh97857h3r684yw1bzyr1rkpk8l7sshgy9hvg5y95csgai2qhw"; depends=[MASS dr np boot cubature]; };
 CoxBoost = derive { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[survival Matrix prodlim]; };
 CoxRidge = derive { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
-Coxnet = derive { name="Coxnet"; version="0.1"; sha256="1q5si53hjgf3w10km3f0185ffhw57y96356vykfmdz8gm26w4sky"; depends=[Matrix Rcpp Rcpp RcppEigen]; };
+Coxnet = derive { name="Coxnet"; version="0.1-1"; sha256="07ivs47lj0l84mk4r7bvzncvddspq4yl19aibii5pvjmzfzdgymp"; depends=[Matrix Rcpp Rcpp RcppEigen]; };
 CpGFilter = derive { name="CpGFilter"; version="1.0"; sha256="07426xlmx0ya3pi1y5c24zr58wr024m38y036h9gz26pw7bpawy2"; depends=[]; };
 CpGassoc = derive { name="CpGassoc"; version="2.50"; sha256="052mzkcp7510dm12winmwpxz6dvy54aziff0mn3nzy0xbk5v1fw4"; depends=[nlme]; };
 Cprob = derive { name="Cprob"; version="1.2.4"; sha256="0zird0l0kx2amrp4qjvlagw55pk9jrx0536gq7bvajj8avyvyykr"; depends=[prodlim tpr geepack lgtdl lattice]; };
 CreditMetrics = derive { name="CreditMetrics"; version="0.0-2"; sha256="16g3xw8r6axqwqv2f0bbqmwicgyx7nwzff59dz967iqna1wh3spi"; depends=[]; };
-Crossover = derive { name="Crossover"; version="0.1-13"; sha256="0s3nlc6yzgnrhdxpjqfpw8qcnjbhs5y0ng3qqpmpm9d9br8kivri"; depends=[rJava CommonJavaJars JavaGD ggplot2 MASS crossdes xtable Matrix multcomp digest Rcpp RcppArmadillo]; };
+Crossover = derive { name="Crossover"; version="0.1-14"; sha256="0d35am446z1pj7iz2zk1fvmp3xn5nhz3pgj7rwhmj77ad8vy8p8b"; depends=[rJava CommonJavaJars JavaGD ggplot2 MASS crossdes xtable Matrix multcomp digest Rcpp RcppArmadillo]; };
 CrypticIBDcheck = derive { name="CrypticIBDcheck"; version="0.3-1"; sha256="1lrpwgvsif1wnp19agh8fs3nhlb7prr3hhqg28fi4ikdd1l2j3r4"; depends=[rJPSGCS car ellipse]; };
 Cubist = derive { name="Cubist"; version="0.0.18"; sha256="176k9l7vrxamahvw346aysj19j7il9a2v6ka6dzmk0qq7hf3w9ka"; depends=[lattice reshape2]; };
 D2C = derive { name="D2C"; version="1.2.1"; sha256="0qhq27978id0plyz9mgdi0r1sr3ixnvqm8w6hp5c2wjd1yhhh12s"; depends=[randomForest gRbase lazy MASS corpcor foreach]; };
@@ -410,10 +415,10 @@ DTDA = derive { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2
 DTK = derive { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
 DTMCPack = derive { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
 DTR = derive { name="DTR"; version="1.5"; sha256="1c73ay0j6jkjm4iv32waz3wnn0qy399k1h72l7rwfzpyidnaprvi"; depends=[survival ggplot2 gridExtra aod proto]; };
-DVHmetrics = derive { name="DVHmetrics"; version="0.1"; sha256="0b712bhdc1sjqrfihk97jzma06gz42mq4p0nj1gm71v312bbipvf"; depends=[ggplot2 reshape2 shiny]; };
+DVHmetrics = derive { name="DVHmetrics"; version="0.2"; sha256="04161py13kcj5h5xpd3zpzyr99hjl0x51m8a83l8hm4ip9gpymy1"; depends=[ggplot2 reshape2 shiny KernSmooth markdown]; };
 Daim = derive { name="Daim"; version="1.1.0"; sha256="19s0p3a4db89i169n2jz7lf8r7pdmrksw7m3cp9n275b5h8yjimx"; depends=[rms]; };
 DandEFA = derive { name="DandEFA"; version="1.5"; sha256="0d82rjkgqf4w7qg7irlqvzzav1f23i2gmygkbf8jycaa6xhli80d"; depends=[gplots polycor]; };
-DatABEL = derive { name="DatABEL"; version="0.9-5"; sha256="1bjjfnwij6xyn2d62rs4n9j05hrv81jvkih2prk59zdyc7hwgmch"; depends=[]; };
+DatABEL = derive { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
 DataCombine = derive { name="DataCombine"; version="0.2.9"; sha256="1yvpv28fwkifiiyzj121dhzwzp06fncms5jbwpvc3nkq1bpzm2mk"; depends=[data_table dplyr]; };
 Davies = derive { name="Davies"; version="1.1-8"; sha256="1wp7ifbs4vqfrn4vwh09lc53yiagpww91m5mxmcr62mjbw8q7zhr"; depends=[]; };
 Deducer = derive { name="Deducer"; version="0.7-7"; sha256="1x97rz92v1hx30fdmgd1lnzydgygjp6zh20v082qymvh997l1zzd"; depends=[ggplot2 JGR car MASS rJava e1071 scales plyr foreign multcomp effects]; };
@@ -428,7 +433,7 @@ Demerelate = derive { name="Demerelate"; version="0.8-1"; sha256="1qngwlzzpd2cmi
 DendSer = derive { name="DendSer"; version="1.0.1"; sha256="0id6pqx54zjg5bcc7qbxiigx3wyic771xn9n0hbm7yhybz6p3gz9"; depends=[gclus seriation]; };
 Density_T_HoldOut = derive { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
 DepthProc = derive { name="DepthProc"; version="1.0.3"; sha256="0xil3pl33224sizn1wy9x3lcngw017qjl22hfqzss9iy73cmxqnc"; depends=[ggplot2 Rcpp rrcov MASS np lattice sm geometry colorspace Rcpp RcppArmadillo]; };
-Deriv = derive { name="Deriv"; version="3.0"; sha256="025410mhhk085z2in30s765imgzs9rwp8ki1kgdfvyi2bcp6y2v3"; depends=[]; };
+Deriv = derive { name="Deriv"; version="3.2"; sha256="025br1w6s7av1qm2jifms23qsyq3hy6842y0k6vgrs2rzdb9iyyb"; depends=[]; };
 DescTools = derive { name="DescTools"; version="0.99.10"; sha256="0sfjx1bmp0864l55yj7f0zgf4s9kyi2y1p1dajaaxq8mnclqdfz2"; depends=[manipulate boot mvtnorm]; };
 DescribeDisplay = derive { name="DescribeDisplay"; version="0.2.4"; sha256="13npxq1314n4n08j6hbmij7qinl1xrxrgc5hxpbbpbd16d75c7iw"; depends=[proto reshape2 ggplot2 plyr scales GGally]; };
 DetMCD = derive { name="DetMCD"; version="0.0.2"; sha256="0z4zs0k8c8gsd2fry984p06l3p17fdyfky8fv9kvypk7xdg52whc"; depends=[robustbase Rcpp RcppEigen]; };
@@ -441,6 +446,7 @@ DiceEval = derive { name="DiceEval"; version="1.3"; sha256="1vp9zwd09cwl3c8066jr
 DiceKriging = derive { name="DiceKriging"; version="1.5.4"; sha256="09i92jj5qlxr13a3x05aiy3q1z6pxz7ddar6639g4jq87vqq2vd9"; depends=[]; };
 DiceOptim = derive { name="DiceOptim"; version="1.5"; sha256="0ajqn5p7sl9rdj35wy45vmmzxl2d97jgz5wdq6ghdzxq523vfkz3"; depends=[DiceKriging rgenoud MASS lhs mnormt]; };
 DiceView = derive { name="DiceView"; version="1.3-1"; sha256="0c7i1jy13d5bj822q1rp0d7gmmfjd00jaah34pnj8fzwyrq404z9"; depends=[DiceKriging DiceEval rgl]; };
+DiffCorr = derive { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[igraph fdrtool]; };
 Digiroo2 = derive { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; };
 DirichletReg = derive { name="DirichletReg"; version="0.6-2"; sha256="08qfykyahyq54l9zm7g1yzmk2biz4xqq3qpxw0py4xazq719slk8"; depends=[Formula rgl maxLik]; };
 Disake = derive { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
@@ -456,7 +462,7 @@ DivE = derive { name="DivE"; version="1.0"; sha256="1ixkk8kd3ri78ykq178izib0vwpp
 DivMelt = derive { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; };
 DiversitySampler = derive { name="DiversitySampler"; version="2.1"; sha256="1sfx7craykb82ncphvdj19mzc0kwzafhxlk9jcxkskygrlwsxfgg"; depends=[]; };
 DnE = derive { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; };
-DoE_base = derive { name="DoE.base"; version="0.26-3"; sha256="0b0nkp85ryhy2r9xzmd0331v6a63bh2z2anzc7ra3k315c76ajq3"; depends=[conf_design vcd combinat MASS]; };
+DoE_base = derive { name="DoE.base"; version="0.27"; sha256="0nh0hs4g8cl3h7p84ddag1qk4rdyw5wb13qnvw23r12q0f1p6y3l"; depends=[conf_design vcd combinat MASS]; };
 DoE_wrapper = derive { name="DoE.wrapper"; version="0.8-10"; sha256="12q3arfm76x9j8qnrmw07jh904qdqz59ga1zk8m3n17prr11vrgb"; depends=[FrF2 DoE_base rsm lhs DiceDesign AlgDesign]; };
 Dodge = derive { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
 Dominance = derive { name="Dominance"; version="1.0.0"; sha256="0xcmslzfdcy826vcnlybhdyym5kqkrdqidq6jn10s4jic7jk8nl3"; depends=[igraph chron gdata]; };
@@ -473,24 +479,24 @@ EBS = derive { name="EBS"; version="3.0"; sha256="0nrqglbfr7wagd4xrk5jx0kficjgvk
 EBglmnet = derive { name="EBglmnet"; version="3.6"; sha256="0qjwk5y9bghidha4i937nc0kl1jz4d8g2br6ij8651lf2byj9s1a"; depends=[]; };
 EDISON = derive { name="EDISON"; version="1.1"; sha256="09xw4p4hwj8djq143wfdcqhr2mhwynj4ixj3ma7crhqidgal169p"; depends=[corpcor MASS]; };
 EDR = derive { name="EDR"; version="0.6-5.1"; sha256="10ldygd1ymc4s9gqhhnpipggsiv4rwbgajvdk4mykkg3zmz7cbpm"; depends=[]; };
-EFDR = derive { name="EFDR"; version="0.1.0"; sha256="086vk3nff3mcpmh1js2b8wqzpjzdjvlh34fsk3l6sl066gfz49j7"; depends=[Matrix foreach doParallel waveslim gstat tidyr dplyr sp]; };
-EGRET = derive { name="EGRET"; version="2.1.1"; sha256="140hijnwrksi658fn9bfsgrvfkpsix7zhwl4zf4flayrkmbs5i5f"; depends=[dataRetrieval survival fields lubridate]; };
+EFDR = derive { name="EFDR"; version="0.1.1"; sha256="0jgznwrd40g9xmvhrd7b441g79x41ppfdn6vbsbzc0k5ym1wzb1p"; depends=[Matrix foreach doParallel waveslim gstat tidyr dplyr sp]; };
+EGRET = derive { name="EGRET"; version="2.2.0"; sha256="1a3bvmshmxrnaijl9pklfia0ab94rzn22ywjh9gwn268qai52zjy"; depends=[dataRetrieval survival fields lubridate]; };
 EIAdata = derive { name="EIAdata"; version="0.0.3"; sha256="12jgw3vi2fminwa4lszczdr4j4svn2k024462sgj1sn07a4a4z2s"; depends=[XML plyr xts zoo]; };
 EILA = derive { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; };
 EL = derive { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; };
 ELT = derive { name="ELT"; version="1.3"; sha256="0q6gc3npwxqq0hz1ardssv5wfxjnx93pi4l1viqsb0wp2kkfq3w6"; depends=[locfit lattice latticeExtra xlsx]; };
+ELYP = derive { name="ELYP"; version="0.7-1"; sha256="0z0j3s943bs5xmy8x866kiqvflwwfwbh1n8v54g5p6k5wcrgjhd7"; depends=[survival]; };
 EMA = derive { name="EMA"; version="1.4.4"; sha256="1hqkan9k6ps4qckjrhsgxzham106fm38m5rgayz8i2ji3spvbfca"; depends=[survival xtable heatmap_plus GSA MASS FactoMineR cluster]; };
 EMC = derive { name="EMC"; version="1.3"; sha256="0sdpxf229z3j67mr9s7z4adzvvphgvynna09xkkpdj21mpml23p6"; depends=[mvtnorm MASS]; };
 EMCC = derive { name="EMCC"; version="1.2"; sha256="1qff8yvw7iqdsrqkvwb7m14xh7gcnjcrf8gw00g4j6aq0h0cgk2z"; depends=[MASS mclust EMC]; };
 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.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=[]; };
 EMMIXskew = derive { name="EMMIXskew"; version="1.0.1"; sha256="16jkq0a9k1gf6gia8r65nwa2lh8zny4jmnq51g2rcqm44s5ylqbh"; depends=[lattice mvtnorm KernSmooth]; };
 EMMIXuskew = derive { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
-EMMREML = derive { name="EMMREML"; version="2.0"; sha256="0fyqwyym6d1adn5pvrfspmr933qhi30h58hxr2rbzwm5kwh6c8jr"; depends=[Matrix]; };
+EMMREML = derive { name="EMMREML"; version="3.0"; sha256="0y37ydssn6m2q78v2aympfjr6z2hcn5y3dlgv4pj5g414fikb825"; depends=[Matrix]; };
 EMP = derive { name="EMP"; version="2.0.1"; sha256="1zdy05jfhcgj6415pnm079v8xjg90n3akp1rwq65jbqdar38zj4y"; depends=[ROCR]; };
 EMT = derive { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; };
 EMVC = derive { name="EMVC"; version="0.1"; sha256="1725zrvq419yj0gd79h8bm56lv2mmk296wq3wapivcy6xn0j97jh"; depends=[]; };
@@ -516,6 +522,7 @@ Ecdat = derive { name="Ecdat"; version="0.2-7"; sha256="1z9mxx3mvn3vi5drxlzss7gs
 Ecfun = derive { name="Ecfun"; version="0.1-4"; sha256="0h3351pcahrn578lz1pcb7h3chmh0vmwbn9iqll98vibck847gai"; depends=[fda gdata RCurl XML tis jpeg MASS TeachingDemos stringi]; };
 EcoGenetics = derive { name="EcoGenetics"; version="1.1.0"; sha256="1a7dsjvkxaa37nfha07fgfas9zygsj9hrsllgf4b67rkqihrzz87"; depends=[adegenet ggplot2 gstudio hierfstat party raster rgdal rkt sp vegan]; };
 EcoHydRology = derive { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[operators topmodel DEoptim XML]; };
+EcoSimR = derive { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
 EcoTroph = derive { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
 EcoVirtual = derive { name="EcoVirtual"; version="0.1"; sha256="1c815kxljk4qhw0zs28w16ggasfyyyb6aggffx1m1q21s63h6c8h"; depends=[]; };
 EffectStars = derive { name="EffectStars"; version="1.5"; sha256="0j2jxxxpcsrsjzszz4mfk3892ain3qkswa1dkpsmfsk4zs06g0s4"; depends=[VGAM]; };
@@ -539,7 +546,7 @@ Epi = derive { name="Epi"; version="1.1.67"; sha256="12wbzv21whjnzlyqacgqmsgrjbk
 EpiContactTrace = derive { name="EpiContactTrace"; version="0.8.8"; sha256="1vlr2xxnyq1i6ky39g8j3pf3m5775bmhii7vpskb0x7nnq161yzb"; depends=[Rcpp plyr R2HTML Rcpp]; };
 EpiDynamics = derive { name="EpiDynamics"; version="0.2"; sha256="1hqbfysvw2ln8z3as6lfcjlhkzccksngwh2vm25zsgy93gxw3mcc"; depends=[deSolve reshape2 ggplot2]; };
 EpiEstim = derive { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
-EpiModel = derive { name="EpiModel"; version="1.1.3"; sha256="077sk29jzgf1hbnydsrji2bky33bljs3vyid4r4gk0hxhc9cb3pj"; depends=[deSolve network networkDynamic tergm doParallel ergm foreach RColorBrewer statnet_common]; };
+EpiModel = derive { name="EpiModel"; version="1.1.4"; sha256="0gyj80xmhwa3a7k12m3lla9rkpfv1n307vjf8lka1bd1rvwipg2c"; depends=[deSolve network networkDynamic tergm doParallel ergm foreach RColorBrewer statnet_common]; };
 Eplot = derive { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; };
 EstCRM = derive { name="EstCRM"; version="1.3"; sha256="0fmnlh0pnprskq01iq3rfassyxq7fywiprvqw0xdlh8yxl3w2c9n"; depends=[Hmisc lattice]; };
 EstSimPDMP = derive { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
@@ -548,7 +555,7 @@ EvalEst = derive { name="EvalEst"; version="2012.4-1"; sha256="19yn4haxkny9kij0j
 Evapotranspiration = derive { name="Evapotranspiration"; version="1.5"; sha256="181s9wwil07740n79gz2ar9c1bjxy45v4fyxxkqjmdfly72la542"; depends=[zoo]; };
 EvoRAG = derive { name="EvoRAG"; version="2.0"; sha256="0gb269mpl2hbx1cqakv3qicpyrlfb4k8a3a7whhg90masbgmh8f6"; depends=[]; };
 ExPosition = derive { name="ExPosition"; version="2.8.19"; sha256="04s9kk8x6khvnryg6lqdwnyn79860dzrjk8a9jyxgzp94rgalnnz"; depends=[prettyGraphs]; };
-Exact = derive { name="Exact"; version="1.4"; sha256="1l4cq6kslnl8x8c53m2w8w1vijmbxaxzr1fpdzrm2hfra0p5z90s"; depends=[]; };
+Exact = derive { name="Exact"; version="1.5"; sha256="14469wfm5g28ajlpcrqkmvhbqps8wvrh5lsi0rcrwbwybfv435vn"; depends=[]; };
 ExactCIdiff = derive { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; };
 ExactPath = derive { name="ExactPath"; version="1.0"; sha256="0ngvalmgdswf73q0jr4psg0ihnb7qwkamm6h64l01k5rmgd5nm16"; depends=[ncvreg lars]; };
 ExceedanceTools = derive { name="ExceedanceTools"; version="1.2.2"; sha256="084sc6pggfbcyavhfnd5whyigw7dyjhb4cxmxi0kh2jiam5k8v5b"; depends=[splancs SpatialTools]; };
@@ -564,7 +571,7 @@ FAOSTAT = derive { name="FAOSTAT"; version="1.9"; sha256="0gff60vlv35m5sjmz7glbd
 FAdist = derive { name="FAdist"; version="2.1"; sha256="1y66ymg0k6kmyq4bclwwlqkp8brkq925ajpp0jqqn39f749c2kji"; depends=[]; };
 FAiR = derive { name="FAiR"; version="0.4-15"; sha256="18nj95fiy3j7kf4nzf692dxja3msnaaj5csg745bnajb48l606wz"; depends=[rgenoud gWidgetsRGtk2 rrcov Matrix]; };
 FAmle = derive { name="FAmle"; version="1.3.3"; sha256="125m2hvl603avg9h9x5gfb7l9clpg7p0ir8fdypxyjiqggdr8hxa"; depends=[mvtnorm]; };
-FAwR = derive { name="FAwR"; version="1.0.1"; sha256="1j97hdhaamg6xqkaxb04xzsd60hd69n9y84frkqi9swvhr565waj"; depends=[MASS lattice]; };
+FAwR = derive { name="FAwR"; version="1.1.0"; sha256="0566h9fgnnk8xankqkpvcshf8acr46lz84sf2pzlmasgvwh7xp19"; depends=[MASS lattice glpkAPI]; };
 FBFsearch = derive { name="FBFsearch"; version="1.0"; sha256="1nxfhll9gx9l6hzpcihlz880qxr0fyv5rjghk0xgp8xn4r5wxw11"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
 FBN = derive { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; };
 FCMapper = derive { name="FCMapper"; version="1.0"; sha256="1wp5byx68067fnc0sl5zwvw2wllaqdbcy4g2gbzmlqwli0jz2dsk"; depends=[igraph]; };
@@ -613,7 +620,7 @@ FastRCS = derive { name="FastRCS"; version="0.0.6"; sha256="0wjsh37jas8hcb9554ij
 FastRWeb = derive { name="FastRWeb"; version="1.1-0"; sha256="1hiabi7ibp69n5wi5x4kwznxhc2i7dxdrqf1fm6ppv7ix0wkjs07"; depends=[Cairo]; };
 FatTailsR = derive { name="FatTailsR"; version="1.0-3"; sha256="0r9n18qlr70p6y4v1xv1lxi1lzm9qp29qy4w51chllqjn15kmv7l"; depends=[minpack_lm]; };
 FeaLect = derive { name="FeaLect"; version="1.8"; sha256="04vmf89kgn7hh9wzj6b654546d3jvz0zz675xhcd11gjzlsp8pgc"; depends=[lars rms]; };
-FeatureHashing = derive { name="FeatureHashing"; version="0.8"; sha256="05300709d4k5fxyajvdjhwy7br558g81agfrp9pqa2y0v0qx2zkw"; depends=[Rcpp Matrix digest Rcpp digest BH]; };
+FeatureHashing = derive { name="FeatureHashing"; version="0.9"; sha256="1xbzmyah22kjrkd7ln1pjzwyn5w0zmhdhs9w1a3p8rjxrwmx6ssf"; depends=[Rcpp Matrix digest magrittr Rcpp digest BH]; };
 FedData = derive { name="FedData"; version="1.0"; sha256="1rg35w0450fsy41i3q1j5zdxsik6r47zryba6878pzc429lrx2sn"; depends=[sp raster rgdal igraph Hmisc]; };
 FeedbackTS = derive { name="FeedbackTS"; version="1.3.1"; sha256="1zx64wbl5pzqn69bjhshd3nayxx4wlg7n1zwv7ilh68raxfxnbbx"; depends=[maps mapdata proj4 geoR sp]; };
 FieldSim = derive { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[rgl RColorBrewer]; };
@@ -629,13 +636,14 @@ FisHiCal = derive { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n
 FisherEM = derive { name="FisherEM"; version="1.4"; sha256="1lhkyyk82i6alxyiqrvy5fx60f8vab0y62zmw5fjaq6h0vczqn3s"; depends=[MASS elasticnet]; };
 FitAR = derive { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[lattice leaps ltsa bestglm lattice leaps ltsa]; };
 FitARMA = derive { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; };
+FlexParamCurve = derive { name="FlexParamCurve"; version="1.5-2"; sha256="1r8iacjnpbkpqwp58dz724g1cpnmll4b1mkxnsdj3h9iq1rbi7bq"; depends=[nlme]; };
 FluOMatic = derive { name="FluOMatic"; version="1.0"; sha256="06hww6viynisnfiphvghv4iqf1gk2snb8aksignaw8pnlkixnsg7"; depends=[]; };
 Flury = derive { name="Flury"; version="0.1-3"; sha256="105fv9azjkd8bsb9b8ba3gpy3pjnyyyp753qhrd11byp3d0bbxy0"; depends=[]; };
 ForIT = derive { name="ForIT"; version="1.0"; sha256="0mi2cw09mbc54s8qwcwxin2na1gfyi60cdssy2ncynma7alq3733"; depends=[]; };
 ForImp = derive { name="ForImp"; version="1.0.3"; sha256="0ai4i6q233sdsi8xilpbkxjqdf4pxw93clkdkhcxal6q43rnf7vd"; depends=[homals sampling mvtnorm]; };
 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=[]; };
+Formula = derive { name="Formula"; version="1.2-1"; sha256="02in5325zzrqbhlygx6s0dinj6ymw845q70y56frqacv25ayzcax"; depends=[]; };
 ForwardSearch = derive { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
 FourScores = derive { name="FourScores"; version="1.0"; sha256="0d21mrl9bzsvhljv7ymiyck508smp66w9qivrb2rp0p803h9yibm"; depends=[]; };
 FrF2 = derive { name="FrF2"; version="1.7-1"; sha256="0i9hfx7n0g866imdsmalqzs8v95vx08cz97hi8311v1wc3pqsn1j"; depends=[DoE_base sfsmisc BsMD scatterplot3d igraph]; };
@@ -686,7 +694,7 @@ GISTools = derive { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9c
 GLDEX = derive { name="GLDEX"; version="2.0.0.2"; sha256="16vy50jgk9b57h9f48097m17zrla6ksmi3wm4z2yadfg81sg8721"; depends=[cluster]; };
 GLDreg = derive { name="GLDreg"; version="1.0.2"; sha256="179qjcsfgzcw39gmmwlz9h608cq865kz2lvh76dwgyyn519l3y8g"; depends=[GLDEX]; };
 GLSME = derive { name="GLSME"; version="1.0.2"; sha256="1zdqrji8x0f3wjl8bhpbnwdfklihv3ii20iz2y2gsm53yzw7dlwq"; depends=[mvtnorm corpcor]; };
-GMCM = derive { name="GMCM"; version="1.1.1"; sha256="181in94mdc6fka0l4a6vc84n295pgsv18yf5mgf59qfmz8vjxi4n"; depends=[Rcpp Rcpp RcppArmadillo]; };
+GMCM = derive { name="GMCM"; version="1.2"; sha256="13nafnj86pg50svqzlicsw0pdps2bnbh1xdd81i9d7hgm1v7nmjp"; depends=[Rcpp Rcpp RcppArmadillo]; };
 GMD = derive { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
 GMDH = derive { name="GMDH"; version="1.0"; sha256="194bx1gg0d50fq9002ga8lwx288csfk5vfr1qwkn886wiw97wl9n"; depends=[MASS]; };
 GMMBoost = derive { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[minqa magic]; };
@@ -699,7 +707,7 @@ GPCSIV = derive { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3
 GPFDA = derive { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda_usc spam fda MASS]; };
 GPLTR = derive { name="GPLTR"; version="1.1"; sha256="0yp4b3ddvcd6s7rjpbmszl3a0x8qq6s138jjkm135yvbgp1jk5jz"; depends=[rpart]; };
 GPareto = derive { name="GPareto"; version="1.0.0"; sha256="0mzrl4xs7f5rkx0m4lkqy1456dnsa232hprmbg3bpris1rla780b"; depends=[DiceKriging emoa Rcpp rgenoud pbivnorm pso randtoolbox KrigInv MASS Rcpp]; };
-GPfit = derive { name="GPfit"; version="0.2-1"; sha256="1r7dmrjilnis4m8v0bibai0bkm3iwka4zxzrda8r49wmcpf99n2d"; depends=[lhs lattice]; };
+GPfit = derive { name="GPfit"; version="1.0-0"; sha256="0g0g343ncqsqh88qq9qrf4xv5n3sa980kqbvklcx534dmn6a7n2i"; depends=[lhs lattice]; };
 GPseq = derive { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
 GPvam = derive { name="GPvam"; version="3.0-2"; sha256="160j0zwbcmvzvia1b5p5midf395xfv1frk2w6w3v2zpbn8h6pdz5"; depends=[Rcpp RcppArmadillo Matrix numDeriv Rcpp RcppArmadillo]; };
 GRTo = derive { name="GRTo"; version="1.2"; sha256="0x65g8a39vrb8m3hqajxi0ksmdavz0p6mlamqprkdn9p6ikf5c73"; depends=[bootstrap]; };
@@ -712,7 +720,7 @@ GSM = derive { name="GSM"; version="1.3.1"; sha256="1ay6znw31qnhz5k6fa0aiccr2xxm
 GUIDE = derive { name="GUIDE"; version="1.0.9"; sha256="1y0y6rwv1khd9bdaz5rl9nmxiangx0jckgihg16wb6hx6kf8kzc1"; depends=[rpanel tkrplot]; };
 GUILDS = derive { name="GUILDS"; version="1.2"; sha256="0nirrbq8z7axnrgwbykv5886yf3akf64zynza8l2m96nvzlkzf4y"; depends=[Rcpp pracma subplex Rcpp]; };
 GUIProfiler = derive { name="GUIProfiler"; version="0.1.2"; sha256="1k56clda6xr649xfacnigi3c2s7ih1whchwcfqm7aa2d44vv3axz"; depends=[Nozzle_R1 MASS]; };
-GUTS = derive { name="GUTS"; version="0.3.5"; sha256="10yi18yv3vbm7pn11bbj3baxqga5yymilabf56bc18prpirnw51b"; depends=[Rcpp Rcpp BH]; };
+GUTS = derive { name="GUTS"; version="0.5.2"; sha256="13i3653364lqw53wjc4va139yd78kplkchv1r95c9j9kzd0dvx36"; depends=[Rcpp Rcpp BH]; };
 GUniFrac = derive { name="GUniFrac"; version="1.0"; sha256="0xr68yv3h2lwn7sxy8l5p9g1z3q9hihg9jamsyl70jj9b2ic80jn"; depends=[vegan ape]; };
 GWAF = derive { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[geepack coxme lme4]; };
 GWASExactHW = derive { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; };
@@ -728,8 +736,8 @@ GenABEL_data = derive { name="GenABEL.data"; version="1.0.0"; sha256="0p66fb0gyn
 GenBinomApps = derive { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; };
 GenForImp = derive { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; };
 GenKern = derive { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; };
-GenOrd = derive { name="GenOrd"; version="1.2.0"; sha256="1aypz879r2fc8zd7lnd1d2ic3zgx9gpz4gxmfqyhb5gfkg50xhlg"; depends=[mvtnorm Matrix MASS]; };
-GenSA = derive { name="GenSA"; version="1.1.4"; sha256="0ph3n0hv7p8i03by42hl0f2b1kmhpvyvd7rfgay2wl9lknfsq0vv"; depends=[]; };
+GenOrd = derive { name="GenOrd"; version="1.3.0"; sha256="07ll15fqcfvrbsd8psbvn9569hcmvghwadzb3h9qxh6pxnl9i5qd"; depends=[mvtnorm Matrix MASS]; };
+GenSA = derive { name="GenSA"; version="1.1.5"; sha256="10fkb30p3ncswlq4f9jknfhrrsi4v3lkn2nlnpb2yhrqai538wij"; depends=[]; };
 GenWin = derive { name="GenWin"; version="0.1"; sha256="0jm537i4jn3azdpvd50y9p0fssfx2ym2n36d3zgnfd32gqckz3s4"; depends=[pspline]; };
 GeneCycle = derive { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[MASS longitudinal fdrtool]; };
 GeneF = derive { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
@@ -808,14 +816,17 @@ HapEstXXR = derive { name="HapEstXXR"; version="0.1-7"; sha256="1jarb0465yymb08r
 Haplin = derive { name="Haplin"; version="5.3"; sha256="1gfg9dhgw42yjd1i8knnjvc2y2fbdc2ypa396g48hmsnislqffsd"; depends=[MASS mgcv GenABEL DatABEL filehash]; };
 HaploSim = derive { name="HaploSim"; version="1.8.4"; sha256="0794f76hc9qvjmay7c61cmzycqafljs0g0hliq9xfrw4f23gq3sa"; depends=[]; };
 HardyWeinberg = derive { name="HardyWeinberg"; version="1.5.5"; sha256="1kz12301bi2880i9ds7wvc6yb5hvrs3fr5689fm1yygkqfq8zc56"; depends=[mice]; };
-HiClimR = derive { name="HiClimR"; version="1.1.6"; sha256="0x63vh8sk5a37dal5s6j8pkxxym8f8f0cjjinriys5pi8iq6yfmr"; depends=[]; };
+HarmonicRegression = derive { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; };
+HelpersMG = derive { name="HelpersMG"; version="1.0"; sha256="11bjzkbdrysnryxriqk3wj8npk42i8rpc5b0c07q1zvk39png3lk"; depends=[coda]; };
+HiClimR = derive { name="HiClimR"; version="1.2.0"; sha256="10ick0311nc4zcqswlk3lhi9k5bv96nicqxqcq706cmlfk0qd0c7"; depends=[]; };
 HiCseg = derive { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
-HiDimDA = derive { name="HiDimDA"; version="0.2-2"; sha256="0y45c7yi20ixr7d8zmjsbxsc9kvvwpdw49qncpz5l5wmdmzhy8mm"; depends=[]; };
+HiDimDA = derive { name="HiDimDA"; version="0.2-3"; sha256="0pk7hf8cnwv22p5cbpsh5wd94i1an87ddv80qycgypx4wi0v57hh"; depends=[]; };
 HiDimMaxStable = derive { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula mnormt partitions maxLik mnormpow VGAM]; };
-HiLMM = derive { name="HiLMM"; version="1.0"; sha256="1x3my51vzxlk9q7vj2ljpqinxw777953mhgzvbqildph4szh4xh4"; depends=[]; };
+HiLMM = derive { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
 HiPLARM = derive { name="HiPLARM"; version="0.1"; sha256="0af68gfmc89nn1chmqay6ix0zygcp1hmylj02i7l6rx6vb06qw6w"; depends=[Matrix]; };
-HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-1"; sha256="13c5g6wryzry1rvqcfpkjm9vibc6lv864fvcjmr2z8ianiqrrn6p"; depends=[]; };
+HiddenMarkov = derive { name="HiddenMarkov"; version="1.8-3"; sha256="1bgkzj9lmv0rbi5a77brw7w69k2w611jh3d851lfqnwx6gxgzkmc"; depends=[]; };
 HierO = derive { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[rneos RCurl bitops XML tcltk2]; };
+HighDimOut = derive { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[foreach DMwR plyr proxy FNN ggplot2]; };
 HistDAWass = derive { name="HistDAWass"; version="0.1.2"; sha256="16c4b9nfl6rbca7zifb2q3c5x60rmj32913hw1f79xs9ffdrnkwr"; depends=[FactoMineR class ggplot2 histogram]; };
 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]; };
@@ -859,7 +870,7 @@ IRTShiny = derive { name="IRTShiny"; version="1.0"; sha256="1gjfqjqk7izl23b96g75
 ISBF = derive { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; };
 ISDA_R = derive { name="ISDA.R"; version="1.0"; sha256="0w6p2iy6s7fy8pw2cf4b5zhqcgjjwd5bkax1aqflaaj4ppmfx64v"; depends=[scatterplot3d]; };
 ISLR = derive { name="ISLR"; version="1.0"; sha256="0gmhvsivhpq3x8a240lgcbv1qzdgf6wxms4svak1501clc87xc6x"; depends=[]; };
-ISOcodes = derive { name="ISOcodes"; version="2015.01.24"; sha256="0l0shl04x78x7g58yn0wh4z2gk0cllpcc43p7m22psh8vvyqzxgs"; depends=[]; };
+ISOcodes = derive { name="ISOcodes"; version="2015.04.04"; sha256="1mg7mifcqh0g0ra4f1skng6fyp2rhfv2xd9m7nyih39inzdjkcdf"; depends=[]; };
 ISOpureR = derive { name="ISOpureR"; version="1.0.8"; sha256="0jjamyj4rf078rfa2qqrn4i55025sc5968lq95yadbw0izxb51i8"; depends=[Rcpp Rcpp RcppEigen]; };
 ISOweek = derive { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; };
 ISwR = derive { name="ISwR"; version="2.0-6"; sha256="1ms4lm1skfqaq4mnm03kvjb7kaxdzv72s6i77zp7z17gzfa40c9h"; depends=[]; };
@@ -879,7 +890,7 @@ InteractiveIGraph = derive { name="InteractiveIGraph"; version="1.0.6.1"; sha256
 Interatrix = derive { name="Interatrix"; version="1.0"; sha256="1lkkjckxc0fc8hg1livgzrgphqwcp53cib0r0vii5jp4zkcna595"; depends=[MASS tkrplot]; };
 Interpol = derive { name="Interpol"; version="1.3.1"; sha256="1598lnnrcxihxysdljphqxig15fd8z7linw9byjmqypwcpk6r5jn"; depends=[]; };
 Interpol_T = derive { name="Interpol.T"; version="2.1.1"; sha256="1fbsl1ypkc65y6c0p32gpi2a2aal8jg02mclz7ri57hf4c1k09gz"; depends=[date chron]; };
-InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.1-4"; sha256="01yjkqj1k7haa75avcqhkxjm6569c2ds8fydz3spcmx37l2xafdp"; depends=[glmnet mboost]; };
+InvariantCausalPrediction = derive { name="InvariantCausalPrediction"; version="0.3-1"; sha256="0j2zy3dwb8p16akl2iq3b1200blb7nd28xdjdzf429b69gc01lin"; depends=[glmnet mboost jointDiag]; };
 InventorymodelPackage = derive { name="InventorymodelPackage"; version="1.0.2"; sha256="1w35idsagl9v93ci3qmal3xbf11sy6h1k7xnv25c59ivfnpjpkva"; depends=[e1071]; };
 IsingFit = derive { name="IsingFit"; version="0.3.0"; sha256="0imgj3g6sankzmycjkzzz3bgai3jjycgsinhs5zy9k4vgqjg27d6"; depends=[qgraph Matrix glmnet]; };
 IsingSampler = derive { name="IsingSampler"; version="0.2"; sha256="16vwb5pcqjvvsk9wsgj10mzhgh72iz1q6n8nmkva6y1l7xv54c8w"; depends=[Rcpp plyr magrittr nnet Rcpp]; };
@@ -909,11 +920,12 @@ KANT = derive { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0pp
 KATforDCEMRI = derive { name="KATforDCEMRI"; version="0.740"; sha256="1k8fihd9m26k14rvc5d5x0d9xc3mh8d49hs64p55np1acqfhg2sy"; depends=[locfit R_matlab matlab]; };
 KFAS = derive { name="KFAS"; version="1.0.4-1"; sha256="0s9mrqb1mvs77z57hx734kajbyqddcc9j20wrsmrbf8g97in61s7"; depends=[]; };
 KFKSDS = derive { name="KFKSDS"; version="1.6"; sha256="1g11f936p554bfxlm4slxhfxki5vqkks1mrbqw4w83v2rcb50f8d"; depends=[]; };
+KMDA = derive { name="KMDA"; version="1.0"; sha256="0x4kjjdd59wvgg699vrj99wqg3s1qbkbskis1c34xv9b8bzcv94j"; depends=[]; };
 KMsurv = derive { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; };
 KODAMA = derive { name="KODAMA"; version="0.0.1"; sha256="199l6y5b98ags5p7jf150v0i0kcdxlsr2q0rgdpz9ra1hw1cjsfb"; depends=[e1071 plsgenomics class]; };
 KOGMWU = derive { name="KOGMWU"; version="1.0"; sha256="0nk7vbppimrf01wnxsg2wjpagjrzs6gh3a6jlqy9bdfh0j4fm0kn"; depends=[pheatmap]; };
 KRLS = derive { name="KRLS"; version="0.3-7"; sha256="0dx4b68xx3saqlkbpvvrhxjscl7jr5phwqvjywxsp4qxlr3ysl79"; depends=[]; };
-KappaGUI = derive { name="KappaGUI"; version="1.1"; sha256="1fyx23i6j18q6swazwy2l70lg2933akh4d0k6dzvfjxrai7fvi7y"; depends=[irr]; };
+KappaGUI = derive { name="KappaGUI"; version="1.2"; sha256="014d3lshq3avrncd8ydjpn59zalq46v29jrlz3g76wzr96xf5ckr"; depends=[irr]; };
 KappaV = derive { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[PresenceAbsence maptools rgeos sp]; };
 Kendall = derive { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
 KernSmooth = derive { name="KernSmooth"; version="2.23-14"; sha256="1dl22pncdlrlysmny0q89yg1s6iafdh75dh31l2hjy16gzlrbhk0"; depends=[]; };
@@ -923,6 +935,7 @@ Kmisc = derive { name="Kmisc"; version="0.5.0"; sha256="0pbj3gf0bxkzczl6k4vgnxds
 KoNLP = derive { name="KoNLP"; version="0.76.9"; sha256="1q72irl4izb7f5bb99plpqnmpfdq4x4ymp4wm2bsyfjcxm649ya8"; depends=[rJava stringr hash tau Sejong]; };
 Kpart = derive { name="Kpart"; version="1.1"; sha256="1cyml48i1jvwy4xzymijwraqpnssnkrd81q3m7nyjd5m2czjvihv"; depends=[leaps]; };
 KrigInv = derive { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm rgenoud randtoolbox]; };
+L1pack = derive { name="L1pack"; version="0.3"; sha256="0lhixnfb2ga830z91z51r970l5s5qpavbwcmk1pi80180n11kv4i"; depends=[]; };
 LARF = derive { name="LARF"; version="1.3"; sha256="0crg89d377wkga0bc42y8bfk6chg06afchhgnab6q4dirwv9360q"; depends=[]; };
 LCA = derive { name="LCA"; version="0.1"; sha256="14nhx2fs18558zljnw56mdz3qx30v394llhzswxhznjfiiqc9z5h"; depends=[]; };
 LCAextend = derive { name="LCAextend"; version="1.2"; sha256="1y9azq9v42a3z5fq6gj8js89qblb2z93k4mg4jmw0wgkyv6mysfc"; depends=[boot mvtnorm rms kinship2]; };
@@ -949,7 +962,7 @@ LOGICOIL = derive { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3
 LOST = derive { name="LOST"; version="1.1"; sha256="19ar85dykbz0jlzbhlm3pcpffj4cizc6sj3gn93qdvpxkp64jfq9"; depends=[gdata shapes e1071 MASS miscTools]; };
 LPCM = derive { name="LPCM"; version="0.44-8"; sha256="14627wk5azxm3y3a0qfy4qz57nxbdcasnv7djpqhk2gxf5smq19k"; depends=[]; };
 LPS = derive { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; };
-LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-4"; sha256="13hbwg05p48i2gg9i379msb78k35m6kqj8l29cmrpqm1gcdyh3sg"; depends=[RColorBrewer]; };
+LPStimeSeries = derive { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; };
 LPTime = derive { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; };
 LPmerge = derive { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Rglpk Matrix]; };
 LS2W = derive { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
@@ -964,10 +977,10 @@ LVMMCOR = derive { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22
 LVQTools = derive { name="LVQTools"; version="1.2"; sha256="06mninrrr49xsh00gfsp0vc418r6pdvq3m6sbnj0ywdyki106mni"; depends=[]; };
 LaF = derive { name="LaF"; version="0.6.2"; sha256="180xsqilpkql8my0dimsxj1kpmb3jl19l6bz8li8m63zii4xmwmp"; depends=[Rcpp Rcpp]; };
 Lahman = derive { name="Lahman"; version="3.0-1"; sha256="0w7vp3vjxhigyyqmmka4bw5v4pp5z3jzmf0krq8biwzrpx5qp86x"; depends=[]; };
-LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.1"; sha256="0l2l9l2c75cmxpqi2w9cgsad2ffnx6b7wvx6xdx6mkb52kkp9sqy"; depends=[rLakeAnalyzer plyr]; };
+LakeMetabolizer = derive { name="LakeMetabolizer"; version="1.3.1"; sha256="1k764w8f30jfz1xkq9xjm9rwfdll5kp7jv3zc4932ck8cgqam3jv"; depends=[rLakeAnalyzer plyr]; };
 Lambda4 = derive { name="Lambda4"; version="3.0"; sha256="04ikkflfr0nmy1gr3gfldlh2v8mpl82k1wwnzp57d2kn75m9vbxz"; depends=[]; };
 LambertW = derive { name="LambertW"; version="0.5"; sha256="19xkm27015q552g1c1j9bsckg4z4jb0avzxs2vs6hscyf5vh41zr"; depends=[moments MASS gsl]; };
-Laterality = derive { name="Laterality"; version="0.9.2"; sha256="13b1mpjcq7a14dwscnfs07hahd9is2fbn4wxwh31732vv3hr7kwm"; depends=[ade4]; };
+Laterality = derive { name="Laterality"; version="0.9.3"; sha256="0pl5bfbkzhgxjjzzh99s6rh4jsq0pbcgc902i0z2lmmivgs5qmd6"; depends=[ade4]; };
 LatticeKrig = derive { name="LatticeKrig"; version="3.4"; sha256="0qa16sxzj40nk4kmzcb7n4xxn7bqlkx7ar66qpqvh2dvcvi1d70d"; depends=[spam fields]; };
 LeLogicielR = derive { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
 LeafAngle = derive { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
@@ -989,7 +1002,7 @@ LogitNet = derive { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24
 LogrankA = derive { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; };
 LoopAnalyst = derive { name="LoopAnalyst"; version="1.2-3"; sha256="0xbiy1xa2c6acfrzh6p9pa6wrds8ipskxq0f86ia9g5zkp1rjk2j"; depends=[nlme]; };
 LowRankQP = derive { name="LowRankQP"; version="1.0.2"; sha256="0is7v4cy4w1g3wn4wa32iqv4awd1nwvfcb71b3yk5wj59lpm8gs3"; depends=[]; };
-Luminescence = derive { name="Luminescence"; version="0.4.1"; sha256="0zbb81gvan36d1bhx4fmygw8l5iybbywgnxb2a8mhxrfdqjw4kmg"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table]; };
+Luminescence = derive { name="Luminescence"; version="0.4.2"; sha256="042dpx26yqfsaqpqnz0bss7w9w2prhxrggpzapxmjl50sy39ziwk"; depends=[XML shape rgl matrixStats raster sp zoo bbmle data_table Rcpp Rcpp]; };
 M3 = derive { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[ncdf4 rgdal maps mapdata]; };
 MADAM = derive { name="MADAM"; version="1.2.2"; sha256="09w5liqa3mpkbyvkwlabcgyg2b4316qpzq7pbpl0wxl74bsh76vq"; depends=[]; };
 MAINT_Data = derive { name="MAINT.Data"; version="0.3"; sha256="1qh7kdcnwfibzyhr53inqjz61srbpypcqjri60zdl32jpf109vng"; depends=[MASS miscTools]; };
@@ -1024,12 +1037,13 @@ MCDA = derive { name="MCDA"; version="0.0.8"; sha256="0zpjbshvv88dvqf6a6yw9zhzzh
 MCL = derive { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
 MCMC_OTU = derive { name="MCMC.OTU"; version="1.0.8"; sha256="1bdmvwxkm162m3237bgf42dm5kp3q0giwf0avrkla8qd834gqch0"; depends=[MCMCglmm ggplot2]; };
 MCMC_qpcr = derive { name="MCMC.qpcr"; version="1.1.5"; sha256="19dznc7iyifkc3lap9nlsq7n8c0h4xbqrxqb6nj1aqa0nlfi0aqw"; depends=[MCMCglmm ggplot2 coda]; };
+MCMC4Extremes = derive { name="MCMC4Extremes"; version="1.0"; sha256="1ib3rllvqjni9xg3634ankrr66f1lj376kl3xhfwnwbfsbi4a8pw"; depends=[evir]; };
 MCMCglmm = derive { name="MCMCglmm"; version="2.21"; sha256="1mjjp65w7pg2kxrx2qf0lh1kdi9d21xxj7s39zhi3q8ixw35h95r"; depends=[Matrix coda ape corpcor tensorA]; };
 MCMCpack = derive { name="MCMCpack"; version="1.3-3"; sha256="0s1j3047qp2fkwdix9galm05lp7jk7qxyic6lwpbd70hmj8ggs76"; depends=[coda MASS]; };
 MCPAN = derive { name="MCPAN"; version="1.1-15"; sha256="0811wrbp0nf4nj8kvq62ks8yksabib8r1a0gx3nr3v6avfnv08w1"; depends=[mvtnorm multcomp]; };
 MCPMod = derive { name="MCPMod"; version="1.0-8"; sha256="1kkak9x66dmannhxfdp6cybbjh2g43p03kyp7a4x1az7h4bnc92f"; depends=[mvtnorm lattice]; };
 MCPerm = derive { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
-MCS = derive { name="MCS"; version="0.1.0"; sha256="0wjw3h6hi7djxgysp6bnwh419k0i312bxf8adws3f19697agxr02"; depends=[]; };
+MCS = derive { name="MCS"; version="0.1.1"; sha256="0fxc5ri4ci3r5w1hdicqm1j0g6fwrl3wng7qwc2c0isagrn3vp4n"; depends=[]; };
 MChtest = derive { name="MChtest"; version="1.0-2"; sha256="01lflilrp42m236cznn6qgzvv5v9fzpx6wcfxp3q545bw2xmbdvj"; depends=[]; };
 MConjoint = derive { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; };
 MDM = derive { name="MDM"; version="1.3"; sha256="1bvjhl243rf19829ly1qc20ik937hb82lq23aiysj7ya55z8hdpf"; depends=[nnet]; };
@@ -1046,12 +1060,13 @@ MGL = derive { name="MGL"; version="1.1"; sha256="17xkrq0wzq1gfa6k1lgf34l4ibwjk6
 MGRASTer = derive { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
 MGSDA = derive { name="MGSDA"; version="1.1"; sha256="09z066sfjvx7awxc86gfw066wlz6svj7nxkhlas63a7zfbkiz7hl"; depends=[glmnet MASS]; };
 MHadaptive = derive { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; };
-MIICD = derive { name="MIICD"; version="2.0"; sha256="0q13vlm8xq99y3gixdjxcab65sjw3gjv596rq9zl768p90dgr6cm"; depends=[survival riskRegression MASS]; };
+MIICD = derive { name="MIICD"; version="2.1"; sha256="1lh3pbpxn7lbs68741ydw264qn9rap7kmcw49vnjvvzdp7hf24in"; depends=[survival MASS mstate]; };
+MIIVsem = derive { name="MIIVsem"; version="0.1"; sha256="098ybi5xdz7vvgd4vczqxm54gaq6cjsg0lxk319bx3z0da1a0bx5"; depends=[lavaan]; };
 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=[]; };
 MKLE = derive { name="MKLE"; version="0.05"; sha256="00hcihjn3xfkzy0lvb70hl2acjkwk6s3y7l4gprix24shnblvxzi"; depends=[]; };
-MKmisc = derive { name="MKmisc"; version="0.97"; sha256="0cfkyh291n68382r3kbkdd7c4wbmg2dp811gaav7rvlpmmd0am5w"; depends=[RColorBrewer robustbase]; };
+MKmisc = derive { name="MKmisc"; version="0.98"; sha256="0ng6n1x2x1bg60byhpk212pihh7hirbjr4s89lzrwj854z93bv5l"; depends=[RColorBrewer robustbase]; };
 MLCM = derive { name="MLCM"; version="0.4.1"; sha256="1g6lmw75qdiq0fshxr3sqwm1a3y4928chxkggnfwwxp8hqw4r6px"; depends=[]; };
 MLDS = derive { name="MLDS"; version="0.4.3"; sha256="1vql92y2dy1ba5l5xdysqzkzvkrr4bhclmjabn49c8qb2xc2rl40"; depends=[MASS]; };
 MLEcens = derive { name="MLEcens"; version="0.1-4"; sha256="0zlmrcjraypscgs2v0w4s4hm7qccsmaz4hjsgqpn0058vx622945"; depends=[]; };
@@ -1070,8 +1085,8 @@ MPAgenomics = derive { name="MPAgenomics"; version="1.1.2"; sha256="1gwglzkip54s
 MPDiR = derive { name="MPDiR"; version="0.1-16"; sha256="10g4dnysjnzf106qibqqcrxz3xw2nfh4ck1n1dlciwahr0f80j13"; depends=[]; };
 MPINet = derive { name="MPINet"; version="1.0"; sha256="1zw3piqhhpagg5qahc2xahxxfdwdk8w94aass1virlpl0f52ik8s"; depends=[BiasedUrn mgcv]; };
 MPSEM = derive { name="MPSEM"; version="0.2-6"; sha256="1vmdjnhxl8v7xw71kd1m66vhgaa1q0vvifd67v8fmii0i0i5i35y"; depends=[ape MASS]; };
-MPTinR = derive { name="MPTinR"; version="1.6.3"; sha256="1rxh8pj6zc06zhs5rllm98br0bkmgmc9d7hk04m251ji54mj80b1"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; };
-MPV = derive { name="MPV"; version="1.35"; sha256="0mfg05w7zx5my7g60yvbk2fiakrdskb82rcwzpncjdnn3pmc2axv"; depends=[]; };
+MPTinR = derive { name="MPTinR"; version="1.7.5"; sha256="0bxakcar4i30nhjbnwi00wxnbbl0qdzyx6pwwihcl3zvcbclvc79"; depends=[numDeriv Brobdingnag Rcpp Rcpp RcppEigen]; };
+MPV = derive { name="MPV"; version="1.38"; sha256="1w3b0lszqmsz0yqvaz56x08xmy1m5ngl9m6p2pg9pjv13k8dv190"; depends=[]; };
 MRCE = derive { name="MRCE"; version="2.0"; sha256="0fnd7ykcxi04pv1af5zbmavsp577vkw6pcrh011na5pzy2xrc49z"; depends=[QUIC]; };
 MRCV = derive { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; };
 MRH = derive { name="MRH"; version="2.0"; sha256="0d6zfhyy8a0pjrr74lj0mcagh49pjh15yp4wa7g7j4qv8wfw5pkv"; depends=[survival KMsurv coda]; };
@@ -1107,12 +1122,12 @@ MarkowitzR = derive { name="MarkowitzR"; version="0.1502"; sha256="0srrmzr4msn04
 MasterBayes = derive { name="MasterBayes"; version="2.52"; sha256="12ka2l4x6psij7wzbb98lwx5shgwzn5v44qfpiw1i6g236yp0mhm"; depends=[coda genetics gtools kinship2]; };
 MatchIt = derive { name="MatchIt"; version="2.4-21"; sha256="02kii2143i8zywxlf049l841b1y4hqjwkr1cnyv6b8b7y7lz2m5v"; depends=[MASS]; };
 Matching = derive { name="Matching"; version="4.8-3.4"; sha256="04m647342j4yi74ds7ddwnyrf58qdy7k3mc067k3p779qavq2ka1"; depends=[MASS]; };
-MatchingFrontier = derive { name="MatchingFrontier"; version="0.3.17"; sha256="1z4sgvcivlnfhkgqi7jr7b6iwlwskwwnkw9hsaiy4apgki4m0ngn"; depends=[igraph MASS]; };
-Matrix = derive { name="Matrix"; version="1.1-5"; sha256="0kqbabpzin7j33cjx6na3qdr5ry5fgsxbi3a7rm93ghqaadaagmj"; depends=[lattice]; };
+MatchingFrontier = derive { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[MASS igraph segmented]; };
+Matrix = derive { name="Matrix"; version="1.2-0"; sha256="0ywz213p6cpwnklxd81hzdyxjzagaj6cn32ycc5rcnhxy30d7kk5"; depends=[lattice]; };
 MatrixEQTL = derive { name="MatrixEQTL"; version="2.1.1"; sha256="1bvfhzhvm1psgq51kpjcpp7bidaxcrxdigmv6abfi3jk5kyzn5ik"; depends=[]; };
 MatrixModels = derive { name="MatrixModels"; version="0.4-0"; sha256="1jcjsyha0xmz264g1haj7x8zpzjmp1m0jl39h5bf8r45hhlaxcsa"; depends=[Matrix]; };
 MaxPro = derive { name="MaxPro"; version="3.1-2"; sha256="1y2g8a8yvzb24dj0z82nzfr6ylplb9sbi2dmj7f3pb4s3yr5zm8y"; depends=[nloptr]; };
-MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.2"; sha256="0cwqcxkcily3wdg756s9i9brcrhp8pz4q9gkmqfsi6i0l4rkk7fi"; depends=[dplyr rgdal rgeos rvest sp stringr]; };
+MazamaSpatialUtils = derive { name="MazamaSpatialUtils"; version="0.2.3"; sha256="09a7zd0jkf5gx0zybbnlzcmzhzdiwh15mjg2nfyy00lrjbhvq83i"; 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]; };
@@ -1132,7 +1147,7 @@ MetaSKAT = derive { name="MetaSKAT"; version="0.40"; sha256="1jxs32hvsw6wzci9f1r
 MetabolAnalyze = derive { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[mclust mvtnorm ellipse gtools gplots]; };
 Metatron = derive { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 mpt Matrix]; };
 Meth27QC = derive { name="Meth27QC"; version="1.1"; sha256="0ad30svs2kjzmmyvcm0jmv64iyq7slp1x1xl35h2rv1b6zbd4658"; depends=[gplots]; };
-MethComp = derive { name="MethComp"; version="1.22.1"; sha256="0p4ikf3mgd2syk9rsp6v1kd4vhg3h43krw8mhl3771shrh9bnivb"; depends=[nlme]; };
+MethComp = derive { name="MethComp"; version="1.22.2"; sha256="0f9l36d00x054yqgbw0dckc7ldlgap6vnbb03n6n5yz47xxg0ic3"; depends=[nlme]; };
 Methplot = derive { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; };
 Metrics = derive { name="Metrics"; version="0.1.1"; sha256="1yqhlsmhh9sl7qngl85b7qb980s54h13wwznpakyvvwlar64yqrw"; depends=[]; };
 MfUSampler = derive { name="MfUSampler"; version="0.9.1"; sha256="0fw1jw2ljsxmvnaayn7zdrrsnbbkkb5n9nm396321p36bqkf1pk3"; depends=[ars]; };
@@ -1143,9 +1158,10 @@ MicroStrategyR = derive { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0
 MigClim = derive { name="MigClim"; version="1.6"; sha256="171pnalidyw0v2fcjdc3kyrq5kg035kwj5xl8zwgn3hlanpaljvp"; depends=[SDMTools raster]; };
 MindOnStats = derive { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; };
 Miney = derive { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; };
-MissMech = derive { name="MissMech"; version="1.0.1"; sha256="0xcxzgjv9p9w8rdq07vanfrw0b49acdikr8brm78hshy0dsnas32"; depends=[]; };
+MissMech = derive { name="MissMech"; version="1.0.2"; sha256="1b7i1balfl1cqr3l4l4wxlahk2gmawzv9rhyibwzf0yp60cb1sv9"; depends=[]; };
 MissingDataGUI = derive { name="MissingDataGUI"; version="0.2-2"; sha256="07a3y8l0r7a0f7zmp5pg2aqkf7hyk8cf562x3m8b38w96vir4vr0"; depends=[gWidgetsRGtk2 ggplot2 GGally cairoDevice reshape]; };
 MitISEM = derive { name="MitISEM"; version="1.0"; sha256="03305ds3rgr29z4idaxzsm83igiygna2sqd5vpixklngsrp8w341"; depends=[mvtnorm]; };
+MixAll = derive { name="MixAll"; version="1.0.2"; sha256="10jwiri659i2h0gkaxc41gjvff4v465syxr0nppn1qqz5910jql0"; depends=[rtkpp Rcpp rtkpp]; };
 MixGHD = derive { name="MixGHD"; version="1.4"; sha256="0c7d9yf4hl7s8a1alzxjs12kcq98s9wna277vw20rnxa60b6dsqm"; depends=[MASS mclust Bessel mvtnorm ghyp numDeriv]; };
 MixMAP = derive { name="MixMAP"; version="1.3.1"; sha256="0m6m9wi0ain7z96s6z6kmwjisfqm3al6m459y5zr2l1cdbdpxfpv"; depends=[lme4]; };
 MixSim = derive { name="MixSim"; version="1.0-9"; sha256="16kg12784z82x8f1vscv9d5yakmki2m8gqr4hy9417c31xfkk3zy"; depends=[MASS]; };
@@ -1156,7 +1172,7 @@ Modalclust = derive { name="Modalclust"; version="0.6"; sha256="16h90d30jwdrla56
 ModelGood = derive { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
 ModelMap = derive { name="ModelMap"; version="3.0.15"; sha256="1d7qn1p4fv94bdlr6if64vxl9yknavix4gzmpg3kxwlrxaz2g8a2"; depends=[randomForest raster gbm rgdal fields HandTill2001 PresenceAbsence]; };
 Momocs = derive { name="Momocs"; version="0.2-6"; sha256="187w6xyswlg5nac6lbprcwvj63gka832n33vlj2ix810vqyxd0fk"; depends=[ade4 sp shapes jpeg spdep ape]; };
-MonetDB_R = derive { name="MonetDB.R"; version="0.9.6"; sha256="0mi7sxiqdih3lh0ki70cmr1qp62cqr2s88s0jjqcbigxsc1n7gg6"; depends=[DBI digest]; };
+MonetDB_R = derive { name="MonetDB.R"; version="0.9.7"; sha256="0b5agr3dl0ps7fnqw2fsgzb2ysqzvg2ymhxz3xyn08djgz6w7vkm"; depends=[DBI digest]; };
 MonoPoly = derive { name="MonoPoly"; version="0.2-8"; sha256="0lpqqpahpss4q9iddh2p4h6klsrjhg3v6h1wfb70vy0miyhqb93h"; depends=[quadprog]; };
 Morpho = derive { name="Morpho"; version="2.2"; sha256="03j121ghswr1kwq40krk3b4ycn44l9ga3bp64igknvpnqikp5qcb"; depends=[Rvcg rgl colorRamps foreach Matrix yaImpute doParallel Rcpp Rcpp RcppArmadillo]; };
 MorseGen = derive { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
@@ -1178,12 +1194,12 @@ MultinomialCI = derive { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102
 Myrrix = derive { name="Myrrix"; version="1.1"; sha256="15w1dic6p983g2gajbm4pws743z68y0k2hxrdwx6ppnzn9rk07rs"; depends=[Myrrixjars rJava]; };
 Myrrixjars = derive { name="Myrrixjars"; version="1.0-1"; sha256="0dy82l0903pl4c31hbllscfmxrv3bd5my5b2kv5d3x5zq0x99df0"; depends=[rJava]; };
 NADA = derive { name="NADA"; version="1.5-6"; sha256="0y7njsvaypcarzygsqpqla20h5xmidzjmya4rbq39gg6gkc0ky27"; depends=[survival]; };
-NAM = derive { name="NAM"; version="1.1"; sha256="1iiwbfwdjsv8mdgqn7819x36675mz345djf1dbyni0h46dpc1q4w"; depends=[Rcpp Matrix missForest Rcpp]; };
+NAM = derive { name="NAM"; version="1.2"; sha256="17jjg8ilxka00k90ca1zjg59g4d2l4s0dj3dsszpa4ab6nddc2zl"; depends=[Rcpp missForest Rcpp]; };
 NAPPA = derive { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[plyr NanoStringNorm]; };
 NB = derive { name="NB"; version="0.9"; sha256="1gh42z7lp6g09fsfmikxqzyvqp2874cx3a6vr96w43jfwmgi2diq"; depends=[]; };
 NBDdirichlet = derive { name="NBDdirichlet"; version="1.01"; sha256="07j9pcha6clrji8p4iw466hscgs6w43q0f7278xykqcdnk39gkyv"; depends=[]; };
 NBPSeq = derive { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[]; };
-NCmisc = derive { name="NCmisc"; version="1.1.3"; sha256="051qbqsvqb5wivba8msdhswfg0cxyxnyp601zgb1zvzcnbrffimg"; depends=[proftools]; };
+NCmisc = derive { name="NCmisc"; version="1.1.4"; sha256="0hbrad72lzp0vi0j9lvpmvdih7vijqghqng1f0hjd8fg8hjvcflg"; depends=[proftools dplyr]; };
 NEff = derive { name="NEff"; version="1.0"; sha256="0ksnmxjy2ms2z7rq4rddnykydwlb4f9c13nak5f8m65pfjcgv3sk"; depends=[msm bit]; };
 NHANES = derive { name="NHANES"; version="1.0"; sha256="18sy2x61bnily3fz0rs61y44kn6y2ikgrzr6nhgm6fkqv02ffdg8"; depends=[]; };
 NHEMOtree = derive { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[partykit emoa sets rpart]; };
@@ -1200,6 +1216,7 @@ NMOF = derive { name="NMOF"; version="0.34-1"; sha256="0agh22p4rr3dfq1wipm2435hv
 NORMT3 = derive { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
 NORRRM = derive { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
 NORTARA = derive { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; };
+NPBayesImpute = derive { name="NPBayesImpute"; version="0.5"; sha256="0ym227hz6g51bfn218k1g377ci66j4i2sx9zmm5n62sg1dzj3xaj"; depends=[Rcpp Rcpp]; };
 NPCD = derive { name="NPCD"; version="1.0-7"; sha256="11h460h1q50qixr2hk4wd4v6wgwblp3cqvksbzqkdcinzzp8z6zh"; depends=[BB R_oo R_methodsS3]; };
 NPCirc = derive { name="NPCirc"; version="2.0.1"; sha256="1pyckjvf4vzns9hxnhnk7cm4abllmdj3f142pvjhnilyqwndqgyc"; depends=[circular misc3d movMF plotrix rgl shape]; };
 NPHMC = derive { name="NPHMC"; version="2.2"; sha256="000x9y00gfkaj5lf00a55b9qx15x05yp3g3nmp8slyzsnfv66p5d"; depends=[survival smcure]; };
@@ -1213,7 +1230,7 @@ NSM3 = derive { name="NSM3"; version="1.3"; sha256="0vmv7r499ig2fq2gwx78jdrflk5i
 NSUM = derive { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
 NScluster = derive { name="NScluster"; version="1.0.2"; sha256="1bvr44qx3bzbgsdpj70dfq9azkrsywkbvwvm3lwwgpn0spk8apld"; depends=[]; };
 NanoStringNorm = derive { name="NanoStringNorm"; version="1.1.19"; sha256="0nrhsg32f6381snsxivcnznl752y9jmdscrcn1j8xylwmwc0r4hj"; depends=[gdata]; };
-NbClust = derive { name="NbClust"; version="2.0.4"; sha256="01r76gfg1lyajkh5x18pcqzp8iw0g3kfq5q8liv351l9wgykj34g"; depends=[]; };
+NbClust = derive { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; };
 NeatMap = derive { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; };
 NestedCohort = derive { name="NestedCohort"; version="1.1-3"; sha256="10hsc6zik8sz2mp6ig3xr6z3bq0c6rlvqkn11pxny17a4n02wapp"; depends=[survival MASS]; };
 NetCluster = derive { name="NetCluster"; version="0.2"; sha256="0aby8kfniw07jap795cwk69z83p45q5rap73zp1qbmkm3qcb31g4"; depends=[sna]; };
@@ -1234,7 +1251,7 @@ NormalLaplace = derive { name="NormalLaplace"; version="0.2-0"; sha256="11z568zh
 Nozzle_R1 = derive { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
 OAIHarvester = derive { name="OAIHarvester"; version="0.1-7"; sha256="0wcl71y8i4s4fxpb90xg71sj6819kgl3d4gff66dan8i6y8sxmyk"; depends=[XML RCurl]; };
 ODB = derive { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; };
-ODMconverter = derive { name="ODMconverter"; version="2.0"; sha256="1691fmkdjhk7rih8qk3rp6bykplz8hxsl7in8gjrc5ll0fkygm98"; depends=[XML xlsx]; };
+ODMconverter = derive { name="ODMconverter"; version="2.1"; sha256="03m15vck01s6jqcpm5fl7mipki4grgywlb9mksr0l8wygmn8zkxs"; depends=[XML xlsx]; };
 OIdata = derive { name="OIdata"; version="1.0"; sha256="078khxrszwnrww2h0ag153bf59fnyhirxy4m56ssgr2gmfahaymf"; depends=[RCurl maps RCurl maps]; };
 OIsurv = derive { name="OIsurv"; version="0.2"; sha256="148mpjj5navc1vrl72y87krn4lf3awnd32z3g4qqaia404w5w7p7"; depends=[survival KMsurv]; };
 OLScurve = derive { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; };
@@ -1272,11 +1289,12 @@ OrdMonReg = derive { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l
 OrdNor = derive { name="OrdNor"; version="1.0"; sha256="1n6c0d4r1w3n016lzk2i5yyvawk9pgmsbzymbbyq7gx8a80iv32h"; depends=[mvtnorm corpcor Matrix GenOrd]; };
 OrdinalLogisticBiplot = derive { name="OrdinalLogisticBiplot"; version="0.4"; sha256="1axn03yrw30r2j9ss5ig9sq857y37vhrr4a7px68jc2az8mng41j"; depends=[mirt MASS NominalLogisticBiplot]; };
 OrgMassSpecR = derive { name="OrgMassSpecR"; version="0.4-4"; sha256="046lr0piiy5w5lxjvyw7iqqclkghmc6zqymfypkw374gk73yrm76"; depends=[]; };
-OutbreakTools = derive { name="OutbreakTools"; version="0.1-12"; sha256="0xfvaf8anj57yrw7ycljcnrpg2b2rqi12lclzm6afy15my67drff"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic RCurl]; };
+OutbreakTools = derive { name="OutbreakTools"; version="0.1-13"; sha256="0wwb43n0vv3ihpyr1g48nf81ml7vigvlsq316nzav528i1f7jh22"; depends=[ggplot2 network knitr RColorBrewer ape reshape2 sna plyr ggmap scales rjson networkDynamic RCurl]; };
 OutlierDC = derive { name="OutlierDC"; version="0.3-0"; sha256="1vm3zx4qmj9l0ddfqbksm1qyqzzqrxf93gh4kj52h68zlsfxwv41"; depends=[survival quantreg Formula]; };
 OutlierDM = derive { name="OutlierDM"; version="1.1.1"; sha256="0n8iq464ryc3v4wms7cdka39870w5pg29z9v8gmdsp4d9cfsx9v4"; depends=[quantreg MatrixModels outliers pcaPP]; };
 OutrankingTools = derive { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; };
 P2C2M = derive { name="P2C2M"; version="0.6"; sha256="00m4dmvnvbjbxxqi9ai2zd33cwlsb7ghjbswz256w5iab4c0ls02"; depends=[ape apTreeshape ggplot2 rPython stringr]; };
+PAFit = derive { name="PAFit"; version="0.7.2"; sha256="047ajzb9xnhxqa9v5dggznix9rd9z66g0mzanzwqb8ds5f8gm8ls"; depends=[Rcpp Rcpp]; };
 PAGI = derive { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; };
 PAGWAS = derive { name="PAGWAS"; version="1.0"; sha256="1zwq4b0bgsskzvlapffh30ys9y4wlcfwpjqw8m2i9zabib5knx9i"; depends=[lars doMC mnormt]; };
 PANDA = derive { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster]; };
@@ -1309,6 +1327,7 @@ PET = derive { name="PET"; version="0.4.9"; sha256="1ijg6mfh3xrc1gjh6a4nq64psk9y
 PF = derive { name="PF"; version="9.5"; sha256="1y99brdabj78s5kxyv0136s40kaaj3zya9lk4qd0kqk83z2gdawp"; depends=[xtable RColorBrewer gdata]; };
 PGICA = derive { name="PGICA"; version="1.0"; sha256="0qxa5hw2s3mndjvk8lb82pcbyj1kbdclx4j4xa8jq0lcj180abi9"; depends=[fastICA]; };
 PGM2 = derive { name="PGM2"; version="1.0"; sha256="18azh6k271p9dvc23q402pv7wrilr1yk02vqqy6qjppnvq6jxahg"; depends=[]; };
+PGRdup = derive { name="PGRdup"; version="0.2"; sha256="12vxdw4093xmmpcl6ars7h03f1a21gjl5p29r5d19hp68h4hchi1"; depends=[data_table igraph stringdist stringi]; };
 PHENIX = derive { name="PHENIX"; version="1.1"; sha256="0bdb31hqhjz73dz4659i11y9qh0r0j139024285ci7z3xx22cdy5"; depends=[ppcor SuppDists]; };
 PHYLOGR = derive { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
 PHeval = derive { name="PHeval"; version="0.5.2"; sha256="1q0cyq7b8d42jgiw7ra9vjdjw1zcxpyg6wgb3zgygkmd744ifggp"; depends=[survival]; };
@@ -1326,7 +1345,7 @@ PLRModels = derive { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00k
 PLSbiplot1 = derive { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; };
 PLordprob = derive { name="PLordprob"; version="1.0"; sha256="156lvz6vfm68hm32l5nlhq15hfacdla627d6lf8l4g34lwzdh8k8"; depends=[mnormt]; };
 PMA = derive { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[plyr]; };
-PMCMR = derive { name="PMCMR"; version="1.0"; sha256="07k98zp4s65vx7ybj75b0i1jhlnvfspwjqh10nxdn0zmixw9nywj"; depends=[]; };
+PMCMR = derive { name="PMCMR"; version="1.1"; sha256="0f3882rjyxlcr183qa9y22bxh8nqp307v065aiy61ii0kizj9f70"; depends=[]; };
 PP = derive { name="PP"; version="0.5.3"; sha256="17y1v2536n7ap0kvllwkmndmdjf4wgwl171c053ph45krv37mscf"; depends=[Rcpp Rcpp]; };
 PPtree = derive { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
 PRISMA = derive { name="PRISMA"; version="0.2-5"; sha256="06z4z1rbsk5a8kpbs6ymm0m02i8dwbmv783c3l2pn4q3pf6ncmd5"; depends=[Matrix gplots ggplot2]; };
@@ -1363,11 +1382,12 @@ PerFit = derive { name="PerFit"; version="1.3.1"; sha256="0zmhafr5fk3z66cp46gasg
 PerMallows = derive { name="PerMallows"; version="1.8"; sha256="1p0rnphhjc0rr1zpbff71mk75lnyph994k4p5whwn2fyfzi1pn0f"; depends=[Rcpp Rcpp]; };
 PerfMeas = derive { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[]; };
 PerformanceAnalytics = derive { name="PerformanceAnalytics"; version="1.4.3541"; sha256="1czchsccsbdfjw743j6rm101q2q01pggyl8zmlva213pwm86zb3v"; depends=[xts zoo]; };
-PermAlgo = derive { name="PermAlgo"; version="1.0"; sha256="1dc4b5pn77av80k6pgh9k0ksvv9lnjqiwdb2jv55nm0ndycw0qr4"; depends=[]; };
+PermAlgo = derive { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; };
 PhViD = derive { name="PhViD"; version="1.0.6"; sha256="04vh3892fwb8pn2wmsw5449al80z5sm6avi6b67shky942dasl17"; depends=[MCMCpack]; };
 PharmPow = derive { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
 PhaseType = derive { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
 PhyActBedRest = derive { name="PhyActBedRest"; version="1.0"; sha256="0fpg17fwap12da7xka8pnd1wk6rbmw3zl099588g2r05wq3425sx"; depends=[]; };
+PhyloMeasures = derive { name="PhyloMeasures"; version="1.1"; sha256="1wxm9yiplasxhqxs3qxys46k1i7n459frxxh275abczafq46l8if"; depends=[ape]; };
 PhysicalActivity = derive { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
 PivotalR = derive { name="PivotalR"; version="0.1.17.45"; sha256="13rw7y2n2hnyj2lslkb78qhj05765k9snkgdhh4dfnlgnyb19kkw"; depends=[Matrix]; };
 PlayerRatings = derive { name="PlayerRatings"; version="1.0-0"; sha256="0hjb05bdha00ggcpp3n4f86dxjlhzmlpwgsbbx3mhyv3qq1g32ky"; depends=[]; };
@@ -1386,6 +1406,7 @@ PopED = derive { name="PopED"; version="0.2.0"; sha256="00qbwabzjb4ns9y9a4gg73zx
 PopGenKit = derive { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; };
 PopGenReport = derive { name="PopGenReport"; version="2.1"; sha256="040h7cvnh1xqlbsyg1lkfiz88421myr47r63v466bxidwb17bqg2"; depends=[knitr adegenet raster lattice RgoogleMaps gap calibrate xtable plyr dismo reshape ggplot2 R_utils ade4 pegas genetics rgdal gdistance vegan sp mmod GGally]; };
 PopGenome = derive { name="PopGenome"; version="2.1.0"; sha256="150n0fdi047nx4iyfdm7ql4gn98wcj1v99llcpaaba78ca7dm83n"; depends=[ff]; };
+PopVar = derive { name="PopVar"; version="1.0"; sha256="1gn6skjw7l4ljqs8c7vyx3gq9i7qp96vj84grld6bhsg63m0vbwh"; depends=[BGLR qtl rrBLUP]; };
 PortRisk = derive { name="PortRisk"; version="1.0"; sha256="0vyzvi56lmdlhxpbxcxcfqa8271jv2l45w7x1kzzwl6q0wm4bjln"; depends=[zoo]; };
 PottsUtils = derive { name="PottsUtils"; version="0.3-2"; sha256="05ds0a7jq63zxr3jh66a0df0idzhis76qv6inydsjk2majadj3zv"; depends=[miscF]; };
 PoweR = derive { name="PoweR"; version="1.0.4"; sha256="00y0dvrsbvz8mr8mdw7fk17s5dfgm0f641qg96039y6g3hk2rn77"; depends=[Rcpp Rcpp RcppArmadillo]; };
@@ -1407,7 +1428,7 @@ PropCIs = derive { name="PropCIs"; version="0.2-5"; sha256="0wnc5h4390w4rglr7gjh
 PropClust = derive { name="PropClust"; version="1.4-2"; sha256="13ac895i7ljayyqcjjmwvwar6wf1j0qssazcb5nlz8rw155qwavs"; depends=[flashClust dynamicTreeCut]; };
 PropScrRand = derive { name="PropScrRand"; version="1.1"; sha256="0cj62dzg4zm8d1g8h7qmviiwm93cwplppbi0p674fmmf1wy84v9s"; depends=[]; };
 PsumtSim = derive { name="PsumtSim"; version="0.4"; sha256="0079kb1bgsxs4cwmn33rbbk2jgq39rdjfgz9k9hc64iyzz0i6na3"; depends=[EffectsRelBaseline boot]; };
-PtProcess = derive { name="PtProcess"; version="3.3-7"; sha256="0a180qdf1a7jhng4ihjhd2aq2d7pd9pahir6920xczxvdgp3lm0l"; depends=[]; };
+PtProcess = derive { name="PtProcess"; version="3.3-9"; sha256="1pgxi6085l6wwcn354rm8zkrm7nvjmyad6627fh5561y9ksws08k"; depends=[]; };
 PubBias = derive { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[rmeta R_utils]; };
 PubMedWordcloud = derive { name="PubMedWordcloud"; version="0.3.2"; sha256="1xn4ygpvj6pm548yj5kjh2l8n59p2caihfpbkykvbkzgf7hq8p00"; depends=[XML stringr RCurl wordcloud tm RColorBrewer]; };
 PurBayes = derive { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
@@ -1447,11 +1468,11 @@ R2G2 = derive { name="R2G2"; version="1.0-2"; sha256="05d5vybvsi4pyr099916nk1l8s
 R2GUESS = derive { name="R2GUESS"; version="1.6"; sha256="1lh73zjch2jaspas065mkcsq13v6s323k4wdhvkydmvyhlgvlpcl"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; };
 R2HTML = derive { name="R2HTML"; version="2.3.1"; sha256="01mycvmz4xd1729kkb8nv5cl30v3qy3k4fmrlr2m1112hf5cmp59"; depends=[]; };
 R2MLwiN = derive { name="R2MLwiN"; version="0.8-0"; sha256="1fjns3v6prjkd4iwdcj846sj5ji1bg4b7axxx18wlsvrin83gd9k"; depends=[lattice coda Matrix foreign rbugs digest]; };
-R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-2.2"; sha256="0hnp46linvpnzifhyb3r13xmwvdc3psabs53xl6qxxm4snrl4bnd"; depends=[coda boot]; };
+R2OpenBUGS = derive { name="R2OpenBUGS"; version="3.2-3.1"; sha256="1nnyfhpqgx6wd4n039c4d42png80b2xcwalyj08bmq0cgl32cjgk"; depends=[coda boot]; };
 R2STATS = derive { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[proto Matrix lattice lme4 cairoDevice gWidgets gWidgetsRGtk2 RGtk2Extras MASS latticeExtra statmod]; };
 R2SWF = derive { name="R2SWF"; version="0.9"; sha256="0c3lkmm8wgpix3fv7dxql6zpklwbcsv1y30r26yws12fnavw4y1k"; depends=[sysfonts]; };
 R2WinBUGS = derive { name="R2WinBUGS"; version="2.1-19"; sha256="03bvxv46lhhnbfjq3w5ig50icncwn1bdq7lsh6w1szdk90ah2zgh"; depends=[coda boot]; };
-R2admb = derive { name="R2admb"; version="0.7.10"; sha256="0rjrd1wpr1f4l800mccnwsa121g93rrr7q9dq0xxvkl3lsbn6f2s"; depends=[]; };
+R2admb = derive { name="R2admb"; version="0.7.13"; sha256="0sjli498pz1vk5wmw65mca08mramwhzlfli2aih15xj7qzvp0nky"; depends=[coda lattice]; };
 R2jags = derive { name="R2jags"; version="0.05-03"; sha256="02r68g005cmcc7dg1a52awdyak2sg2pszpl6ckw4bw19sk9nnd48"; depends=[rjags abind coda R2WinBUGS]; };
 R330 = derive { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[s20x leaps rgl lattice]; };
 R4CDISC = derive { name="R4CDISC"; version="0.3"; sha256="0443mzkhsbrvsl7vawfpabsdqbqr9yjyyhsw1y07yncy55ylc2v5"; depends=[XML]; };
@@ -1466,7 +1487,7 @@ RAMpath = derive { name="RAMpath"; version="0.3.8"; sha256="1p1l6iirb314n5246kyy
 RANN = derive { name="RANN"; version="2.4.1"; sha256="13d2wi3r4b190f6s6y4zipqf43gy9c1h71b9j7qmc3lqca4nvzmd"; depends=[]; };
 RAP = derive { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; };
 RAPIDR = derive { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[data_table PropCIs]; };
-RAdwords = derive { name="RAdwords"; version="0.1.1"; sha256="17srb2zlli19x6gq79ylx9psb92qq5z7hnmqa4n26zgdd3iaf9mk"; depends=[RCurl rjson]; };
+RAdwords = derive { name="RAdwords"; version="0.1.3"; sha256="1i9s28q58571y8lx3gfc3div9iy1j2bcxbrf6n1v4lis0xn60vl1"; depends=[RCurl rjson]; };
 RApiSerialize = derive { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
 RAppArmor = derive { name="RAppArmor"; version="1.0.1"; sha256="06j7ghmzw2rrlk8nsarmpk1ab2gg88qs52zpw37rhqchpyzwwkfb"; depends=[]; };
 RArcInfo = derive { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; };
@@ -1485,8 +1506,8 @@ RConics = derive { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra2
 RCryptsy = derive { name="RCryptsy"; version="0.2"; sha256="1sm6l2jbaxia53dqivii5g7pqbczvjk53c2v2vz65qz1qnrmrybj"; depends=[RJSONIO RCurl]; };
 RCurl = derive { name="RCurl"; version="1.95-4.5"; sha256="0a99awma5ylcagr6y9adv82hr5wk5cg4i5flra5q0cpvhp9w8sd2"; depends=[bitops]; };
 RDIDQ = derive { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
-RDML = derive { name="RDML"; version="0.4-2"; sha256="0bx1n6x3yskpbgwwwjhs6hk43sfq7x55yffvnd7bz5qb3l49wsw2"; depends=[XML chipPCR]; };
-RDS = derive { name="RDS"; version="0.7"; sha256="0xlz1pkgznk6x3298f6b40l9h26y0akwkvy91ms2hh35hwk0m7y7"; depends=[gridExtra ggplot2 Hmisc igraph locfit reshape2 scales]; };
+RDML = derive { name="RDML"; version="0.8-3"; sha256="077mz3j3iy0ddbsr05a21l2lqlm24mxgnafxnijnkiqxci3nj5rl"; depends=[R6 assertthat XML plyr dplyr]; };
+RDS = derive { name="RDS"; version="0.7-1"; sha256="1vkrplzak95yqykrxgzjxgvyb4g255rnk6msh1yi5mgrd32f0gdl"; depends=[gridExtra ggplot2 Hmisc igraph reshape2 scales]; };
 RDSTK = derive { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr rjson RCurl]; };
 RDataCanvas = derive { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
 RDieHarder = derive { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
@@ -1498,6 +1519,7 @@ REEMtree = derive { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6
 REPPlab = derive { name="REPPlab"; version="0.9.1"; sha256="1yrw03p7rk5dbr23z343kxn7vbac8khcz4c718wq9w6sykhgv8d0"; depends=[rJava lattice]; };
 REQS = derive { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
 RESS = derive { name="RESS"; version="1.0"; sha256="0p6zfvakq4c02qp26l8zqcmi95na408rv6j6ibaxbcyf5vq9rhcs"; depends=[]; };
+REST = derive { name="REST"; version="1.0.1"; sha256="16v89z7p9qkg7bsypf9vkrnbmb2n7gw3fqnfzbyxwj496wzxdv1x"; depends=[Rcmdr]; };
 REdaS = derive { name="REdaS"; version="0.9.2"; sha256="0w1b2996b0sdpxklkxylnk18dx8vgssn5avh7pnrvdqa464ci4f8"; depends=[]; };
 RFGLS = derive { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; };
 RFLPtools = derive { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; };
@@ -1522,7 +1544,7 @@ RHT = derive { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568k
 RHive = derive { name="RHive"; version="2.0-0.2"; sha256="0a1saqqwh6zvz264jkkd6c9abxpsg1j4yfivb5h773i76pzhvqc3"; depends=[rJava]; };
 RI2by2 = derive { name="RI2by2"; version="1.2"; sha256="0387ncq1nhpz8521nwsjybsdpncm56nrwkz68apgihmrbjlmp6m7"; depends=[gtools]; };
 RIFS = derive { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
-RIGHT = derive { name="RIGHT"; version="0.1.2"; sha256="047g6gymrfzccnp56pvvk3s2r19p1czm9pjmpdn3fnx13d8lalaz"; depends=[shiny]; };
+RIGHT = derive { name="RIGHT"; version="0.2.0"; sha256="1mwm7l5l2hj67j03d895rx1181hax31a0nn3nq7rjcgpbljd2gjx"; depends=[ggplot2 plyr rjson shiny]; };
 RISmed = derive { name="RISmed"; version="2.1.5"; sha256="03c2b6iqq147kwrpx6wh440y1p2sy5c4i3v2yph99326pzxbyw7q"; depends=[]; };
 RImageJROI = derive { name="RImageJROI"; version="0.1"; sha256="06x8p8wpzmsc6f2330m74x4dmh21dn0gqicand2l198knahp3kf7"; depends=[spatstat]; };
 RImpala = derive { name="RImpala"; version="0.1.5"; sha256="0kx2h6gkjxrsp6c33p1j7irs205rn5lpknlmc8as3v1ziigi4d51"; depends=[rJava]; };
@@ -1533,8 +1555,10 @@ RJDBC = derive { name="RJDBC"; version="0.2-5"; sha256="0cdqil9g4w5mfpwq85pdq4vp
 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-5"; sha256="0ni5vdv5pjyl1kshqlp0vh7jfpn098949nwczz2ylk3qqs2hj0vm"; depends=[rJava tm]; };
+RKEA = derive { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[RKEAjars rJava tm]; };
+RKEAjars = derive { name="RKEAjars"; version="5.0-1"; sha256="00bva6ksdnmwa0i2zvr36n40xp429c0sqyp20a8n3zsblawiralc"; depends=[rJava]; };
 RLRsim = derive { name="RLRsim"; version="3.0"; sha256="16bqsp15b8ikgix18p63k6sf81d1al4djbb51r08imjs4z9jppg4"; depends=[Rcpp mgcv Rcpp]; };
+RLumShiny = derive { name="RLumShiny"; version="0.1.0"; sha256="0j4w3h1j6dm5q98639am3xfixjdx2xhiiy3qghkb0z8lv5rbvvw5"; depends=[Luminescence shiny digest googleVis RCurl]; };
 RM2 = derive { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
 RMAWGEN = derive { name="RMAWGEN"; version="1.3.0"; sha256="19p8bxcfk802pdn6990ya0bd9ghbvg8vmk3z01x1v76w09j4bv38"; depends=[chron date vars]; };
 RMC = derive { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; };
@@ -1557,7 +1581,7 @@ RNetLogo = derive { name="RNetLogo"; version="1.0-1"; sha256="051yx7l8qbnvb4gn67
 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]; };
+ROCR = derive { name="ROCR"; version="1.0-7"; sha256="1jay8cm7lgq56i967vm5c2hgaxqkphfpip0gn941li3yhh7p3vz7"; depends=[gplots]; };
 ROCS = derive { name="ROCS"; version="1.2"; sha256="1liph11p5dwvm1z5vq7ph5pizzqrm6ami94cq6y5kvm2qyv0jfah"; depends=[rgl]; };
 ROCt = derive { name="ROCt"; version="0.8"; sha256="1k0571gq7igg56qxwf9ibk28v763ji0w9183gs6qp95lpbyp5zwr"; depends=[date survival relsurv]; };
 ROCwoGS = derive { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; };
@@ -1587,7 +1611,7 @@ RQDA = derive { name="RQDA"; version="0.2-7"; sha256="05h2f5sk0a14bhzqng5xp87li2
 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.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]; };
+RSA = derive { name="RSA"; version="0.9.8"; sha256="1pqblhimhj79ss8js0nf8w24ga2kdmgw64rh496iib36g27asn8n"; depends=[lavaan ggplot2 lattice tkrplot plyr RColorBrewer aplpack]; };
 RSADBE = derive { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
 RSAGA = derive { name="RSAGA"; version="0.93-6"; sha256="0wqiww0rx5fz4rbsb1x6pr2q0wz5dacj5fc0asj70igxwmh5x0p8"; depends=[gstat shapefiles plyr]; };
 RSAP = derive { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[yaml reshape]; };
@@ -1641,11 +1665,12 @@ Rambo = derive { name="Rambo"; version="1.1"; sha256="1yc04xsfkc54y19g5iwambgnlc
 Ramd = derive { name="Ramd"; version="0.2"; sha256="0a64rp4dwhfr6vxsmya16x7wy7rxj4n98sdhhyy0ll850rdzlxd8"; depends=[]; };
 RandVar = derive { name="RandVar"; version="0.9.2"; sha256="04hw4v2d9aa8z9f8wvwbzhbfy8zjl5q8mpl9b91q86fhh1yq5cz4"; depends=[distr distrEx]; };
 RandomFields = derive { name="RandomFields"; version="3.0.62"; sha256="1v2dmwl3nq3mw88439z6hjaf3gkz9sf7dqm9iipgk333qw1s6sfk"; depends=[sp]; };
+RandomFieldsUtils = derive { name="RandomFieldsUtils"; version="0.0.1"; sha256="1nxq4sbgza0bsrspgs24mq9a7py9dhyx1dcaflpsvharc5m41ywc"; depends=[]; };
 RankAggreg = derive { name="RankAggreg"; version="0.5"; sha256="1c5ckk2pfkdxs3l24wgai2xg817wv218fzp7w1r3rcshxf0dcz2i"; depends=[gtools]; };
 RankResponse = derive { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
 Rankcluster = derive { name="Rankcluster"; version="0.92.9"; sha256="172jjsyc6a5y32s2fb8z6lgcq6rcwjbk3xnc5vvkhj64amlyxla6"; depends=[Rcpp Rcpp RcppEigen]; };
 RapidPolygonLookup = derive { name="RapidPolygonLookup"; version="0.1"; sha256="0m6r11ksryzcfcm265wr9fhwb867j9ppfhalvvygzig5j85sg92k"; depends=[sp RANN PBSmapping RgoogleMaps]; };
-Rarity = derive { name="Rarity"; version="1.3-1"; sha256="0l2sz254s5jydv5f15ilrnna2mih06ipsy9lbdi2si3j221vq9k3"; depends=[]; };
+Rarity = derive { name="Rarity"; version="1.3-4"; sha256="0zz1axr8a1r6js0la2ncls0l6jnjvx807ay2ngzb52hqbijifghx"; depends=[]; };
 RaschSampler = derive { name="RaschSampler"; version="0.8-7"; sha256="11vkb5gvr1r2a7fpxyygkixc62ms53dpik9jdg7vrb9k43v82ggj"; depends=[]; };
 RbioRXN = derive { name="RbioRXN"; version="1.5"; sha256="1w4g8a72a7f5m7g43hcybkahn3p51m6jnkydwgrchp53pby8ljxy"; depends=[plyr RCurl gdata data_table stringr]; };
 Rbitcoin = derive { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table RCurl digest RJSONIO]; };
@@ -1711,17 +1736,17 @@ RcppExamples = derive { name="RcppExamples"; version="0.1.6"; sha256="1jnqh9nii5
 RcppGSL = derive { name="RcppGSL"; version="0.2.4"; sha256="1nw1984siwxvihp68g7khr2c4a4nwyb4ll04r5302kksz4nh7mpi"; depends=[Rcpp Rcpp]; };
 RcppMLPACK = derive { name="RcppMLPACK"; version="1.0.10-2"; sha256="1hdvdk6ni2iganmldarklv635yzgzja36zcpflh5w45c5y3ysqvj"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
 RcppOctave = derive { name="RcppOctave"; version="0.14.5"; sha256="0dplc2x9fq2jfzfbcxdd45pmiimapqb3xhyjkzd4k6q8xmqjw95p"; depends=[Rcpp pkgmaker digest stringr Rcpp]; };
-RcppParallel = derive { name="RcppParallel"; version="4.3.6"; sha256="007jbx16kixnk4b3081iplwa3qjdaqr4jbikhw0fsfdg2ws1ps2s"; depends=[]; };
+RcppParallel = derive { name="RcppParallel"; version="4.3.8"; sha256="0gk42v2qxjgz34ispcyr0mizbp3l9l0p6jpw3y59vafpbkgdk0yg"; depends=[]; };
 RcppProgress = derive { name="RcppProgress"; version="0.2.1"; sha256="1dah99679hs6pcaazxyc52xpx5wawk95r2bpx9fx0i33fqs1s4ng"; depends=[Rcpp Rcpp]; };
 RcppRedis = derive { name="RcppRedis"; version="0.1.3"; sha256="0xpldiny2n121dp7vpj9l3bjvjhbfkdim5cassvvj2wms9q4jvh5"; depends=[Rcpp RApiSerialize Rcpp RApiSerialize]; };
-RcppRoll = derive { name="RcppRoll"; version="0.1.0"; sha256="0xwm64z7pr2cjmq4kri7zzhy7wvq7aj9lq3xm2g830fn71qvj8x3"; depends=[Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
+RcppRoll = derive { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp Rcpp]; };
 RcppSMC = derive { name="RcppSMC"; version="0.1.4"; sha256="1gcqffb6rkw029cpzv7bzsxaq0a5b032zjvriw6yjzyrpi944ip7"; depends=[Rcpp Rcpp]; };
 RcppStreams = derive { name="RcppStreams"; version="0.1.0"; sha256="0pb9ri2jajfh7643wx730bkmpvjvvmip682ynm2yn6x6brjll6jf"; depends=[Rcpp Rcpp BH]; };
 RcppXts = derive { name="RcppXts"; version="0.0.4"; sha256="143rhz97qh8sbr6p2fqzxz4cgigwprbqrizxpkjxyhq8347g8p4i"; depends=[Rcpp xts Rcpp xts]; };
 RcppZiggurat = derive { name="RcppZiggurat"; version="0.1.2"; sha256="05ai6s2j025fvr4znpmsvhxj4x7xyw2wsb9j3c5sv7aw1byfs0bb"; depends=[Rcpp Rcpp RcppGSL]; };
 Rcsdp = derive { name="Rcsdp"; version="0.1.53"; sha256="0x91hyx6z9f4zd7djxlq7dnznmr9skyzwbbcbjyid9hxbcfyvhcp"; depends=[]; };
-Rd2roxygen = derive { name="Rd2roxygen"; version="1.5"; sha256="0qh64bd323s3h44ypjxv98ndp332q31imf5prmaqvzcjs2j0r3gh"; depends=[roxygen2 formatR]; };
-Rdistance = derive { name="Rdistance"; version="1.1"; sha256="1rgjiks4s5l0vdj4svik9zz6kwwxsh9nj6q2ng7iblny6iqm6kbd"; depends=[]; };
+Rd2roxygen = derive { name="Rd2roxygen"; version="1.6"; sha256="0y0vh1dfflh8lrgrdj9wfmwh70ywd9kiia49f09h849mv1ln1z60"; depends=[roxygen2 formatR]; };
+Rdistance = derive { name="Rdistance"; version="1.2.1"; sha256="0ci0dg8j28a6b4s4i53p3sahcr4czw9fhrkd14q30wcd9is8dgkz"; depends=[]; };
 Rdpack = derive { name="Rdpack"; version="0.4-14"; sha256="19vscr9l63c074n76b6a6jbl956sphjhz0d50yiwp3cvqf28yssf"; depends=[gbRd bibtex]; };
 Rdsdp = derive { name="Rdsdp"; version="1.0.2"; sha256="0rpy3897dargrfrn6qd5m1j6i1pvfk2qa3cny0iacqkgqbg8a4wx"; depends=[]; };
 Rdsm = derive { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; };
@@ -1765,6 +1790,7 @@ Rmalschains = derive { name="Rmalschains"; version="0.2-2"; sha256="1ki3igj78sk4
 Rmisc = derive { name="Rmisc"; version="1.5"; sha256="1ijjhfy3v91fspid77rrkc5dkcb2lav37wc3f4k5lwrn24wzy5y8"; depends=[lattice plyr]; };
 Rmixmod = derive { name="Rmixmod"; version="2.0.2"; sha256="1qv6zymkgsbplrq4aa87lvcsv75dssj8qqq2h9665v31jsgx84lr"; depends=[Rcpp Rcpp]; };
 RmixmodCombi = derive { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rmixmod Rcpp]; };
+Rmonkey = derive { name="Rmonkey"; version="0.2.11"; sha256="0dfn38ni06k0q7a10ilb3169ffc71mizf25jfiqmbmqw08az8bhf"; depends=[RCurl httr jsonlite plyr]; };
 Rmosek = derive { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix Matrix]; };
 Rmpfr = derive { name="Rmpfr"; version="0.5-7"; sha256="0bqjs65wlnpq95smnnwpqjrqgwda412z2qbyafa8jw6972lmsyq9"; depends=[gmp]; };
 Rmpi = derive { name="Rmpi"; version="0.6-5"; sha256="0i9z3c45jyxy86yh3f2nja5miv5dbnipm7fpm751i7qh630acykc"; depends=[]; };
@@ -1783,7 +1809,7 @@ Rook = derive { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji
 RootsExtremaInflections = derive { name="RootsExtremaInflections"; version="1.0"; sha256="1vcbjxx1yfla71fmmf5w8dqp0vqw93dxsjsvz0vj28bfqmkmh554"; depends=[]; };
 Rothermel = derive { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[GA ftsa]; };
 RoughSetKnowledgeReduction = derive { name="RoughSetKnowledgeReduction"; version="0.1"; sha256="0zn6y2rp78vay9zwijpzhjpyq1gmcsa13m9fcsxkd1p2c8g5rbmf"; depends=[]; };
-RoughSets = derive { name="RoughSets"; version="1.2-0"; sha256="04z47dsws39rg34fisr0favl0ar1vqhvzmafb5sf4d62h2r6rvdl"; depends=[Rcpp Rcpp]; };
+RoughSets = derive { name="RoughSets"; version="1.2-1"; sha256="06bykfd26qdll0xadvvp0lljcibg613xi02gq5q8x3h0l9qa4c2x"; depends=[Rcpp Rcpp]; };
 Rpdb = derive { name="Rpdb"; version="2.2"; sha256="0gf6qab05a3ky8skbbjiadizi1gs4pcw3zp25qj5gn82lb6382pd"; depends=[rgl]; };
 Rphylip = derive { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
 Rpoppler = derive { name="Rpoppler"; version="0.0-1"; sha256="01zsbm538yhwm1cyz5j6x2ngz05yqj16yxyvyxqhn6jp8d0885jh"; depends=[]; };
@@ -1804,17 +1830,18 @@ Ruchardet = derive { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c34
 Runiversal = derive { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
 Runuran = derive { name="Runuran"; version="0.21.0"; sha256="1p33z9h2zj6fx42rlq6yajd6lwvzy4a1a5gs67dz5k1zbza8avw0"; depends=[]; };
 RunuranGUI = derive { name="RunuranGUI"; version="0.1"; sha256="0wm91mzgd01qjinj94fr53m0gkxjvx7yjhmwbkrxsjn6mjklq72l"; depends=[Runuran rvgtest gWidgets gWidgetsRGtk2 cairoDevice]; };
-Rvcg = derive { name="Rvcg"; version="0.10.1"; sha256="09v3k8d43lqywdq3ckjwid8hrkakdc9ysxdlqq00blzab40a8ii4"; depends=[Rcpp Rcpp RcppEigen]; };
+Rvcg = derive { name="Rvcg"; version="0.11"; sha256="0id732zhncy6x47qdbyddcm3f8l1r4j53ya4qj3zcf81q15dadw0"; depends=[Rcpp Rcpp RcppEigen]; };
 Rvmmin = derive { name="Rvmmin"; version="2013-11.12"; sha256="1ljzydvizbbv0jv5lbfinypkixfy7zsvplisb866f8w45amd152a"; depends=[optextras]; };
 Rwave = derive { name="Rwave"; version="2.2"; sha256="1aqscnq7cr53nnddbjdqfjyrj8l76h9wcqr43i7fpa7g6hamvbwd"; depends=[]; };
 Rwinsteps = derive { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
 RxCEcolInf = derive { name="RxCEcolInf"; version="0.1-3"; sha256="04d6ffl4qs2vjbk0ibvyq17i2l26qnvxr72s6p3f8q4px33rh4kh"; depends=[MASS MCMCpack mvtnorm lattice]; };
-RxnSim = derive { name="RxnSim"; version="1.0"; sha256="0693kl58jipgnsdrh9rim5w6mb3b4wvxh7glzy1ahnxv648brlwz"; depends=[rJava fingerprint rcdk]; };
+RxnSim = derive { name="RxnSim"; version="1.0.1"; sha256="17agz3kw7pj4mpl25y1n8l9lqfj63wn70rqpdkcpnx7j6s6933vx"; depends=[rJava fingerprint data_table rcdk]; };
 Ryacas = derive { name="Ryacas"; version="0.2-12.1"; sha256="18dpnr6kj0a8f2jcbj9f6ahd0mg7bm1qm8dcs1wh8kmjl3klr1y8"; depends=[XML]; };
 Rz = derive { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign memisc psych ggplot2 RGtk2 formatR]; };
 SAENET = derive { name="SAENET"; version="1.0"; sha256="0mnzv1a3xmbf4w9mgsi2kf20kyhcsadaih63wb0zvraqv5ijdd31"; depends=[autoencoder neuralnet]; };
 SAFD = derive { name="SAFD"; version="0.4"; sha256="1zbja8bgva2j24ks4m14hbf4s0n674lj89nfxkkmwrljzsmjrjhv"; depends=[]; };
 SAM = derive { name="SAM"; version="1.0.5"; sha256="1fki43bp6kan6ls2rd6vrp1mcwvz92wzcr7x6sjirbmr03smcypr"; depends=[]; };
+SAMUR = derive { name="SAMUR"; version="0.6"; sha256="0iyv7ljjrgakgdmpylcxk3m3xbm2xwc6lbjvl7sk1pmxvpx3hhhc"; depends=[Matching]; };
 SAMURAI = derive { name="SAMURAI"; version="1.2.1"; sha256="02fipbjcsbp2b2957x6183z20icv1yly2pd1747nyww9bmpa7ycm"; depends=[metafor]; };
 SAPP = derive { name="SAPP"; version="1.0.4"; sha256="0a86vz390v2g5lz1r33qrmhgvak4rpfmpxy39shnivhagnrsarkl"; depends=[]; };
 SASPECT = derive { name="SASPECT"; version="0.1-1"; sha256="1d3yqxg76h9y485pl5mvlx6ls1076f80b320yvx4zxmqq9yxmaba"; depends=[]; };
@@ -1882,7 +1909,9 @@ SOAR = derive { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g1
 SOD = derive { name="SOD"; version="1.0"; sha256="0f0rh1qsjzxb3zzr440kvl6fnnj7dvc5apdzs5hpf6xrlfg863pk"; depends=[Rcpp Rcpp]; };
 SODC = derive { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic ppls psych MASS]; };
 SOLOMON = derive { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; };
+SOMbrero = derive { name="SOMbrero"; version="1.0"; sha256="10d2fakjkfk3p4dfh0cw1sp7i95f7lqdvz8b7x7sc5pg82dpffy7"; depends=[knitr igraph wordcloud scatterplot3d RColorBrewer shiny]; };
 SOR = derive { name="SOR"; version="0.22"; sha256="1njwlsvdnwxidvwrx18h6h4dhrsdgy0fikkhn20pip42qqwd96gz"; depends=[Matrix]; };
+SOUP = derive { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; };
 SPA3G = derive { name="SPA3G"; version="1.0"; sha256="15f38imwqn1zifym2821q7xysvws9vhlif4g16w0pnvk0wlhyb92"; depends=[]; };
 SPACECAP = derive { name="SPACECAP"; version="1.1.0"; sha256="11szdq7sqr8ldwz7apbf1dv5mh43rbyb7dkivms58s5623xrq3sm"; depends=[coda]; };
 SPARQL = derive { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[XML RCurl]; };
@@ -1895,6 +1924,7 @@ SPMS = derive { name="SPMS"; version="2.0"; sha256="150kb4gjiksp3kc7p9j5zqc4955r
 SPODT = derive { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
 SPOT = derive { name="SPOT"; version="1.0.4184"; sha256="0rikfs2rha7q2xbycvky8si2ccgmamcn662g8ni105cr6m9hvvpc"; depends=[rpart emoa]; };
 SPREDA = derive { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[survival nlme]; };
+SPRT = derive { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
 SPSL = derive { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
 SPmlficmcm = derive { name="SPmlficmcm"; version="1.3"; sha256="0igybzc6fx6yd8xq06909vml4zwwzm4sl5xpds1292lgv3y3zdgb"; depends=[nleqslv]; };
 SQDA = derive { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[PDSCE mvtnorm]; };
@@ -1913,6 +1943,7 @@ SUE = derive { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjn
 SVMMaj = derive { name="SVMMaj"; version="0.2-2"; sha256="01njc7drq01r3364081dv9gn37vrql52zbrb60gd559f3jshqx3m"; depends=[kernlab MASS]; };
 SVMMatch = derive { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp Rcpp RcppArmadillo]; };
 SWATmodel = derive { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
+SWMPr = derive { name="SWMPr"; version="2.0.0"; sha256="1gnjz5p76xpw4rpish4d7vr3r9f880mw5fb27bnc6b408vy0781d"; depends=[ggplot2 zoo data_table httr ggmap gridExtra maptools oce dplyr reshape2 tictoc tidyr wq XML]; };
 SYNCSA = derive { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[vegan mice FD]; };
 Sabermetrics = derive { name="Sabermetrics"; version="1.0"; sha256="1x35h1ffy6jnsak13vb1kcsbmh3hpass19gqic8grk0c3g1dvv6y"; depends=[]; };
 Sample_Size = derive { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
@@ -1933,7 +1964,7 @@ Sejong = derive { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6d
 SeleMix = derive { name="SeleMix"; version="0.9.1"; sha256="04gxgja35qs4k66iil014dzgl5bkx0qhr9w4v7qpmwv2bb07jwz3"; depends=[mvtnorm Ecdat xtable]; };
 SelvarMix = derive { name="SelvarMix"; version="1.0"; sha256="0yysmf854xz5l0lf2x0hw0qxbrdhgfrcx5ggw8n4pjfv553p38ni"; depends=[Rcpp glasso Rmixmod Rcpp RcppArmadillo]; };
 SemiCompRisks = derive { name="SemiCompRisks"; version="2.0"; sha256="0in3pv66nhb0ar4xfxskvf24c7bqkr9ik069a4nynwnc3idpsq32"; depends=[]; };
-SemiMarkov = derive { name="SemiMarkov"; version="1.4"; sha256="0z43ynkd6wrxrfdbq01jiwyvw2shc3r3pmircnzkbwm2sffd3515"; depends=[numDeriv MASS Rsolnp]; };
+SemiMarkov = derive { name="SemiMarkov"; version="1.4.1"; sha256="048hmbcmhqkvqw8nbzm0136mc9w7b27jy8q9r3rvc3banh854d1m"; depends=[numDeriv MASS Rsolnp]; };
 SemiPar = derive { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[MASS cluster nlme]; };
 SemiParBIVProbit = derive { name="SemiParBIVProbit"; version="3.3"; sha256="12zjpyl79kx750xgra06zbw5vnaq8mis39cm8672w3d9giy2fxr5"; depends=[mgcv mvtnorm magic VineCopula VGAM survey trust Matrix sn]; };
 SemiParSampleSel = derive { name="SemiParSampleSel"; version="1.2"; sha256="1k9xmby8hy4k0qn7pjj0rypxj4iqb206ixv92bz7ga0q8zd0nxbr"; depends=[copula mgcv mvtnorm gamlss_dist magic trust VGAM Matrix]; };
@@ -2005,11 +2036,12 @@ Stat2Data = derive { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9
 StatDA = derive { name="StatDA"; version="1.6.7"; sha256="140hqg56axwg5ckfr4n4rr453ppsgf5bmmd7kg4mai1xnj4wmg8b"; depends=[geoR sgeostat cluster e1071 MASS MBA mgcv rgl robustbase xtable]; };
 StatDataML = derive { name="StatDataML"; version="1.0-25"; sha256="05s9kbrjl2wsfccgav34b02m06q62r3iyjd0ndr6xcqlw9x2w2ya"; depends=[XML]; };
 StatMatch = derive { name="StatMatch"; version="1.2.3"; sha256="10y9xaclxrw65v3k9qwdm7lvvf1kxpssc9nx0f15m8xkw5hhm7pa"; depends=[proxy clue survey RANN lpSolve]; };
+StatMeasures = derive { name="StatMeasures"; version="1.0"; sha256="1bnbz803xx8kqhy1cx545b35si6f10za0mp5z82qfvd4kv9a9izz"; depends=[data_table]; };
 StatMethRank = derive { name="StatMethRank"; version="1.0"; sha256="0mcvwn1f3hylvyg46vigc5wnvhhig5v01ag3y9rap32v85f308zh"; depends=[MASS rjags pmr]; };
 StatRank = derive { name="StatRank"; version="0.0.4"; sha256="0s0jc4hvrry9a884fqfk3gp1w4ww5wif2kh3m0f22nn7qb49if9p"; depends=[truncdist plyr]; };
 Statomica = derive { name="Statomica"; version="1.0"; sha256="0x60n1d7wxfd013k6jjzvfi2mqgr52fd8ylk3yhm3907002jnh1g"; depends=[distr fBasics]; };
 Stem = derive { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[mvtnorm MASS]; };
-StereoMorph = derive { name="StereoMorph"; version="1.3"; sha256="07hpz31npl2xihqb7a3cjscp0ch6hia9p42bx8y2spv1rrcn8vvw"; depends=[bezier rjson shiny Rcpp jpeg Rcpp]; };
+StereoMorph = derive { name="StereoMorph"; version="1.4"; sha256="0xar1vx05q6dbfs9jmdbj7cz6jfrckhd8cm2ml922xg4zxrg23cf"; depends=[bezier rjson shiny Rcpp jpeg tiff png Rcpp]; };
 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]; };
@@ -2021,7 +2053,7 @@ Sunder = derive { name="Sunder"; version="0.0.4"; sha256="1na41nnscyc4v1qbwzfgqk
 SunterSampling = derive { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
 SuperLearner = derive { name="SuperLearner"; version="2.0-15"; sha256="1sk45419awk8aahylmqbardx8lglx0d7hrwc0k2prnksk5r3549l"; depends=[nnls]; };
 SuppDists = derive { name="SuppDists"; version="1.1-9.1"; sha256="1jqsv1lzjblc7sdb4gh8pkww9ar174bpbjl7mmdi59fixymwz87s"; depends=[]; };
-Surrogate = derive { name="Surrogate"; version="0.1-4"; sha256="0wvicdd7lxczxv4hdbdn8cnv5k36biix65r4byn4cpgqhkyy78k6"; depends=[MASS nlme msm lme4]; };
+Surrogate = derive { name="Surrogate"; version="0.1-5"; sha256="0g66yzbirkxs6f69zbfaw61ki25qgdxwkd3zhmymmgxhbix77n11"; depends=[MASS nlme msm lme4 rgl lattice latticeExtra]; };
 SurvCorr = derive { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[survival fields]; };
 SurvLong = derive { name="SurvLong"; version="1.0"; sha256="000ywg0sdk9kailiy7ckhq4mkaawl9hh88w6apj5khgpxsyj8aw3"; depends=[]; };
 SurvRegCensCov = derive { name="SurvRegCensCov"; version="1.3"; sha256="1sl17x984ww07aakz6dambn5kznw4hvj4b8ahy2r4mr6wf2dpg5a"; depends=[survival numDeriv]; };
@@ -2033,7 +2065,7 @@ SyNet = derive { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfm
 SynchWave = derive { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
 SynergizeR = derive { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RJSONIO RCurl]; };
 Synth = derive { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
-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]; };
+TAM = derive { name="TAM"; version="1.6-0"; sha256="0wca6ry29k422q8x4qwpd9myc6xnd2p2z05dqlmb2gwzgbj3wcbk"; depends=[CDM MASS Rcpp mirt lavaan WrightMap tensor sfsmisc GPArotation psych mvtnorm msm lattice plyr Rcpp RcppArmadillo]; };
 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]; };
@@ -2048,7 +2080,7 @@ TEQR = derive { name="TEQR"; version="5.0-0"; sha256="04r26qzps7nnvs4s2xpvjf6q45
 TERAplusB = derive { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; };
 TESS = derive { name="TESS"; version="1.2.1"; sha256="15wrbbhrzj66j0z6xhnbf560qg0dzm1yqfbpmx070n3lsa2rdyij"; depends=[ape coda deSolve]; };
 TExPosition = derive { name="TExPosition"; version="2.6.10"; sha256="12rgijlclaipwjjiyng7nwilzixdy6lsvncigcg0vjydhgk97jn1"; depends=[prettyGraphs ExPosition]; };
-TFDEA = derive { name="TFDEA"; version="0.9.8"; sha256="099gzjpsavrhki8walzjv2x4qy2da0spf2zbac7lcbfcww6sv4bh"; depends=[lpSolveAPI]; };
+TFDEA = derive { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; };
 TFMPvalue = derive { name="TFMPvalue"; version="0.0.5"; sha256="13bfcwfiyl61cv2ma23fcmv2cvbsyzdbg2pl6l6zg39l6scxf9na"; depends=[Rcpp Rcpp]; };
 TFX = derive { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
 TH_data = derive { name="TH.data"; version="1.0-6"; sha256="1kx6z8lj1l2vxi7vhx47sly65grjkm3wvrbr3nl52q1vdmy1xsgm"; depends=[]; };
@@ -2056,9 +2088,10 @@ TIMP = derive { name="TIMP"; version="1.12.1"; sha256="06zjpa9j4sr62f2lspa75i7n8
 TInPosition = derive { name="TInPosition"; version="0.13.6"; sha256="1cxxrfpbiyknaivv6gyp79lz0rxwhrndcd054smksxq8zcfz0v7c"; depends=[prettyGraphs TExPosition ExPosition InPosition]; };
 TKF = derive { name="TKF"; version="0.0.3"; sha256="0kdrza02nn4vkfpc5kwpywls24adhj3kywa5w83v4wpx8dmmh10z"; depends=[expm numDeriv]; };
 TPmsm = derive { name="TPmsm"; version="1.2.0"; sha256="1670b9g6sqlg5xk76x77cph1wzp44yp957sn8px5k7kkb1hgi0pl"; depends=[KernSmooth]; };
-TR8 = derive { name="TR8"; version="0.9.12"; sha256="0sry52a98ba07j78d1niaysb7cq5ms4grxbz5pncw1g13w6i2505"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk]; };
+TR8 = derive { name="TR8"; version="0.9.13"; sha256="07wrqwa5gf1l1y3b07mganr5xkzxdzrh6lrv7gf01m9b7bsz564m"; depends=[RCurl XML taxize plyr rappdirs gWidgets gWidgetstcltk gdata]; };
 TRAMPR = derive { name="TRAMPR"; version="1.0-7"; sha256="135ylhijhpdxpznfdbdzwfsvy8bhw1yx28c3520a3lyrqvinpawg"; depends=[]; };
 TRD = derive { name="TRD"; version="1.0"; sha256="1xj3ns9phiz4i70ky2p1q1cr3h6iq2i3dywnap6gqaq0fqmiq2fh"; depends=[Rlab]; };
+TROM = derive { name="TROM"; version="1.0"; sha256="1pr5n6bgjrn60f95395p2x8c2h1q3sx6a7448m0xi0a51wa016xp"; depends=[lattice openxlsx gtools RColorBrewer gplots]; };
 TRSbook = derive { name="TRSbook"; version="1.0.1"; sha256="1w2yl5pchw2vn9l3qnm1ra9mjy946i5xsxh5n5xdvrcj2kak50x5"; depends=[xtable RColorBrewer gdata IndependenceTests]; };
 TSA = derive { name="TSA"; version="1.01"; sha256="0cm97hwxm6vfgy9mc3kgwq6dnmn86p8a4avnfjbai048qnwrn6hx"; depends=[leaps locfit mgcv tseries]; };
 TSEN = derive { name="TSEN"; version="1.0"; sha256="1pn313g2ylbjc37rqcakd797vffnh7v0rgg1xl5wjyvcgmm5mxix"; depends=[ncdf]; };
@@ -2066,13 +2099,14 @@ TSHRC = derive { name="TSHRC"; version="0.1-3"; sha256="18ygg7bqwg1pdqi52l1lf33g
 TSMySQL = derive { name="TSMySQL"; version="2013.9-1"; sha256="1ls3mpp5xq707vgv8l14cfbw1vn4ygy4d9n19nw5mnl3izz4p0pk"; depends=[TSdbi RMySQL DBI tframe TSsql]; };
 TSP = derive { name="TSP"; version="1.1-0"; sha256="0d38n6z531jcg34q39fv0qsmccjbx5yil14fw5pmvyympyjsf5kq"; depends=[foreach]; };
 TSPostgreSQL = derive { name="TSPostgreSQL"; version="2013.9-1"; sha256="0ihfz0q1faxb7mk4jm10czfb9fz168x4z8890vql98djsxzjxpz4"; depends=[TSdbi RPostgreSQL DBI tframe tframePlus TSsql]; };
+TSPred = derive { name="TSPred"; version="2.0"; sha256="0p4msk12n8jc1ss8p7m15rxd0ip7v83c5p78v26nk5dz21a4xprp"; depends=[forecast]; };
 TSSQLite = derive { name="TSSQLite"; version="2013.9-1"; sha256="0yw5whn95dvv3wbwmlhfgkapwp66nk94fjfl1r8irbqvrscmjin0"; depends=[TSdbi RSQLite DBI tframe tframePlus TSsql]; };
 TSTutorial = derive { name="TSTutorial"; version="1.2.3"; sha256="0hpk6k3lc72p8pdz5aad04lcjsz9k443h5gs09dc3i10wqw3yhxs"; depends=[MASS]; };
 TSclust = derive { name="TSclust"; version="1.2.3"; sha256="0m04svw4z2rhvzyckn8l4pg4rmwfn8xlzd9k839c47ldbzgb4z6l"; depends=[wmtsa pdc cluster locpol KernSmooth dtw longitudinalData]; };
 TScompare = derive { name="TScompare"; version="2013.9-1"; sha256="1gghr7xsg524sc9lhy1ymlhigaz6pi69fnccgn784ff2hl3w6d8w"; depends=[TSdbi tframe tfplot]; };
 TSdata = derive { name="TSdata"; version="2013.9-1"; sha256="1r3x6w17517if2jpcz2mr8jk5i080dkx4nlffblrcsxjhfvlz0xh"; depends=[]; };
 TSdbi = derive { name="TSdbi"; version="2013.9-1"; sha256="12v9dv7hrq626q44v3lws950m241fq5fsfsnmgvfbbyya5ixis86"; depends=[DBI tframe]; };
-TSdist = derive { name="TSdist"; version="1.2"; sha256="103wv6wy5gjim2cf14d6afinyla85p6dncchi17fr0s4vqkmx3m5"; depends=[proxy zoo xts]; };
+TSdist = derive { name="TSdist"; version="2.2"; sha256="1zqqy2pxjzxlj1d32d086qrkf9rlgj9vn9smzbcfix8wlgvxfi1l"; depends=[proxy zoo xts dtw TSclust KernSmooth locpol pdc longitudinalData cluster]; };
 TSfame = derive { name="TSfame"; version="2013.8-2"; sha256="19awl7jrx97y93wsms3h87w8qdgpdrkbbpsjsa2aqsnyq5vgy82l"; depends=[TSdbi DBI tframe tframePlus fame tis]; };
 TSgetSymbol = derive { name="TSgetSymbol"; version="2013.9-1"; sha256="1hn78xrfdnwhjrgcnn71ihvdgv4qwdxhpjwcqp0pbkgbxj3q5w3k"; depends=[TSdbi quantmod DBI zoo tframe tframePlus]; };
 TShistQuote = derive { name="TShistQuote"; version="2013.9-1"; sha256="06din7frxmbk4qxkpv0z5srh8nh0wkmrfl9lz17y7cwsmldl4hvr"; depends=[TSdbi DBI tframe tframePlus zoo tseries]; };
@@ -2096,6 +2130,7 @@ TeachingDemos = derive { name="TeachingDemos"; version="2.9"; sha256="160xch4812
 TeachingSampling = derive { name="TeachingSampling"; version="3.2.1"; sha256="1diw8qz6yi3g7d1ysklrvxwbzda9ybi039yr6agzw0w0b2b59jj4"; depends=[]; };
 TestScorer = derive { name="TestScorer"; version="1.6"; sha256="11125i0dwh961q5xbg57lli5bzzls3y482iw5f0qwalwkppk7sv0"; depends=[]; };
 TestSurvRec = derive { name="TestSurvRec"; version="1.2.1"; sha256="05f5gc8hvz09hx015jzis6ikki9c1brdq7l7a9bxm9bqbcc9f2f9"; depends=[survrec boot]; };
+Thermimage = derive { name="Thermimage"; version="1.0.1"; sha256="16wpmwqfqjghhp4g5wpmgzf0ii2aa0gawcq74rfn4frfizzdy0ad"; depends=[]; };
 Thinknum = derive { name="Thinknum"; version="1.3.0"; sha256="0j48vgr4wsc2chm95aprq0xm0dk720xk5zmiijxasg92sfp0va6n"; depends=[RCurl RJSONIO]; };
 ThreeArmedTrials = derive { name="ThreeArmedTrials"; version="0.1-0"; sha256="1pafm8k90yv0hrk5a9adfv37087l2in0psslhkxha6mkmdh6a5f6"; depends=[MASS]; };
 ThreeWay = derive { name="ThreeWay"; version="1.1.2"; sha256="1vf71im3bs2b2v05j12l8qn181kah0mch4h13n71zqik1ykly6jf"; depends=[]; };
@@ -2105,7 +2140,7 @@ Tides = derive { name="Tides"; version="1.1"; sha256="0w2xjnw2zv4s49kvzbnfvy30mf
 TilePlot = derive { name="TilePlot"; version="1.3.1"; sha256="0yfzjyzc743rv5piw9mb7y0rr558hkxszgz49lya2w3i1mqvxbzy"; depends=[]; };
 TimeMachine = derive { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
 TimeProjection = derive { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate timeDate Matrix]; };
-TimeWarp = derive { name="TimeWarp"; version="1.0.11"; sha256="0asp6in55973kbazlwwc0b6vrgbxq5hgj6v5apzk4xnpdd53yl8g"; depends=[]; };
+TimeWarp = derive { name="TimeWarp"; version="1.0.12"; sha256="1qadaf8n8ym5nv1z328hd5wiw78f014imgd2ryvi70sh4dmzb16l"; depends=[]; };
 Tinflex = derive { name="Tinflex"; version="1.0"; sha256="0zvh2nfx4kqf90mmrpdm2fzlzn7s7gs09i8zin604hqxjir6p3ny"; depends=[]; };
 TopKLists = derive { name="TopKLists"; version="1.0.3"; sha256="0687nxsddmlgyz3kwcfmcv0vj2pw91154rd1p19ivhmbvhvnhwvh"; depends=[Hmisc gplots]; };
 TraMineR = derive { name="TraMineR"; version="1.8-9"; sha256="0qawgjifz6w7gb06j9q5kbvhf8pn17922mvmgwzva5mykvqfmdic"; depends=[RColorBrewer boot]; };
@@ -2115,7 +2150,7 @@ TreatmentSelection = derive { name="TreatmentSelection"; version="1.1.2"; sha256
 TreePar = derive { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape Matrix subplex TreeSim deSolve]; };
 TreeSim = derive { name="TreeSim"; version="2.1"; sha256="01izfzlvrak65mzwpz4bn5cansw10fvfjfvj164f5g0qghg9v84n"; depends=[ape geiger laser]; };
 TreeSimGM = derive { name="TreeSimGM"; version="1.2"; sha256="0y6hadwx3apw11jy5d4al3dav3his8b4xvkv7s5d5rd92l7yrw0r"; depends=[TreeSim]; };
-TriMatch = derive { name="TriMatch"; version="0.9.1"; sha256="1207lnysdjd347m1lsbxy19lq73bjs1irqwk94y8idp1pcj4pfpd"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics]; };
+TriMatch = derive { name="TriMatch"; version="0.9.4"; sha256="008mi58sv82ykvwzil229z3zq3addyn3bik0xzfajcx4h7sdmsfg"; depends=[ggplot2 scales reshape2 ez psych PSAgraphics gridExtra]; };
 TrialSize = derive { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; };
 TripleR = derive { name="TripleR"; version="1.4"; sha256="1hzfdip9n390cizk329k6bdpz1vkxj76khc8lxm0yx9jbc50ng6d"; depends=[ggplot2 reshape2 plyr]; };
 Tsphere = derive { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; };
@@ -2125,7 +2160,7 @@ TurtleGraphics = derive { name="TurtleGraphics"; version="1.0-5"; sha256="18azwb
 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=[]; };
-UNF = derive { name="UNF"; version="2.0"; sha256="0pdk43d6cspmh1p7172fzr7082yqjk7gxq6n4a59388amwgdg0f2"; depends=[base64enc digest]; };
+UNF = derive { name="UNF"; version="2.0.1"; sha256="1gnzj7lxfp0x5f2ws9aclzaq75gbmsqhjqi02llmihf05gq0kp23"; depends=[base64enc digest]; };
 UPMASK = derive { name="UPMASK"; version="1.0"; sha256="19krsqkz2g5b6svqp29s6i92bhlk7liv8lf7d03za848w7y2jkhq"; depends=[MASS RSQLite DBI]; };
 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]; };
@@ -2135,7 +2170,7 @@ UScensus2010 = derive { name="UScensus2010"; version="0.11"; sha256="1q06spkh8f4
 UWHAM = derive { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; };
 Unicode = derive { name="Unicode"; version="0.1-5"; sha256="088f38qy3vympxj6n4vyvvqd4gldcfli9l8rmzgmm1rm3v195mvn"; depends=[]; };
 UsingR = derive { name="UsingR"; version="2.0-4"; sha256="0wj6cn9ijc0rkpxsy1fd104m254b997dhmvwzz0knjkh5nybm8zm"; depends=[MASS HistData Hmisc]; };
-V8 = derive { name="V8"; version="0.5"; sha256="0qyrf8p9mvzzccq9gb7f1zh0902p90rqnxj7w8ky5f9fgs7dj0c5"; depends=[Rcpp jsonlite curl Rcpp]; };
+V8 = derive { name="V8"; version="0.6"; sha256="1cr9nm5wvi3b2766fpdgihnfmn1ckrwrzyya6dchvg2lr3giba38"; depends=[Rcpp jsonlite curl Rcpp]; };
 VAR_etp = derive { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
 VBLPCM = derive { name="VBLPCM"; version="2.4.3"; sha256="0aibjkqlc8l3f17m52ifb25s639gkydvgdj2gkijk5mk0g681qdj"; depends=[ergm sna mclust]; };
 VBmix = derive { name="VBmix"; version="0.2.17"; sha256="0fhx2vk5ffq147kfgsqjbqwgv64m7z9mbz4gchj90440ih7kyxa5"; depends=[lattice pixmap mnormt]; };
@@ -2144,6 +2179,7 @@ VGAM = derive { name="VGAM"; version="0.9-7"; sha256="0477y0flxzvw06qi5dk1ky8s19
 VGAMdata = derive { name="VGAMdata"; version="0.9-7"; sha256="0fkm90nbmj0gjzxmh54qbf90alcbaiz27rs0zc0i5jhh2cv716y6"; depends=[]; };
 VHDClassification = derive { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; };
 VIF = derive { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; };
+VIFCP = derive { name="VIFCP"; version="1.0"; sha256="19jpwhbw5ml46ic8mzkl0ll7qaa0slw608c790dpbch8hx1r5i7s"; depends=[]; };
 VIM = derive { name="VIM"; version="4.1.0"; sha256="15nmywg8mhknvivg9bfszif2allim5vf1hjfbfyl053jphjpax26"; depends=[colorspace data_table car robustbase sp vcd MASS nnet e1071 Rcpp Rcpp]; };
 VIMGUI = derive { name="VIMGUI"; version="0.9.0"; sha256="195lakyik597sjkq6c5v3881p35111gzmj2r5f5nr53vi6bn4pzm"; depends=[tkrplot VIM survey gWidgetsRGtk2 foreign RGtk2 Cairo Hmisc]; };
 VLF = derive { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; };
@@ -2156,7 +2192,7 @@ VarSelLCM = derive { name="VarSelLCM"; version="1.0"; sha256="1i0s4kdqgfh79bk5ip
 VarSwapPrice = derive { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
 VariABEL = derive { name="VariABEL"; version="0.9-2"; sha256="0vlr6zxl75i49p35jxrc5fwfrb55n91hqdan2ikcix3r2k4qs5k0"; depends=[]; };
 VarianceGamma = derive { name="VarianceGamma"; version="0.3-1"; sha256="0h424hdphbgi9i84bgzdwmsq05w61q8300x8f9y4szbxa5k2dnar"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
-VdgRsm = derive { name="VdgRsm"; version="1.4"; sha256="1qbfx1zql8bjmh5ygjkdrk1hcpvyznwbp0mv750vd1ppaw5ddn9h"; depends=[permute AlgDesign]; };
+VdgRsm = derive { name="VdgRsm"; version="1.5"; sha256="13mbv3ih6p2915wdzq4zjx7m4k37w1xddkxx6dzk1jiak2br9slj"; depends=[permute AlgDesign]; };
 Vdgraph = derive { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; };
 VecStatGraphs2D = derive { name="VecStatGraphs2D"; version="1.7"; sha256="08f9ixpiq8s5h8h608wrs9l16xk3c1xcrvwgvm5wqm6xfkj9gpfd"; depends=[MASS]; };
 VecStatGraphs3D = derive { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[rgl misc3d MASS]; };
@@ -2172,7 +2208,7 @@ WARN = derive { name="WARN"; version="1.1"; sha256="0rnzsc8vbm116g4cwdivmxqv1zyg
 WCE = derive { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
 WCQ = derive { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
 WDI = derive { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
-WGCNA = derive { name="WGCNA"; version="1.43"; sha256="1za7qw6yvmw7kpf9qxlwxjp4cfb7varnav7jypi1i6pi6zwi2869"; depends=[dynamicTreeCut fastcluster matrixStats Hmisc foreach doParallel reshape survival]; };
+WGCNA = derive { name="WGCNA"; version="1.46"; sha256="0amrj6bm4rdr9db57a7qqkh0wk8f9vkvpc3jag9dhwvxfwnrn378"; depends=[dynamicTreeCut fastcluster matrixStats Hmisc foreach doParallel reshape survival]; };
 WMCapacity = derive { name="WMCapacity"; version="0.9.6.6"; sha256="19x6l06srh59q1cnixisa5fgm5hkpq35h9zfmdnfaj3xl8pxhzyn"; depends=[gtools gWidgets gWidgetsRGtk2 coda cairoDevice RGtk2 XML]; };
 WMDB = derive { name="WMDB"; version="1.0"; sha256="10wdjy3g2qg975yf1dhy09w9b8rs3w6iszhbzqx9igfqvi8isrr1"; depends=[]; };
 WRS2 = derive { name="WRS2"; version="0.3-1"; sha256="11i9zv7p7808v3hvnhjn58yl7mwh26zhis6hh9n73dw3hn22xdng"; depends=[MASS reshape plyr]; };
@@ -2248,14 +2284,15 @@ adaptivetau = derive { name="adaptivetau"; version="2.2"; sha256="1xqvbbdmn70fmy
 adaptsmoFMRI = derive { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[Matrix coda mvtnorm MCMCpack spatstat]; };
 additivityTests = derive { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
 addreg = derive { name="addreg"; version="1.2"; sha256="1xgf9q0z3prvchyba1vaai6ij72nzvj2dqyr6y2wzb96jfqv19kl"; depends=[combinat glm2]; };
-ade4 = derive { name="ade4"; version="1.6-2"; sha256="0h136nhfqrapwscm3c7frlcynrfxb9x8gmd1s44gaa8m25rjgdqf"; depends=[]; };
+ade4 = derive { name="ade4"; version="1.7-2"; sha256="01pchn70jpz8v9l86ng34a2vgn3pv4v5iwxz5n39f685p9lkc2nn"; depends=[]; };
 ade4TkGUI = derive { name="ade4TkGUI"; version="0.2-6"; sha256="010ggsxcmljh0cdba4lcfnsd9r49pwqs6kbw88syfn2qv65hh5kq"; depends=[ade4]; };
 adegenet = derive { name="adegenet"; version="1.4-2"; sha256="13fglxy40rnwi5hsmmvwlfcvfn8dybxyy3k5qhpml8jgpbl3fsdb"; depends=[ade4 MASS igraph ape shiny ggplot2]; };
-adehabitat = derive { name="adehabitat"; version="1.8.15"; sha256="0fzswrypa8iwqqmbg3q08rk617ihf44l2dcrn91mdxqpzaw4nhnf"; depends=[ade4 tkrplot shapefiles sp]; };
-adehabitatHR = derive { name="adehabitatHR"; version="0.4.12"; sha256="112kz9cby0p7ayarwdwx5lg3dykkrdvpsc3na79xksadry3mykgj"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; };
-adehabitatHS = derive { name="adehabitatHS"; version="0.3.10"; sha256="12zwriw6dda50614hb5gx67hbpr9ybv8dms17q62f4x09rr6iap5"; depends=[sp ade4 adehabitatMA adehabitatHR]; };
-adehabitatLT = derive { name="adehabitatLT"; version="0.3.17"; sha256="193wsg4pxj6zb2c8wd2m365j0x5zglyfn1hk1fd8qb1b241ba1nj"; depends=[sp ade4 adehabitatMA CircStats]; };
-adehabitatMA = derive { name="adehabitatMA"; version="0.3.8"; sha256="1j3ngry7qyhl4p5m02bgdynixb0v9hd5nbjs6ndfqw23layh8yig"; depends=[sp]; };
+adegraphics = derive { name="adegraphics"; version="1.0-1"; sha256="1gj7x43n0x24gaq4lhdhgdzmflv5dyvcjak82m5qmbxn34pasrv9"; depends=[ade4 KernSmooth lattice RColorBrewer sp]; };
+adehabitat = derive { name="adehabitat"; version="1.8.17"; sha256="0cy98fd6mcbjc152vv41mnh5xj19xdfag8n950fvffbrpvpgbcpb"; depends=[ade4 tkrplot shapefiles sp]; };
+adehabitatHR = derive { name="adehabitatHR"; version="0.4.13"; sha256="140ar1naf67v996d5p0i2v07g02pf9c4c6h1pjicai5n59s7z72v"; depends=[sp deldir ade4 adehabitatMA adehabitatLT]; };
+adehabitatHS = derive { name="adehabitatHS"; version="0.3.11"; sha256="0sbhc1mvdc8pxq56plbgk0ry65chxcv3zjry4151hiv7yxpn39ri"; depends=[sp ade4 adehabitatMA adehabitatHR]; };
+adehabitatLT = derive { name="adehabitatLT"; version="0.3.19"; sha256="0h9n6j3a52bik5pslysvhb11d8df5k50ghi34zlxhdcbm09gfnmz"; depends=[sp ade4 adehabitatMA CircStats]; };
+adehabitatMA = derive { name="adehabitatMA"; version="0.3.9"; sha256="15n9mg8m4mjg5zn5c5hz9bl5qcghzkijiflk8psc0kg2csfpv7hy"; depends=[sp]; };
 adephylo = derive { name="adephylo"; version="1.1-6"; sha256="1sk639gmk3cs711xn68mx18r28kjd1pychcg89qlki03y1hnxg7j"; depends=[ade4 phylobase ape adegenet]; };
 adhoc = derive { name="adhoc"; version="1.0"; sha256="193adddarjkc2kk1xncfkm919s1lkmc1yzgyz9793p74nqmfsj0a"; depends=[spider ape polynom]; };
 adimpro = derive { name="adimpro"; version="0.7.8"; sha256="06zwdgl7g4azg2mn7p35may8hsjcvf2dz7dj86zqngjspda123s4"; depends=[]; };
@@ -2312,9 +2349,10 @@ aods3 = derive { name="aods3"; version="0.4-1"; sha256="074c16wmgd1vc2yvwx1y84bg
 aoos = derive { name="aoos"; version="0.1.0"; sha256="06jnkw8sw77rjag8sqbbp2g60p8vvc3vxl4l4gxzldk400wlkcnq"; depends=[]; };
 aoristic = derive { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[ggplot2 spatstat GISTools lubridate classInt reshape2 rgdal plotKML MASS sp maptools RColorBrewer]; };
 apTreeshape = derive { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
-apc = derive { name="apc"; version="1.0"; sha256="1fhw6cjcqcjwsjswhgm7rgwn3m3d9lkb9mk6cxh04jk3x2j9l3az"; depends=[]; };
+apc = derive { name="apc"; version="1.1"; sha256="0gnjniy7gm5fh4wn7vwml3z5bw6ydd1xxq5npvqljbzy4vhh8k5a"; depends=[]; };
 apcluster = derive { name="apcluster"; version="1.4.1"; sha256="1s7wsgimpln5kiy1ai8clq2r0i6vh8mr5v4xjha9phdbm8l8yfbg"; depends=[Rcpp Matrix Rcpp]; };
 ape = derive { name="ape"; version="3.2"; sha256="015ibyri6r2xdmy644pb1p6xn0rzxaz49sr96859jfvafzi7p2ny"; depends=[nlme lattice]; };
+apex = derive { name="apex"; version="1.0.0"; sha256="1y4y1kji5nvbk0igbv9xjwsjrnz7bsjj23cczydywg9nppsi9df0"; depends=[ape phangorn adegenet]; };
 aplore3 = derive { name="aplore3"; version="0.7"; sha256="1xj3k13wjpsydcrai474b94kyj298islzfpfwn8n51k67h8r4l08"; depends=[]; };
 aplpack = derive { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
 apmsWAPP = derive { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[seqinr gtools]; };
@@ -2338,7 +2376,7 @@ arfima = derive { name="arfima"; version="1.2-7"; sha256="00mc50hssnv7qj6dn1l3jg
 argosfilter = derive { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; };
 argparse = derive { name="argparse"; version="1.0.1"; sha256="03p8dpwc26xz01lfbnmckcx6wzky43dyq71085b0anzsavgx0786"; depends=[proto findpython getopt rjson]; };
 argparser = derive { name="argparser"; version="0.1"; sha256="0x4wm8hjzb779pp39v8q210npg7kzh9m8wwqmd17aaqaa3l2al9f"; depends=[]; };
-arm = derive { name="arm"; version="1.7-07"; sha256="19xshr5r36g9jsyxdm0dihvga89fd080hbhmyhxv1rbv4496jwqa"; depends=[MASS Matrix lme4 abind coda nlme]; };
+arm = derive { name="arm"; version="1.8-4"; sha256="17kg5z8spndn41gak9hx7a8dfdx6yrqbsd30lajkgc23x3sd6j1r"; 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.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_methodsS3 R_oo R_utils R_huge]; };
@@ -2357,7 +2395,8 @@ asd = derive { name="asd"; version="2.0"; sha256="1nnsbh6g0bhvhp6644zf2l6frr3qnl
 ash = derive { name="ash"; version="1.0-14"; sha256="15x16ld25i160asqf4z4difa6zn2yfgl04j8y8nqb0djymdx7a1f"; depends=[]; };
 aspace = derive { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[splancs Hmisc shapefiles]; };
 aspect = derive { name="aspect"; version="1.0-3"; sha256="12wyyr0ms8g3y96jz1x0y52dlma00j20h7hmm8m6y5p1lgk9kmcd"; depends=[]; };
-assertive = derive { name="assertive"; version="0.2-1"; sha256="0bzhwdkw3ryaclaw9lni8zw13037gx7kf6wbmjvkwsl9p0lzv7wp"; depends=[]; };
+assertive = derive { name="assertive"; version="0.2-4"; sha256="0xc561fi322qd5z7ss2zi69nl3i8i56w8bksgd38fpjigg0x9fwl"; depends=[knitr]; };
+assertr = derive { name="assertr"; version="0.4.1"; sha256="1h77iisvyakccm7v1iqva04s1hn197sjcy28832cagqg89qlsg31"; depends=[dplyr]; };
 assertthat = derive { name="assertthat"; version="0.1"; sha256="0dwsqajyglfscqilj843qfqn1ndbqpswa7b4l1d633qjk9d68qqk"; depends=[]; };
 assist = derive { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[nlme lattice]; };
 aster = derive { name="aster"; version="0.8-30"; sha256="0vdlimkkmd9ar5v3xrbi9gshvj980l7641brd7cqs78sqf0v71fn"; depends=[trust]; };
@@ -2405,10 +2444,10 @@ batchmeans = derive { name="batchmeans"; version="1.0-2"; sha256="126q7gyb1namhb
 bayesDccGarch = derive { name="bayesDccGarch"; version="1.0"; sha256="1xgznixi0wdpqbqjacf5viyz69fjd0xbsdgvkgq2d8pjbgp18s0a"; depends=[coda]; };
 bayesDem = derive { name="bayesDem"; version="2.4-1"; sha256="0s2dhy8c90smvaxcng6ixhjm7kvwwz2c4lgplynrggrm8rfb19ay"; depends=[gWidgets gWidgetsRGtk2 bayesTFR bayesLife bayesPop RGtk2 wpp2012]; };
 bayesGARCH = derive { name="bayesGARCH"; version="2.0.1"; sha256="1gz18wjikkg3yf71b1g21cx918dyz89f5m295iv8ah807cdx7vjk"; depends=[mvtnorm coda]; };
-bayesGDS = derive { name="bayesGDS"; version="0.6.0"; sha256="17ihpsh7lqjninprfwbx3v2415s27qybr5c2z4ls43slv8zrv8mz"; depends=[Matrix]; };
+bayesGDS = derive { name="bayesGDS"; version="0.6.1"; sha256="0134x5knwp9pmkjyzgi1k7hjj92sym1p0zq98sizlbs0mff2p2s4"; depends=[Matrix]; };
 bayesLife = derive { name="bayesLife"; version="2.2-0"; sha256="09r915azz60ca5b4w0kkd8x8mb0cxz36lapakdmgrgxd4qax17nv"; depends=[bayesTFR wpp2012 hett car coda]; };
 bayesMCClust = derive { name="bayesMCClust"; version="1.0"; sha256="14cyvcyx3nmkbvsy7n4xjp7zvcgdhy013dv9d72y8j5dvlv82pb4"; depends=[gplots xtable mnormt MASS bayesm boa e1071 gtools]; };
-bayesPop = derive { name="bayesPop"; version="5.2-2"; sha256="1m1vvbipf903s7a5vm7pad3l8ykj74ilrkpyc4ydqzpyqg4k4npj"; depends=[bayesTFR bayesLife abind plyr wpp2012]; };
+bayesPop = derive { name="bayesPop"; version="5.3-4"; sha256="1zq0vjkz4b33niwldli6sh8pgz5wsyzk59iyx5bcdpkbkprv57np"; depends=[bayesTFR bayesLife abind plyr wpp2012]; };
 bayesQR = derive { name="bayesQR"; version="2.2"; sha256="0w5fg7hdwpgs2dg4vzcdsm60wkxgjxhcssw9jzig5qgdjdkm07nm"; depends=[]; };
 bayesSurv = derive { name="bayesSurv"; version="2.4"; sha256="014jxlx4w6lzzq9axdk8mwwlppmly0yj9i14zhmngdbr7mxh3f87"; depends=[survival coda smoothSurv]; };
 bayesTFR = derive { name="bayesTFR"; version="4.1-2"; sha256="17qv25yrprj099vx1jj46ycgxnc4ldx6qcqx42h5gz38qqzz2q4s"; depends=[mvtnorm MASS coda wpp2012]; };
@@ -2430,7 +2469,7 @@ bcpa = derive { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil3
 bcpmeta = derive { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
 bcrm = derive { name="bcrm"; version="0.4.4"; sha256="0gcigc7505fsk1m70df3n0dz553adkbs8yz2bhskb4qrw4gbmvr7"; depends=[mvtnorm ggplot2]; };
 bcv = derive { name="bcv"; version="1.0"; sha256="053if27miv46mbkni6pcpdpz0l336r5l95k7927dqalnri894xwz"; depends=[]; };
-bda = derive { name="bda"; version="3.2.0-3"; sha256="1725qdlkcf7hfklnksy7jslh66cfm7gsil1xgm2rw8hr6v2l0pmx"; depends=[]; };
+bda = derive { name="bda"; version="5.1.3"; sha256="0v2xki9a1j6y42x03a3rrm746xx4qd3ris1m0k7alh25j3ayhs3p"; depends=[]; };
 bde = derive { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[shiny ggplot2]; };
 bdoc = derive { name="bdoc"; version="1.2"; sha256="15d7grc0a1hakkxhgbm2gp0awggzlmsp8zf8abj5bgfih63gcmj2"; depends=[]; };
 bdpv = derive { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
@@ -2447,6 +2486,7 @@ beeswarm = derive { name="beeswarm"; version="0.1.6"; sha256="05n2a1fqmh4m7d0b8v
 benchden = derive { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
 benchmark = derive { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[proto ggplot2 relations psychotools reshape scales plyr]; };
 benford_analysis = derive { name="benford.analysis"; version="0.1.1"; sha256="00ynk1af5nbq8bn8y77sckx4w32g5zxcp06pdpcxwvp38d7hxhvc"; depends=[data_table]; };
+bentcableAR = derive { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; };
 ber = derive { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
 berryFunctions = derive { name="berryFunctions"; version="1.7.1"; sha256="1xpmpbls0vjyi51k7sd1v8s7lp4s1549javcg3yinmvxp9xhwfkx"; depends=[]; };
 bestglm = derive { name="bestglm"; version="0.34"; sha256="0b6lj91v0vww0fy50sqdn99izkxqbhv83y3zkyrrpvdzwia4dg9w"; depends=[leaps]; };
@@ -2482,7 +2522,7 @@ bigrf = derive { name="bigrf"; version="0.1-11"; sha256="0lazi8jk8aapdyyynd5yfcb
 bigrquery = derive { name="bigrquery"; version="0.1.0"; sha256="15ibgi6bqvn0ydq8jx1xhwkwpwwyd7w4f2ams2gpafpysc2f2ks6"; depends=[httr jsonlite assertthat R6 dplyr]; };
 bigsplines = derive { name="bigsplines"; version="1.0-6"; sha256="03gan2wrsi2hfxhn3l05qd0x04x8ymkab9aqpfbfn59m296xhd3m"; depends=[]; };
 bigtabulate = derive { name="bigtabulate"; version="1.1.2"; sha256="0vp873r3gww6kfkjdm87qgcdi85362kq946lvs45ggvyv7iaw0wa"; depends=[bigmemory BH bigmemory]; };
-bild = derive { name="bild"; version="1.1-3"; sha256="02fi3h6mhg2m1ppkcpxpwzjfchkk9h7yv73j0365srr1jxki44pm"; depends=[]; };
+bild = derive { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; };
 bimetallic = derive { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
 binGroup = derive { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; };
 binMto = derive { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
@@ -2508,7 +2548,7 @@ biomod2 = derive { name="biomod2"; version="3.1-64"; sha256="0ymqscsdp5plhnzyl25
 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]; };
-biosignalEMG = derive { name="biosignalEMG"; version="1.0"; sha256="0rvicx851vmlc15s9jzj4vmwq2f3qwlz3j1wjb0i2lznkzwyzxnw"; depends=[]; };
+biosignalEMG = derive { name="biosignalEMG"; version="1.0.2"; sha256="0ywb59w3rgac59gif1jba8qi7rjdsdj7y5czj7kv8lf01vd5dl3l"; depends=[]; };
 biotools = derive { name="biotools"; version="2.0"; sha256="02yw5pfj9858j02yi30bvll5pp67dpkzx3y5ka5bwwz7a5g7dvx3"; depends=[rpanel tkrplot MASS boot]; };
 bipartite = derive { name="bipartite"; version="2.05"; sha256="05w3ypdxy2lfygdlvg9xv88dpsf21i60rsbvvz058zwpfzr39hfh"; depends=[vegan sna fields igraph MASS permute]; };
 biplotbootGUI = derive { name="biplotbootGUI"; version="1.0"; sha256="0pgm31nhh1b78a8ciqjxw7gf3j7hh9wjc3myj29jpl92flbqmsw0"; depends=[rgl tkrplot vegan tcltk2]; };
@@ -2533,6 +2573,7 @@ blockTools = derive { name="blockTools"; version="0.6-2"; sha256="0h04179ybklwbs
 blockcluster = derive { name="blockcluster"; version="3.0.2"; sha256="1qd92lj3ckrj7cvl9zs85igb0974wy5s4zwdnvfyvrsi2bqi3qp8"; depends=[Rcpp Rcpp RcppEigen]; };
 blockmatrix = derive { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
 blockmodeling = derive { name="blockmodeling"; version="0.1.8"; sha256="0x71w1kysj9x6v6vsirq0nndsf6f3wzkf8pbsq3x68sf4cdji1xl"; depends=[]; };
+blockmodels = derive { name="blockmodels"; version="1.0.4"; sha256="0xnnb1knz2x702aqcdxynskp1b85b4x6ik0r2g2jry569clhvxl0"; depends=[Rcpp digest Rcpp RcppArmadillo]; };
 blockrand = derive { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
 blocksdesign = derive { name="blocksdesign"; version="1.5"; sha256="06i8yphfp5g5bhs6s0gl0mb51vdk8idqifv18bkaqlh9qvbrd6rd"; depends=[crossdes]; };
 blowtorch = derive { name="blowtorch"; version="1.0.2"; sha256="0ymhkzfdrfcsq2qc5hbn9i0p58xqf90vwd46960cszxacyzzcnrb"; depends=[ggplot2 foreach iterators]; };
@@ -2560,6 +2601,7 @@ bootSVD = derive { name="bootSVD"; version="0.1"; sha256="1rzwp8kadyc0dg6lscag58
 bootStepAIC = derive { name="bootStepAIC"; version="1.2-0"; sha256="0p6v4zjsaj1p6c678010fazdh40lpv0rvhczd1halj8aic98avdx"; depends=[MASS]; };
 bootnet = derive { name="bootnet"; version="0.1"; sha256="18bx0za81z8za0hswj1qwl7a721xbvfpjz0hsih7glf6n5hn0cyp"; depends=[ggplot2 IsingFit qgraph dplyr gtools corpcor]; };
 bootruin = derive { name="bootruin"; version="1.2-1"; sha256="1ii1fcj8sn9x82w23yfzxkgngrgsncnyrik4gcqn6kv7sl58f4r3"; depends=[]; };
+bootsPLS = derive { name="bootsPLS"; version="1.0.2"; sha256="1d2jn3c74d31rp37qpr8j4rviwg1gmkqppx5pyw0mm37vdajffri"; depends=[mixOmics]; };
 bootspecdens = derive { name="bootspecdens"; version="3.0"; sha256="0hnxhfsc3ac4153lrjlxan8xi4sg1glwb5947ps6pkkyhixm0kc1"; depends=[MASS]; };
 bootstrap = derive { name="bootstrap"; version="2015.2"; sha256="1h068az4sz49ysb0wcas1hfj7jkn13zdmk087scqj5iyqzr459xf"; depends=[]; };
 boottol = derive { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; };
@@ -2567,6 +2609,7 @@ boral = derive { name="boral"; version="0.6"; sha256="0ldd5slj90xsch498brll6sjbl
 boss = derive { name="boss"; version="2.1"; sha256="1knsnf19b1xvvq20pjiv56anbnk0d51aq6z3ikhi8y92ijkzh0y8"; depends=[lme4 geepack Matrix ncdf]; };
 boussinesq = derive { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
 boxplotdbl = derive { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
+boxr = derive { name="boxr"; version="0.2.5"; sha256="03lxdhjajjdpf58c50j1dn4i4bqy8s7h5xgr6m87r7g1v91x23y4"; depends=[httr httpuv assertthat stringr dplyr digest jsonlite]; };
 bpca = derive { name="bpca"; version="1.2-2"; sha256="05ldz6b2s379mymj8jzvia9x6gj047gwsxvnv3zj9x8b1hvndnd6"; depends=[scatterplot3d rgl]; };
 bpcp = derive { name="bpcp"; version="1.2.4"; sha256="06q8zkf7z31ax3pb2xmww3l3axcmhvmgrfri1aikhi7ifgcfc979"; depends=[]; };
 bpkde = derive { name="bpkde"; version="1.0-7"; sha256="1ls6rwmbgb2vzsjn34r87ab8rnz3ls61g6f4x3jpglbk0j91f0h8"; depends=[]; };
@@ -2610,7 +2653,7 @@ calibrate = derive { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k
 calibrator = derive { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[emulator cubature]; };
 calmate = derive { name="calmate"; version="0.12.0"; sha256="1jd1ag1v10bpgkqpf5134av0yc7xph1679q40y541kyr59df0lxw"; depends=[R_utils aroma_core MASS R_methodsS3 R_oo matrixStats R_filesets]; };
 camel = derive { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[lattice igraph MASS Matrix]; };
-cancerTiming = derive { name="cancerTiming"; version="2.0.0"; sha256="0p5hxzhql2rlyx334d8km676va50ql73kxsqjr15q80z7zffyq9d"; depends=[LearnBayes]; };
+cancerTiming = derive { name="cancerTiming"; version="3.0.0"; sha256="1sc5mz2gnrzvkc9kfnspq9vddk48a0a99yyywkwy1vvj0q2dgmyn"; depends=[LearnBayes gplots]; };
 candisc = derive { name="candisc"; version="0.6-5"; sha256="0rbmfyhnyaq1j7sql2sgi47ahrggbb71z2z5pw2gg16kd2f465qk"; depends=[car heplots]; };
 cape = derive { name="cape"; version="1.3"; sha256="1qvjbnxydc16mflg1rmgp2kgljcna8vi88w34cs6k12wpgxmvz1f"; depends=[corpcor evd qpcR Matrix igraph fdrtool shape]; };
 caper = derive { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
@@ -2660,6 +2703,7 @@ censNID = derive { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4
 censReg = derive { name="censReg"; version="0.5-20"; sha256="15k7iq4275dyah3r47vgxsx6g6mr7ma53lkv6d1n89bczzys72kx"; depends=[maxLik glmmML sandwich miscTools]; };
 cents = derive { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; };
 cepp = derive { name="cepp"; version="1.0"; sha256="0lw3qr0vp0qbg2b62abhi1ady1dwig68m4nzqnjnk3lqxzp0fs8f"; depends=[trust randtoolbox]; };
+cernn = derive { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; };
 cfa = derive { name="cfa"; version="0.9-3"; sha256="0pl1mxv6jxn3mvlh75gr8as0daklyr7gkh37fcgmn2bwi973sspy"; depends=[]; };
 cg = derive { name="cg"; version="1.0-2"; sha256="1rgbk4kvjaw4mbqa19hbnhlinqd4bw4fn2znlxr8wfhzj6648cl3"; depends=[Hmisc VGAM MASS lattice survival multcomp nlme]; };
 cgAUC = derive { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp Rcpp]; };
@@ -2680,11 +2724,12 @@ chemometrics = derive { name="chemometrics"; version="1.3.9"; sha256="089zlp4ba6
 chemosensors = derive { name="chemosensors"; version="0.7.8"; sha256="0zphfag0q6zskd301z1dldazzxr2fam6h41cpyivphaxpaljiv0m"; depends=[pls plyr reshape2 ggplot2 LearnBayes quadprog RColorBrewer]; };
 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-8"; sha256="1wvk16maj5i8wla8djbrdk3bdkirq2jz115gg7cpkfyxg5ig4la9"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
+chillR = derive { name="chillR"; version="0.55"; sha256="1b8lp4dfr3366ism7q2pddqpps3zmsyv5xg9rpyyh9yyl9ga1xhy"; depends=[pls Kendall fields]; };
+chipPCR = derive { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
 chngpt = derive { name="chngpt"; version="2014.12-2"; sha256="1bg2hm5clvq1rj1mnj5fasbwmq0xayj327kwclajami4zcwjwqj5"; depends=[kyotil MASS]; };
 choiceDes = derive { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; };
 choplump = derive { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
+chopthin = derive { name="chopthin"; version="0.1"; sha256="1xnyd5mvgqksk7c0mf4irrnshkjgih2h19b55yi4finxh6wrn8l4"; depends=[Rcpp Rcpp]; };
 chords = derive { name="chords"; version="0.90"; sha256="0wz5glm15615xb3cicc0m34zg78qzng3lpmysswbrfhc8x4kkchh"; depends=[MASS]; };
 choroplethr = derive { name="choroplethr"; version="3.0.0"; sha256="1fj0gklqcr884l42c78crn6f7s5rk336ywlnqqm5ba7kxjs464k5"; depends=[scales Hmisc stringr ggplot2 dplyr R6 acs WDI]; };
 choroplethrAdmin1 = derive { name="choroplethrAdmin1"; version="1.0.0"; sha256="1pnj5155h809sh9mp703y72348mi7mxnwid07kp1s489512ysfwr"; depends=[ggplot2]; };
@@ -2751,7 +2796,7 @@ coalescentMCMC = derive { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1s
 coarseDataTools = derive { name="coarseDataTools"; version="0.6-2"; sha256="1nnh61kfw294cxawz9i8yf37ddzsn5s532vvkaz0ychk0390wmi5"; depends=[MCMCpack]; };
 cobs = derive { name="cobs"; version="1.3-0"; sha256="1aly7ir7vzir9wnbhyfbrkl7dbq68f79jwxhqrfpf0v2m5kxhz88"; depends=[SparseM quantreg]; };
 cobs99 = derive { name="cobs99"; version="0.9-12"; sha256="0zd0nyw8ma7k90i1k3ryn6qcb6yivrrajc6nmdh4f95ihvhc9ksm"; depends=[]; };
-cocor = derive { name="cocor"; version="1.1-0"; sha256="1qmpgs9krbyvr8803r4y0gxwz2wl5frkzyxaa9756q27bw2igyrp"; depends=[]; };
+cocor = derive { name="cocor"; version="1.1-1"; sha256="1w6v9499jj727iznap66hlv9lr4r3s9pr5jnsin9zi8hjb2vhj4h"; depends=[]; };
 cocorresp = derive { name="cocorresp"; version="0.2-3"; sha256="0r1kmcwnf476xbw7r40r3vbn6l1zgmaiq6cpgrvnyss7i5313q8s"; depends=[vegan]; };
 cocron = derive { name="cocron"; version="1.0-0"; sha256="190kfv7haybi7s33bqf8dd3pcj8r6da20781583rrq6585yqh4g6"; depends=[]; };
 coda = derive { name="coda"; version="0.17-1"; sha256="1qjsqf4xi6xii60dscn577gmhqgbm525cgg67ax5mhs7il7br26f"; depends=[lattice]; };
@@ -2763,7 +2808,7 @@ coefplot = derive { name="coefplot"; version="1.2.0"; sha256="1v6c3fk2wrjgs3b31v
 coenocliner = derive { name="coenocliner"; version="0.1-0"; sha256="0hys1a4ai09pax5ydcaq39ll3rdjzyhgvz72z0iv9fwv4fbmwbr9"; depends=[]; };
 coexist = derive { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; };
 coin = derive { name="coin"; version="1.0-24"; sha256="1h1d6pi957qkmlk2j8f280sc6jkg328wnyxjk43yxj2zwmdnmgpd"; depends=[survival modeltools mvtnorm]; };
-cold = derive { name="cold"; version="1.0-3"; sha256="17nlqhp5415m8wjkb2ykmk1q3lgw1aycf85b6byl8p06bfrvmw2p"; depends=[]; };
+cold = derive { name="cold"; version="1.0-4"; sha256="00rl2h4pirzvgwi28pr94kkn233wvm2z8yyfsz6andbkjsihp6jw"; depends=[]; };
 coloc = derive { name="coloc"; version="2.3-1"; sha256="1j3m9afpkm0bzib38yqvk85b6s6l56s6j2ni96gii4a06r87ig60"; depends=[colorspace MASS BMA]; };
 colorRamps = derive { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
 coloredICA = derive { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
@@ -2811,11 +2856,11 @@ convevol = derive { name="convevol"; version="1.0"; sha256="05nhpndixvrmiq5paswj
 cooccur = derive { name="cooccur"; version="1.2"; sha256="0v26aa6j77dmm7pdij4qaz03mxn69aa71rw6n5yl3b9qb0w4k81z"; depends=[reshape2 gmp ggplot2]; };
 cooptrees = derive { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[igraph optrees gtools]; };
 copBasic = derive { name="copBasic"; version="1.7.1"; sha256="0qhrazzsrc429z9fsbqklvwdfgn65adck51vp74jijjd0p6pki4s"; depends=[lmomco]; };
-copCAR = derive { name="copCAR"; version="1.0"; sha256="0rq432w959p7drx73vsrdh5dhi2wy7dsjhhb4nh9wm36kkzki5ca"; depends=[numDeriv Rcpp spam Rcpp RcppArmadillo]; };
+copCAR = derive { name="copCAR"; version="1.0-1"; sha256="173jv69n4g68yfrz03sg23qzlyvvlw988axgj5knq3l2cq6pjpb2"; depends=[numDeriv Rcpp spam Rcpp RcppArmadillo]; };
 cope = derive { name="cope"; version="0.1"; sha256="1g00dzy99m4212wrkhmqf8ibmilhp75hd2yv7yfzi28nr5jgir3m"; depends=[maps fields MASS mvtnorm]; };
 copula = derive { name="copula"; version="0.999-13"; sha256="0yjy03wn6lsiacfh7qblspklxc9kfwd3g7bz2fx2ldkd90rwhmqp"; depends=[Matrix lattice gsl ADGofTest stabledist mvtnorm pspline]; };
 copulaedas = derive { name="copulaedas"; version="1.4.1"; sha256="1xs02s91la4i1x1zs8k5gfvd9jhs2zqhv58431p1j3spfapzf2rc"; depends=[copula vines mvtnorm truncnorm]; };
-corHMM = derive { name="corHMM"; version="1.15"; sha256="1f1qq8fnnx68mpfj863pml4xynxsl21f9r1qqv7yfrx14daki4a0"; depends=[ape nloptr expm numDeriv corpcor phangorn rgenoud]; };
+corHMM = derive { name="corHMM"; version="1.16"; sha256="048bvnw2ib9x7yijlgp4d1lfm9055y79fc613y7p6240vw1ywkrh"; depends=[ape nloptr GenSA expm numDeriv corpcor phangorn]; };
 corTools = derive { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
 corclass = derive { name="corclass"; version="0.1"; sha256="02mxypdrjwf8psk0j9ggbw14889a87c6lw11qki3s3biq52qsx3y"; depends=[igraph]; };
 corcounts = derive { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
@@ -2849,13 +2894,14 @@ cpca = derive { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhf
 cpk = derive { name="cpk"; version="1.3-1"; sha256="1njmk2w6zbp6j373v5nd1b6b8ni4slgzpf9qxn5wnqlws8801n73"; depends=[]; };
 cplexAPI = derive { name="cplexAPI"; version="1.2.11"; sha256="1rfvq2a561dz3szvrs9s5gsizwwp0b5rn4059v9divzw23clr2a9"; depends=[]; };
 cplm = derive { name="cplm"; version="0.7-2"; sha256="0vwj130r5wbax9ixcn0fdznh1zrr0wq48iivmlymqbhbqajmv8fb"; depends=[coda Matrix biglm ggplot2 minqa nlme reshape2 statmod tweedie Matrix]; };
+cqrReg = derive { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[Rcpp quantreg Rcpp RcppArmadillo]; };
 cquad = derive { name="cquad"; version="1.0"; sha256="0pfga45lpq5lgw0jbvp5wasj5m6maj2xr00adsab4c0c5rm7x2wf"; depends=[]; };
 crackR = derive { name="crackR"; version="0.3-9"; sha256="18fr3d6ywcvmdbisqbrbqsr92v33paigxfbslcxf7pk26nzn2lly"; depends=[Hmisc evd]; };
 cramer = derive { name="cramer"; version="0.9-1"; sha256="1dlapmqizff911v3jv8064ddg8viw28nq05hs77y5p4pi36gpyw4"; depends=[boot]; };
 crank = derive { name="crank"; version="1.0-7"; sha256="1ni5icg1c9ypvcvcxrr7dcp1zbk4iwyns421rrqsgmpns06s59w6"; depends=[]; };
 crantastic = derive { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
 crawl = derive { name="crawl"; version="1.4-1"; sha256="175w5933h5hhhjnrc0l1kg5q24b8pclnf5sf36gj1pmg8s58d1gp"; depends=[mvtnorm sp raster]; };
-crayon = derive { name="crayon"; version="1.1.0"; sha256="03l7sw6ilr4hmahk921kkq4hlvlscginrq3mw8aypc4wb6y32qhm"; depends=[memoise]; };
+crayon = derive { name="crayon"; version="1.2.0"; sha256="1qgc1bakj5hp4fwmm2m6bzqf0mi84v6zcvw04dgck3lk00dxd0k9"; depends=[memoise]; };
 crblocks = derive { name="crblocks"; version="0.9-1"; sha256="1m6yy6jb1dld7m9jaasms5ps8sn3v039jvlk8b0c08hmm7y0rm3z"; depends=[]; };
 crch = derive { name="crch"; version="0.1-0"; sha256="1f4y2dd6lxsryyjjv569bxh1b4ymcnma0m9k7j150anzvkbrgnjn"; depends=[Formula ordinal]; };
 crimCV = derive { name="crimCV"; version="0.9.3"; sha256="1p2cma78fb9a2ckmwdvpb6fc0818xw2mvq565dgiimgkdmmr0iid"; depends=[]; };
@@ -2870,11 +2916,13 @@ crqa = derive { name="crqa"; version="1.0.5"; sha256="0kiw90p89mf207mmky98g2d4l9
 crrSC = derive { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
 crrstep = derive { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
 crs = derive { name="crs"; version="0.15-24"; sha256="08k8vim4n85ll16zpkwbf3riz641kafn699qsg0h746zqzi1kfn7"; depends=[boot np quantreg rgl]; };
+crunch = derive { name="crunch"; version="1.0.2"; sha256="0rfiqsd7hn3yngavw484dbzw0sg91dc0q4wp7v4gll7y5n2xf2b4"; depends=[httr RJSONIO RCurl]; };
 csSAM = derive { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
 csampling = derive { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
 cshapes = derive { name="cshapes"; version="0.4-2"; sha256="015mkh0iwdbhpbk8gpnq48pp026mfidd69rj70arpmg3knd2jvff"; depends=[sp maptools plyr]; };
 cslogistic = derive { name="cslogistic"; version="0.1-3"; sha256="1s8p3qpz81nn6zr0pzw6h9ca3p6ahd8zj640vy5gcb5waqwj6bfj"; depends=[mvtnorm]; };
 csn = derive { name="csn"; version="1.1.1"; sha256="0ns92jqbsc7hnwwkph47mi8z53mj5ygrpys75l9n4d0qmdgpw0nn"; depends=[mnormt]; };
+csrplus = derive { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; };
 cstar = derive { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; };
 csvread = derive { name="csvread"; version="1.2"; sha256="1zx43g4f4kr7jcmiplzjqk2nw1g5kmmfap85wk88phf6fp0w8l5p"; depends=[]; };
 cts = derive { name="cts"; version="1.0-19"; sha256="16f6nah3w63bz8b9xlhi3a7mpkiywq6gqkxgm5am90g0bqg5j3py"; depends=[]; };
@@ -2915,8 +2963,9 @@ darch = derive { name="darch"; version="0.9.1"; sha256="0syrzmmz43msd51whkb4xy5n
 darts = derive { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; };
 dashboard = derive { name="dashboard"; version="0.1.0"; sha256="1znqwvz49r47lp6q48qaas0s63wclgybav82a247qvcavzns3kip"; depends=[Rook]; };
 data_table = derive { name="data.table"; version="1.9.4"; sha256="0gsnjjly3mxwfs6q0kjr42vr234mprp8kcyzcsa4dqf2ya2gs1s6"; depends=[chron reshape2]; };
+data_tree = derive { name="data.tree"; version="0.1.6"; sha256="09pk4c5jkj69m6sxa2pbs1wh1w4rsg799w72fx9ib4jv22hjvrhc"; depends=[R6]; };
 dataQualityR = derive { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; };
-dataRetrieval = derive { name="dataRetrieval"; version="2.1.2"; sha256="0869y5xfxphm5xhd7miyjq5xdjb6qhhd5b9mdbkcfs5ss0a6534x"; depends=[XML RCurl reshape2 lubridate plyr]; };
+dataRetrieval = derive { name="dataRetrieval"; version="2.2.0"; sha256="17vjmyrp0mymh9ns2afzphkc95a70sp8h3gqlq64g56n2jcsi35w"; 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]; };
@@ -2951,12 +3000,12 @@ deamer = derive { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1
 debug = derive { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
 decctools = derive { name="decctools"; version="0.2.0"; sha256="0k5w49s9s51m7w1h5adk26nw1ypwv5g1mlal78qmx5a4jzaf5bw9"; depends=[XLConnect stringr XML reshape2 RCurl lubridate plyr]; };
 decode = derive { name="decode"; version="1.1"; sha256="06c6l2s32s1vri51hbnl17sxgkl7x8537prk0zzq6zlqhkwy6j77"; depends=[]; };
-decompr = derive { name="decompr"; version="2.1.0"; sha256="0b24wb2n2g1qf5v60hrazfzy211y1f2v9mkx013msb0a89a7bi45"; depends=[]; };
+decompr = derive { name="decompr"; version="3.0.0"; sha256="06m2k3rjna6nii1fc9b3v2wijkjrknyhskr1ampbdgwligddnzay"; depends=[]; };
 decon = derive { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; };
 deducorrect = derive { name="deducorrect"; version="1.3-5"; sha256="06lcqnay36fgkzvgbiq7b67r9lfgll3lxfr1pmx14vmivshb6mmm"; depends=[editrules]; };
 deepnet = derive { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
 degenes = derive { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
-degreenet = derive { name="degreenet"; version="1.2"; sha256="07b6phgyydfp8jwjvrqcvcx3b2qhbkr44xkcn20ya1igsbyh6kzz"; depends=[]; };
+degreenet = derive { name="degreenet"; version="1.3"; sha256="06f22n8wz7i1w9qm6zxvspwnmcgaynlhf8m5qpmwzjqs823qf2qd"; depends=[igraph network]; };
 deldir = derive { name="deldir"; version="0.1-9"; sha256="0shzyqfqdkbhpf4hcwjjfzzizh6z56iamx2blhj79izg8xkvl2h9"; depends=[]; };
 deltaPlotR = derive { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; };
 demi = derive { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[R_utils plyr devtools]; };
@@ -2967,6 +3016,7 @@ dendextend = derive { name="dendextend"; version="0.18.3"; sha256="1s6bdkibb066y
 dendextendRcpp = derive { name="dendextendRcpp"; version="0.5.1"; sha256="062f7yjsg196v8c09h6gvbhi0fzgwg40a8xhi751avkjc68z30cq"; depends=[Rcpp dendextend Rcpp]; };
 dendroextras = derive { name="dendroextras"; version="0.2.1"; sha256="0k1w374r4fvfcbzhrgcvklccjggyz755z7wc2vqfi3c5hvdb9ns4"; depends=[]; };
 dendsort = derive { name="dendsort"; version="0.3.2"; sha256="0qj65jraj6ksmsfsrc4f3y8m7x5lqg9bqc9yb5s3bav2r8qjyhv6"; depends=[]; };
+denovolyzeR = derive { name="denovolyzeR"; version="0.1.0"; sha256="0ys8pi3wp2cvywsnh07wldv6vcb8sn7f1divpaw8f6gnw7mnhimd"; depends=[dplyr reshape]; };
 denpro = derive { name="denpro"; version="0.9.1"; sha256="0ihgk300njhp6dzm1gsmknlx4c5h6kiwprgv3l3f29s6gdxx4f6n"; depends=[]; };
 densityClust = derive { name="densityClust"; version="0.1-1"; sha256="1apv9n871dshln5ccg8x3pwqi8yfx73ijfqsvzcljqnv36qpqpqd"; depends=[]; };
 denstrip = derive { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
@@ -2975,8 +3025,8 @@ depmix = derive { name="depmix"; version="0.9.13"; sha256="1dkwc1bjq19hjzichh78b
 depmixS4 = derive { name="depmixS4"; version="1.3-2"; sha256="18xmn5fv9wszh86ph91yypfnyrxy7j2gqrzzgkb84986fjp2sxlq"; depends=[nnet MASS Rsolnp]; };
 depth = derive { name="depth"; version="2.0-0"; sha256="1aj4cch3iwb6vz0bzj4w5r6jp2qs39g8lxi2nmpbi3m7a6qrgr2q"; depends=[abind rgl circular]; };
 depthTools = derive { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
-descomponer = derive { name="descomponer"; version="1.1"; sha256="0yw3659lv3y187hwszf6vpqb3w2mvaxjn380xkxkbggdkcxhrb9r"; depends=[taRifx]; };
-descr = derive { name="descr"; version="1.0.4"; sha256="149p2znadm4qvz1cqk4k8w7wqqn8jsvjxabgd9qy2rfv41qgcri8"; depends=[xtable]; };
+descomponer = derive { name="descomponer"; version="1.2"; sha256="08hc3p4l8dy1h2z8ijifwlgidmac9b29g1k725yzwzbdr5jzvnzl"; depends=[taRifx]; };
+descr = derive { name="descr"; version="1.1"; sha256="0qqhzwnklz97gqklscr5j299g56f7wdzkhigxd7bgm0l1mwq44hc"; depends=[xtable]; };
 deseasonalize = derive { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[lattice FitAR]; };
 designGG = derive { name="designGG"; version="1.1"; sha256="1x043j36llwd7kd4skbpl2smz2ybsxjqf5yd1xwqmardq60gdv2w"; depends=[]; };
 desirability = derive { name="desirability"; version="1.9"; sha256="1p3w4xk4is22gqgy2gyxj80vib8s40lgllqc2fnz66kb2cln10n6"; depends=[]; };
@@ -3020,10 +3070,10 @@ dirmult = derive { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc
 disclap = derive { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
 disclapmix = derive { name="disclapmix"; version="1.6"; sha256="0g1yg4n4pfy0295faw2scfh45m978ymmlx9bl3h8849kfaizkysi"; depends=[Rcpp disclap cluster Rcpp]; };
 discreteMTP = derive { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; };
-discreteRV = derive { name="discreteRV"; version="1.1.4"; sha256="1bxr8rjqjx58bkkp96zk3hdssp43kcdzfjif95kda25by7926s3z"; depends=[plyr MASS]; };
+discreteRV = derive { name="discreteRV"; version="1.2"; sha256="04brc3yg5vqiprkjfmw1kdd4j8dk7557an7zkqwas5n891np8d3m"; depends=[plyr MASS]; };
 discretization = derive { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; };
 discrimARTs = derive { name="discrimARTs"; version="0.2"; sha256="088v4awic4bhzqcr7nvk2nldf8cm1jqshg2pzjd2l2p1cgwmlxib"; depends=[RUnit]; };
-diseasemapping = derive { name="diseasemapping"; version="1.1.7"; sha256="1sxvvs7sprjqzd8h51xk6i7jw8081bxzqxllqqhlz105g8czqpwi"; depends=[sp]; };
+diseasemapping = derive { name="diseasemapping"; version="1.2.0"; sha256="1l6w1f4zxfp1hrhvmxgijj2kwy7x0na2yf75ifqrbh1i499j8zjq"; depends=[sp]; };
 diskmemoiser = derive { name="diskmemoiser"; version="1.0-1"; sha256="0lacadc3mm1w55sff3lphp3xrr1inn2r382c1z8gf6kzal7c9pd8"; depends=[digest]; };
 dismo = derive { name="dismo"; version="1.0-12"; sha256="1zm3z9z2ramsp85x96rrnmj5zabm8r7f0wfxrxg2sgddwwqvxpsv"; depends=[raster sp]; };
 disp2D = derive { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; };
@@ -3044,7 +3094,7 @@ distrRmetrics = derive { name="distrRmetrics"; version="2.5"; sha256="0c7fhckw7h
 distrSim = derive { name="distrSim"; version="2.5.2"; sha256="0ipg4l2vyifaj1r9a4cc8kg32s65jpz5wxrlnrix95xk5wasdpbh"; depends=[setRNG distr]; };
 distrTEst = derive { name="distrTEst"; version="2.5"; sha256="1swl4v70gkkpidddsgqf0dqz9j0xz5j1wk44bhpi4ficim7hap3l"; depends=[setRNG distrSim startupmsg]; };
 distrTeach = derive { name="distrTeach"; version="2.5"; sha256="0a7qfqpirzcd94dvcvmprhhj2j1yl3lpizsi8mdqr19zcp6dw21k"; depends=[distr distrEx]; };
-distrom = derive { name="distrom"; version="0.3-1"; sha256="17x58lx411wlb153rv1nlmf1g528w1az8nsswvwscv15n7bvdkdf"; depends=[Matrix gamlr]; };
+distrom = derive { name="distrom"; version="0.3-2"; sha256="08brd85kg7sfvxy9xxjbpzh5zirfxyhjvl9zsxnqy0zlhq7p05q8"; depends=[Matrix gamlr]; };
 divagis = derive { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; };
 diveMove = derive { name="diveMove"; version="1.3.9"; sha256="0782b8fvh676g6fy05g1da52q398rxmgz46vk6yxwrmnvg78wcq5"; depends=[caTools KernSmooth quantreg geosphere]; };
 diveRsity = derive { name="diveRsity"; version="1.9.73"; sha256="07lln4fkphwk8kgvw4hsi7rghpwza8967z2gkb2265l28irv7ffm"; depends=[ggplot2 shiny qgraph Rcpp Rcpp]; };
@@ -3070,22 +3120,22 @@ doRedis = derive { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9b
 doSNOW = derive { name="doSNOW"; version="1.0.12"; sha256="0j71n0l9lbvwllw9iigvjgv0x8z2j57grl3yazkgcyzy0mcgf741"; depends=[foreach iterators snow]; };
 docopt = derive { name="docopt"; version="0.4.2"; sha256="0x2n79iw1818qsmdvyjyglaa8jzp91nahrijd9aijdqxdhb1mp8r"; depends=[stringr]; };
 documair = derive { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
-domino = derive { name="domino"; version="0.2-1"; sha256="1ix7m8khlxdn1axxc1jxvjmqd0np2h2z5nb9i188jk3zzpdw11ka"; depends=[]; };
+domino = derive { name="domino"; version="0.2-6"; sha256="0xbp9gb38gxfdxfbzm792g4fnjsfp2ncncm8cmyra5wja6qwcwl8"; depends=[]; };
 dosresmeta = derive { name="dosresmeta"; version="1.3.0"; sha256="0yfm8dkds8abdl6jrib5vvgkyrd5cl5a99qs27safxx0fcpdiz4k"; depends=[mvmeta aod Matrix]; };
 dostats = derive { name="dostats"; version="1.3.1"; sha256="0xcp9arpvqb7am6caiazlgllvd3hhk4gqjd2wizr2jc5dkwfl4qn"; depends=[]; };
 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.3"; sha256="1j2c3b6727598lmz29vl5f4jkf5v1621g3cli588k10frlq55nip"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; };
+dpcR = derive { name="dpcR"; version="0.1.4.0"; sha256="0fv17vzlsjb5cy1f0ll5gi5y8npavp2y7frzc595na5g15xphmxc"; depends=[binom chipPCR e1071 dgof multcomp qpcR pracma rateratio_test signal shiny spatstat]; };
 dpglasso = derive { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; };
 dplR = derive { name="dplR"; version="1.6.2"; sha256="1w8p4pfzpvarwx9an3zm158pybif6p86k87gxqr2m2fgjsxzf9nb"; depends=[gmp digest lattice png stringi stringr XML]; };
 dplRCon = derive { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; };
 dplyr = derive { name="dplyr"; version="0.4.1"; sha256="0kcwg922gzvwz1vfazwknb2sn2z9wfg9xhndi4280lg8cjdllcmw"; depends=[assertthat R6 Rcpp magrittr lazyeval DBI Rcpp BH]; };
 dpmixsim = derive { name="dpmixsim"; version="0.0-8"; sha256="0paa2hmpd6bqf0m7p9j7l2h3j18lm64ya6ya8zvp55wm8pf7xgqg"; depends=[oro_nifti cluster]; };
 dr = derive { name="dr"; version="3.0.9"; sha256="0gmxa5mbmkz54l75ss6kj5ka5kingf02pqj0xsfjxfv0311hwm52"; depends=[MASS]; };
-drat = derive { name="drat"; version="0.0.2"; sha256="0rsjkwg3dzyv8fi4p889rsq7k51zw8afaldmf7blssz8q7m3i3lv"; depends=[]; };
+drat = derive { name="drat"; version="0.0.3"; sha256="1dxgicvjdkhiwkyadxwb6lfvvidx0w2y5sd5dm49chlv6zgjaa2i"; depends=[]; };
 drawExpression = derive { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
-drc = derive { name="drc"; version="2.3-96"; sha256="0yrxa7rnsi7w4zdxd713m0l8bfsqnhcypzr091yazlahk33mybxf"; depends=[car gtools MASS magic plotrix lattice nlme]; };
+drc = derive { name="drc"; version="2.5-12"; sha256="1gw78n0w262wl6mdm5wvyp3f0hvrb2kj714acdxz84h2znxr9879"; depends=[MASS car gtools multcomp plotrix scales]; };
 drfit = derive { name="drfit"; version="0.6.3"; sha256="0vx5niw6mfg85937sbjmc0z0gdgf9aj43rmkn1gljky7pq4j3hfn"; depends=[MASS RODBC drc]; };
 drgee = derive { name="drgee"; version="1.0.1"; sha256="0vrmi3q6dhmk9z5168pdfhi18nkm4pgj4zx8d24r4k1jcqvgckl0"; depends=[nleqslv]; };
 drm = derive { name="drm"; version="0.5-8"; sha256="1p6ixd7hnv41gfmvan3rv9xzz1279hmrnvfrl6pxwzs9zcnbb53a"; depends=[]; };
@@ -3103,12 +3153,12 @@ dtt = derive { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9di
 dtw = derive { name="dtw"; version="1.17-1"; sha256="0kbf38a14k112vdi7yaql18w0sj694smlm6pmdw5q4sqpk7azhqg"; depends=[proxy]; };
 dualScale = derive { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[matrixcalc ff vcd lattice Matrix]; };
 dummies = derive { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; };
-dummy = derive { name="dummy"; version="0.1.0"; sha256="004w6ymfah608c4rqjnzjy2kyxmcq6gxbh0zhqd82ljv7cah52my"; depends=[]; };
+dummy = derive { name="dummy"; version="0.1.2"; sha256="1rvq6fp9blhgy42bj7ynbf69j1x9yl2w4b7hlmhawdkr6qzk1iap"; 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]; };
-dygraphs = derive { name="dygraphs"; version="0.4.2"; sha256="0wv9mmylfsi3q1hi5wdhnynmcclw3sl7pscpp49ddaz3psg686kz"; depends=[magrittr htmlwidgets zoo xts]; };
+dygraphs = derive { name="dygraphs"; version="0.4.3"; sha256="1pg23lsmjg46nlb17r4shmr6aal3c3pqzkcznfadcc6cgm0afqp2"; depends=[magrittr htmlwidgets zoo xts]; };
 dyn = derive { name="dyn"; version="0.2-9"; sha256="16zd32567aj0gqv9chbcdgi6sj78pnnfy5k8si15v5pnfvkkwslp"; depends=[zoo]; };
 dynBiplotGUI = derive { name="dynBiplotGUI"; version="1.1.2"; sha256="1lcd164lxrrmzxr3rp3xwvwsnpa7am6c916vrbwy74ccg2bpbv7m"; depends=[tcltk2 tkrplot]; };
 dynCorr = derive { name="dynCorr"; version="0.1-2"; sha256="0qzhhfhkwpq6mwg7y6sxpqvcj8klvivnfv69g7x3ycha1kw2xk3w"; depends=[lpridge]; };
@@ -3137,7 +3187,7 @@ ecespa = derive { name="ecespa"; version="1.1-7"; sha256="0ynyphc1jnk088041i0yk2
 ecipex = derive { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; };
 eco = derive { name="eco"; version="3.1-7"; sha256="0qrl1mq0nc42j4dzqhayzzb56gmkk479wgpxikzgzpj9wv78yd5s"; depends=[MASS]; };
 ecodist = derive { name="ecodist"; version="1.2.9"; sha256="199f3lwwm8r2bnik595m540la1p4z6vbkwfqh9kimy9d0fjp8nps"; depends=[]; };
-ecoengine = derive { name="ecoengine"; version="1.9"; sha256="0a04zhq1qla55dg8k895slh4sz3h55qgd173q2vm9p9f2gi51w9i"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; };
+ecoengine = derive { name="ecoengine"; version="1.9.1"; sha256="0y1f8ylyk9jny48z5grf4r9jcdin6clhy0vg1wkg3alsqn4iiqlg"; depends=[httr plyr assertthat whisker dplyr jsonlite lubridate leafletR]; };
 ecolMod = derive { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[rootSolve shape diagram deSolve]; };
 ecoreg = derive { name="ecoreg"; version="0.2"; sha256="08iw7w9z7zqwhvirnhdc2jr2qjp9yma8ddc831d5dvbvi2j7kq84"; depends=[]; };
 ecoretriever = derive { name="ecoretriever"; version="0.1"; sha256="1iwds81pyn9c04fmnjfsri7rjanrfki8hngdwpqcx3dkbsg76ii6"; depends=[]; };
@@ -3177,6 +3227,7 @@ elliptic = derive { name="elliptic"; version="1.3-5"; sha256="0hi0r3z6f5yq53v6ii
 elmNN = derive { name="elmNN"; version="1.0"; sha256="129r6d3qa48gqvqxks53hdmyk3jjakddsj5fwj91kqq0hkm34kyd"; depends=[MASS]; };
 elrm = derive { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
 emIRT = derive { name="emIRT"; version="0.0.5"; sha256="0n94iqdzbml0hx3gd046958vmv3y0hymj5kly53gvvlcidsn15c4"; depends=[pscl Rcpp Rcpp RcppArmadillo]; };
+embryogrowth = derive { name="embryogrowth"; version="6.0"; sha256="0l08imqagn2w1q8s4f84bb1zlc17zjkfc5qz1gpmqc7dbw9nvxph"; depends=[deSolve HelpersMG coda polynom]; };
 emdatr = derive { name="emdatr"; version="0.2"; sha256="11s9yiziswgll12c1sm3jb7hvy469ks64zx6w8dk1b36cx4lzf3h"; depends=[RCurl]; };
 emdbook = derive { name="emdbook"; version="1.3.7"; sha256="134j9mkf975h1bh4bjg5kl3gjzfii9acj4a20k1c4jnbz5v272a1"; depends=[MASS lattice plyr rgl coda bbmle]; };
 emdist = derive { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
@@ -3184,7 +3235,8 @@ emil = derive { name="emil"; version="1.1-6"; sha256="1qk655swpl8f492y9smzlfxf7a
 emma = derive { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[earth clusterSim]; };
 emme2 = derive { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
 emoa = derive { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
-empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0"; sha256="0vv104jgdwp5bg72v29614j831ndbw3sv105hkj9z3hi4ax16b5f"; depends=[]; };
+emov = derive { name="emov"; version="0.1"; sha256="1jzssxk7c26ylfb70p9s631bz63fgvrqc105p7536n0kgxy21f7b"; depends=[]; };
+empiricalFDR_DESeq2 = derive { name="empiricalFDR.DESeq2"; version="1.0.1"; sha256="12w3ald2ngaj01rm98k445ai3xl3ggr58y27mfxzlsg697yrx83c"; depends=[]; };
 emplik = derive { name="emplik"; version="0.9-9-6"; sha256="0qrrsws9hnb9f2zv50q4v9zx467n6hm83g841h3ba511iwjpp32r"; depends=[quantreg]; };
 emplik2 = derive { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
 emulator = derive { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
@@ -3210,6 +3262,7 @@ epiR = derive { name="epiR"; version="0.9-62"; sha256="04r0inaa04pc4nj5dippl2qxa
 epibasix = derive { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
 epicalc = derive { name="epicalc"; version="2.15.1.0"; sha256="11x9q990hc7rf5xfvba47axdy7vld76xcf3kd9lkr0c8nbl5ss9v"; depends=[foreign survival MASS nnet]; };
 epinet = derive { name="epinet"; version="2.0.9"; sha256="071svl1zcjjb3gvk3vg8xf660bvlz0ypkxy88n3d3f3ir2k26s7b"; depends=[]; };
+episensr = derive { name="episensr"; version="0.6.0"; sha256="005cxrwszgqar52zdrliwgg0p8j7rh2msvjd4s028z8ns334zwsb"; depends=[triangle trapezoid]; };
 episplineDensity = derive { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
 epitools = derive { name="epitools"; version="0.5-7"; sha256="163sibnbihdsnkxf313fr8n8rh5d64dwjagv95vhhzr87f21sw22"; depends=[]; };
 epoc = derive { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[lassoshooting Matrix irr elasticnet survival]; };
@@ -3227,6 +3280,7 @@ ergm_graphlets = derive { name="ergm.graphlets"; version="1.0.2"; sha256="1wfk8k
 ergm_userterms = derive { name="ergm.userterms"; version="3.1.1"; sha256="0pvklvyxi7sjc5041zl8vcisni0jz1283gyjw5mhas9bl47g1cwc"; depends=[network ergm statnet_common ergm]; };
 ergmharris = derive { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; };
 erpR = derive { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; };
+esaBcv = derive { name="esaBcv"; version="1.1.1"; sha256="0bsdxd0spfpzkaxyv1qh5n3x31qr75wgb1lizifl5j9mfi4ks7h1"; depends=[corpcor svd]; };
 esotericR = derive { name="esotericR"; version="1.0"; sha256="0kl9c2z2mpg3mk8jnl0ssgcf6y0i9jpczms746j8f07ydrcxpf41"; depends=[]; };
 estimability = derive { name="estimability"; version="1.1"; sha256="1inw2ir83bzz40gynwfcjzx7f6v99pqlphq7p3rmql01ikd2b6r9"; depends=[]; };
 estout = derive { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
@@ -3234,8 +3288,8 @@ etable = derive { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbns
 etasFLP = derive { name="etasFLP"; version="1.2.0"; sha256="0h81fm71q8qb2h0gz669cvqpzcd8jwq5yk2b8vwsiv4jlgfiq85g"; depends=[mapdata rgl fields maps]; };
 etm = derive { name="etm"; version="0.6-2"; sha256="0sdsm6h502bkrxc9admshkrkqjczivh3av55sha7542pr6nhl085"; depends=[survival lattice]; };
 eulerian = derive { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[]; };
-eurostat = derive { name="eurostat"; version="1.0.15"; sha256="01g8lc32i441cylwda5jf872gp1w1d6yx4zi2irybb9xmhha5zi2"; depends=[plyr tidyr]; };
-evaluate = derive { name="evaluate"; version="0.5.5"; sha256="15i6bkzrzkgsdlgf2pcx8b3gcjh1rplzhimy310845pfgkldcq9b"; depends=[stringr]; };
+eurostat = derive { name="eurostat"; version="1.0.16"; sha256="017ri3vvlp60r9h5b0y4j2adggkrkjbapkjynpl0vg92islspqkz"; depends=[plyr tidyr]; };
+evaluate = derive { name="evaluate"; version="0.6"; sha256="1ma3ry07b9r7rkbsq8fgxnyg4qva6lyfx8vfhgxrnj1nik9qgxy0"; depends=[stringr]; };
 evd = derive { name="evd"; version="2.3-0"; sha256="1h3dkssgw2x7pblvknfr0l8k7q25nikxyl7kl9x95ganjpi2452v"; depends=[]; };
 evdbayes = derive { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
 eventInterval = derive { name="eventInterval"; version="1.2"; sha256="15g934n7flkl1g5q8qhxv60iakx8i9ndpx88yiqqr3n38hcnifrs"; depends=[MASS]; };
@@ -3264,7 +3318,7 @@ expm = derive { name="expm"; version="0.99-1.1"; sha256="0kcanqaqn51f437fxriw4qk
 expoRkit = derive { name="expoRkit"; version="0.9"; sha256="0raf0m2nfbdbd1pc4lincyp8y8lgn3bfi4hn0p04plc5p40l1gvc"; depends=[Matrix SparseM]; };
 expoTree = derive { name="expoTree"; version="1.0.1"; sha256="0hj1x4niqp0ghqik3mz733nc3zpnhyknrdpzpj6y2rfia2ysdiz8"; depends=[ape deSolve]; };
 expp = derive { name="expp"; version="1.1"; sha256="13zbhkkcshqrpln5gsa051d390q9ij97lawsdbd5j7fj9hxm9pwh"; depends=[sp spdep rgeos deldir]; };
-expsmooth = derive { name="expsmooth"; version="2.02"; sha256="1l9k4llzkqwzmrr1l68qr58ngzs3ql67hxrr5fcrcwwnaa1zinyj"; depends=[tseries forecast]; };
+expsmooth = derive { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; };
 exptest = derive { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; };
 exsic = derive { name="exsic"; version="1.1.1"; sha256="1k6nqs9i4iivxnk4nkimp6zvdly274wibkmx9n0wz01gnzxqil0p"; depends=[stringr markdown]; };
 extRemes = derive { name="extRemes"; version="2.0-5"; sha256="1r1q26gb06db0nsd9m5r54sjhsdwbi3179ai4b71l849viragq4z"; depends=[Lmoments distillery car]; };
@@ -3287,7 +3341,7 @@ fAsianOptions = derive { name="fAsianOptions"; version="3010.79"; sha256="1w9ph3
 fAssets = derive { name="fAssets"; version="3011.83"; sha256="0i3phc8kxwhzf6010bv5k2ff5zlv7aqrwavqmhly4wwby73i39yl"; depends=[timeDate timeSeries fBasics fMultivar robustbase MASS sn ecodist mvnormtest energy]; };
 fBasics = derive { name="fBasics"; version="3011.87"; sha256="1x4jv4db0nr2fig6hglk0kv6j27ngkc8qzclgiklbl8wjfrrp9zh"; depends=[timeDate timeSeries gss stabledist MASS]; };
 fBonds = derive { name="fBonds"; version="3010.77"; sha256="00rc3i0iyqcpsqvc036csa1c8gxwcnniwj3l2irmcalx4p8650w0"; depends=[timeDate timeSeries fBasics]; };
-fCertificates = derive { name="fCertificates"; version="0.5-3"; sha256="1m0kglsr6g0f7m8r9ls95zj3hmjqq83whyk6svar39p13vabadw6"; depends=[fBasics fOptions fExoticOptions]; };
+fCertificates = derive { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fOptions fExoticOptions]; };
 fCopulae = derive { name="fCopulae"; version="3011.81"; sha256="0r4g567icgiiz6cxi6ak3kzrav9qzsc6zvww5dj1pd8mkd4r1f0y"; depends=[timeDate timeSeries fBasics fMultivar]; };
 fExoticOptions = derive { name="fExoticOptions"; version="2152.78"; sha256="0h58prj8nh340b0fxxkgg4bk25yxvb4f8ppq677hr12x8sysf1a8"; depends=[timeDate timeSeries fBasics fOptions]; };
 fExpressCertificates = derive { name="fExpressCertificates"; version="1.2"; sha256="1r4qkhf7alasbwjz910b0x4dlzm72af06kv7v2vwyzvf3byn21c5"; depends=[mvtnorm tmvtnorm fCertificates Matrix]; };
@@ -3309,9 +3363,9 @@ factualR = derive { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd
 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=[]; };
+falsy = derive { name="falsy"; version="1.0.1"; sha256="1n2b2h7w7p3vib4vgb9vadd3c07dx12vz5gm8bawbdx7llh2pr24"; depends=[]; };
 fame = derive { name="fame"; version="2.18"; sha256="132wb59d15bs94fga5hwxxr9pklyp2rjn448nl8lx5spjrvycwf4"; depends=[tis]; };
-fanc = derive { name="fanc"; version="1.22"; sha256="10j6nggwg76qaycmwi7n6nd7y660c46af82bni2g4jj3fhgkl7ks"; depends=[Matrix]; };
+fanc = derive { name="fanc"; version="1.23"; sha256="01bsny14r3i0a0yxbq3c670vh6m17g0lcjiphm6g5427rkn70whq"; depends=[Matrix]; };
 fanovaGraph = derive { name="fanovaGraph"; version="1.4.7"; sha256="19bzl6yrmi5lgyx6nq3f7i0rdaz2ig580h8116axrsxpx8c4d52x"; depends=[sensitivity igraph DiceKriging]; };
 fanplot = derive { name="fanplot"; version="3.4.0"; sha256="1arb10jxksicrdpgj8fq8r0sdnzvvdjjbw357aplqh422x54w4mp"; depends=[]; };
 faoutlier = derive { name="faoutlier"; version="0.4"; sha256="113qpwil669jr89kpqs6c6xzh0z3vp2hzfy98mh1dr2dvaznd06f"; depends=[sem lattice lavaan MASS]; };
@@ -3346,7 +3400,7 @@ fdrDiscreteNull = derive { name="fdrDiscreteNull"; version="1.0"; sha256="1388a9
 fdrci = derive { name="fdrci"; version="2.0"; sha256="0smyl9phl02wghimawvff3h267w3h213jbqpka155i6cfzig9qjy"; depends=[]; };
 fdrtool = derive { name="fdrtool"; version="1.2.14"; sha256="0q4mxm3vxhvxxbkgl9vxs3q93icipg9hz7qcr4vas8cks1hmzbdw"; depends=[]; };
 fds = derive { name="fds"; version="1.7"; sha256="164f2cbywph7kyn712lfq4d86v22j4y3fg5i9zyz956hipqv0qvw"; depends=[rainbow RCurl]; };
-fdth = derive { name="fdth"; version="1.1-8"; sha256="195219rndjcccd3b1gn3xc9iky8f3w5ig8x9822d4a2xajr78jnv"; depends=[]; };
+fdth = derive { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
 feature = derive { name="feature"; version="1.2.11"; sha256="0dgiv9gwyklnw8w0cpchakadc1vqcngjg39cha6gvl2i3csgxz4p"; depends=[ks rgl misc3d]; };
 features = derive { name="features"; version="2011.8-2"; sha256="0yshwqv2mzl5jj323jwxscpz2ygb4ywxh6q0zwphb24bhv7h9lwd"; depends=[lokern]; };
 fechner = derive { name="fechner"; version="1.0-2"; sha256="0yhiqr0wlka3wq0nhwy9n02ax3x5b0y803iadbsr3xb54pxbfbqd"; depends=[]; };
@@ -3372,24 +3426,25 @@ finiteruinprob = derive { name="finiteruinprob"; version="0.4"; sha256="0wcllbqk
 fishMod = derive { name="fishMod"; version="0.25"; sha256="0mg1bziz2ia406m4ilc7hw1bghrgdibm537hnlf9ffhfayjc4kid"; depends=[]; };
 fisheyeR = derive { name="fisheyeR"; version="0.9"; sha256="1w6va7gakqq2q8hsvdszpn8s2ysdfc648bk5p5v3wbl5s403bci8"; depends=[tkrplot]; };
 fishmethods = derive { name="fishmethods"; version="1.7-0"; sha256="0kgfv78f8a460nfvpfrrqfiy3ipbl3775axydal3vm1zf4l6k2z3"; depends=[MASS boot bootstrap]; };
-fishmove = derive { name="fishmove"; version="0.2-1"; sha256="1b8drjvslmpqnq5v3axrshrl2xq87h3x5cgfnibbhn4slrxw55v9"; depends=[ggplot2 plyr]; };
+fishmove = derive { name="fishmove"; version="0.3-1"; sha256="1k0kl68j8n1bw72ywgjwxjy20ccjclfkzblqb8rq063a8pyp91nn"; depends=[ggplot2 plyr MASS boot]; };
 fit_models = derive { name="fit.models"; version="0.5-10"; sha256="06pj26dbnq6mf9wxinvjzwyn36656f66a4bmky36r7fzi92gf3d8"; depends=[lattice]; };
 fit4NM = derive { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[gWidgets tkrplot RGtk2 gWidgetsRGtk2 cairoDevice]; };
 fitDRC = derive { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
 fitTetra = derive { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
-fitbitScraper = derive { name="fitbitScraper"; version="0.1.1"; sha256="1qmrf4lvvqhjsvnslhycy4wg7irsv7l8hr8g94l9p867cz42h58r"; depends=[httr stringr RJSONIO]; };
+fitbitScraper = derive { name="fitbitScraper"; version="0.1.2"; sha256="10qm5j4g0vs7yg5nchwza73dpr7w3zqrkffpyl60ginvl0qlqj9j"; depends=[httr stringr RJSONIO]; };
 fitdistrplus = derive { name="fitdistrplus"; version="1.0-4"; sha256="02ds5vmxc3rk50c33rxdnpqf2hbx186ss6br29n6538q7734nra9"; depends=[survival]; };
 flam = derive { name="flam"; version="1.0"; sha256="0jyx0wff5zdpnhgxz74k6fxgwdnl7khanahv63af22y0mqpd066f"; depends=[MASS]; };
 flare = derive { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[lattice MASS Matrix igraph]; };
 flashClust = derive { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
-flexCWM = derive { name="flexCWM"; version="1.4"; sha256="0v8vrf3wy4dsqzrmxdsrp1vin4188frkyp71xxsv7nbg7xgf2i83"; depends=[numDeriv mnormt mclust ellipse mixture Flury adehabitat MASS statmod]; };
+flexCWM = derive { name="flexCWM"; version="1.5"; sha256="1q6nkw6al56wc53sj719c94iv20a9a82pq4s62jnb2flq1pwdaml"; depends=[numDeriv mnormt mclust ellipse mixture Flury adehabitat MASS statmod]; };
 flexclust = derive { name="flexclust"; version="1.3-4"; sha256="1x9gyg69kb3wn02w885kl6hcwpf2ki66gzfayvc83jisrwxvdfvv"; depends=[lattice modeltools]; };
 flexmix = derive { name="flexmix"; version="2.3-13"; sha256="1i205yw3kkxs27gqcs6zx0c2mh16p332a2p06wq6fdzb20bazg3z"; depends=[lattice modeltools nnet]; };
-flexsurv = derive { name="flexsurv"; version="0.5"; sha256="0a0mhnz9xayb0pjx4glq09yiz8jplynkq8aniw9saxdik8zd1srg"; depends=[survival muhaz mvtnorm deSolve]; };
+flexsurv = derive { name="flexsurv"; version="0.6"; sha256="10y6v1m8w5h92y37pi26xqsb4l6wk6dz43593dngpfr9ww1j4aaa"; depends=[survival muhaz mvtnorm deSolve]; };
 flip = derive { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[e1071 someMTP cherry Rcpp Rcpp RcppArmadillo]; };
 flora = derive { name="flora"; version="0.2.4"; sha256="1rdwdx7mphfr7sk3yba0vhbsh3xggz2k6ip8dmfiqjjhv2vxji5k"; depends=[shiny]; };
 flower = derive { name="flower"; version="1.0"; sha256="1h2fvpjrvpbyrqb8hd51sslr1ibpwa7h9fiqy9anvf2yim5j11yq"; depends=[]; };
 flowfield = derive { name="flowfield"; version="1.0"; sha256="1cx3i0w3xq781mmms4x20fshlf1i9bwxw9bxx562crix3fq3m50j"; depends=[]; };
+flowr = derive { name="flowr"; version="0.9.6.5"; sha256="0nb715cgq9zgr7vr094q6y1j4dq77ckldn0f203jr368b9wqbqkh"; depends=[diagram knitr ggplot2 RSQLite reshape2]; };
 flsa = derive { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
 flux = derive { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
 fma = derive { name="fma"; version="2.01"; sha256="1j5mvhbrdnkyj4svibpahnz7d4221nkhja5b7fnh68mbmil607fc"; depends=[tseries forecast]; };
@@ -3401,16 +3456,18 @@ fontcm = derive { name="fontcm"; version="1.1"; sha256="1z6b4qdgj5vhvjqj90sm1hp0
 foodweb = derive { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; };
 forams = derive { name="forams"; version="2.0-4"; sha256="1kvxlqdyzb3rqa45hp7jxjm009w0r6h78nr3yh9bqcz594zqidbq"; depends=[vegan]; };
 foreach = derive { name="foreach"; version="1.4.2"; sha256="097zk7cwyjxgw2i8i547y437y0gg2fmyc5g4i8bbkn99004qzzfl"; depends=[codetools iterators]; };
+forecTheta = derive { name="forecTheta"; version="1.0"; sha256="1ip6l27d37xqnmg8w285lq1y5j6akrjrviq4338c8sq075d8hckn"; depends=[forecast]; };
 forecast = derive { name="forecast"; version="5.9"; sha256="0x77jdr0qsb3mn9gwzm6gbbhnnn9yhsd1b1hsldj9lpf5ykzf4qc"; depends=[zoo timeDate tseries fracdiff Rcpp nnet colorspace Rcpp RcppArmadillo]; };
 foreign = derive { name="foreign"; version="0.8-63"; sha256="1g5hl8drcmh2c9kpkr4443nw7dsxjwqsqs1q4bnhvw2lizs8bfb2"; depends=[]; };
 forensic = derive { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[genetics combinat]; };
 forensim = derive { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
 forestplot = derive { name="forestplot"; version="1.1"; sha256="1h28lwqdizs450bm5hb8zfbmx633n8v5bj2p8mi4cl814sjjylr0"; depends=[]; };
-formatR = derive { name="formatR"; version="1.0"; sha256="18wv05ijdymipnyxy5h34y3nbx42ifk79qiapfgx5fjjzpspq6q5"; depends=[]; };
+formatR = derive { name="formatR"; version="1.1"; sha256="0pds6s4byykrlzm5fgkjky4nfj1y7dxci84pyjbav8w468vxbh73"; depends=[]; };
 formula_tools = derive { name="formula.tools"; version="1.3.4"; sha256="1xxl45x88fpskwvfj6sbcbfng84plpf8sjrkwawzki9a41ydhwaq"; depends=[operator_tools]; };
 fortunes = derive { name="fortunes"; version="1.5-2"; sha256="1wv1x055v388ay4gnd1l8y6dgvamyfvmsd0ik9fziygwsaljb049"; depends=[]; };
 forward = derive { name="forward"; version="1.0.3"; sha256="0swn5ysp3f660kl9jpmkck9324j1g3yhj2hl238rfrcr5wihxifc"; depends=[MASS]; };
 fossil = derive { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[sp maps shapefiles]; };
+fpCompare = derive { name="fpCompare"; version="0.1.0"; sha256="1b5jbw6rlrx3qdn0mcga4n4505jqqr2pbz77x0vxcyn35qv9d9ql"; depends=[]; };
 fpc = derive { name="fpc"; version="2.1-9"; sha256="01x7zcsbz9n10dxx8plb37c7z7pfz1xd5dvfrij3na327mny3pxs"; depends=[MASS cluster mclust flexmix prabclus class diptest mvtnorm robustbase kernlab trimcluster]; };
 fpca = derive { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; };
 fpow = derive { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
@@ -3442,7 +3499,7 @@ fslr = derive { name="fslr"; version="1.3"; sha256="0668fpr3avqhyq42an9la71ln40k
 fso = derive { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
 ftnonpar = derive { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
 fts = derive { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[zoo BH]; };
-ftsa = derive { name="ftsa"; version="4.2"; sha256="0yph80a51lphv7kqrpcm01rga8pq3ngfimzada7lghycac9ab4rf"; depends=[forecast rainbow colorspace MASS pcaPP R2jags]; };
+ftsa = derive { name="ftsa"; version="4.3"; sha256="0hf3v83a5mh6s8y3hhvnwqmj55n707c8lgkpmxlc52gxykgnayjz"; depends=[forecast rainbow colorspace MASS pcaPP]; };
 fueleconomy = derive { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; };
 fugeR = derive { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[snowfall Rcpp Rcpp]; };
 fun = derive { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
@@ -3470,7 +3527,7 @@ gMCP = derive { name="gMCP"; version="0.8-8"; sha256="0568pqvcbrpqbppvpvmgxf23rz
 gMWT = derive { name="gMWT"; version="0.9"; sha256="0c91bwwfm0qyqrrd3n9g6l8kackqm58hmamypn1awzpz1p13axyv"; depends=[clinfun Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
 gPCA = derive { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
 gPdtest = derive { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
-gProfileR = derive { name="gProfileR"; version="0.5"; sha256="0jadfj2hcn3zx4ph61685p5iz16330jccp5ipi8183dkcybvimw4"; depends=[RCurl plyr]; };
+gProfileR = derive { name="gProfileR"; version="0.5.3"; sha256="0kv01b1ihwggzjd9plznz3il3b97pja11nqki3378zvpgfy5wzdn"; depends=[RCurl plyr]; };
 gRain = derive { name="gRain"; version="1.2-3"; sha256="0cxlni9b4p4g02zhhsbbpkwhx9y3x83vm7qd6lsca02yi96palsi"; depends=[gRbase igraph]; };
 gRapHD = derive { name="gRapHD"; version="0.2.4"; sha256="0fxd04s6zh23chks4k6nwb5w408xjy89b44pa42kv6qnqj86ylvm"; depends=[]; };
 gRapfa = derive { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
@@ -3493,7 +3550,7 @@ gamboostLSS = derive { name="gamboostLSS"; version="1.1-3"; sha256="1gdsrizr4q5z
 gamboostMSM = derive { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
 gamclass = derive { name="gamclass"; version="0.55"; sha256="0nhy1qdc221hsnby8j0m2a4x4a8qwfixbaq4gd22rn1xpbsdnfw3"; depends=[car mgcv DAAG MASS rpart randomForest lattice latticeExtra ape KernSmooth]; };
 games = derive { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[maxLik Formula MASS stringr]; };
-gamlr = derive { name="gamlr"; version="1.12-1"; sha256="17vfb3kac5y3xfw8s1m8czm5bq5z6x6lc43f2szj5lv84mf2r6y7"; depends=[Matrix]; };
+gamlr = derive { name="gamlr"; version="1.13-1"; sha256="1y97zsb9shll93f6j7r95296c26dbmxwa1z67ziy0yh4gsgbijc8"; depends=[Matrix]; };
 gamlss = derive { name="gamlss"; version="4.3-4"; sha256="0qbxcfvhy8blswzv8194x9f08p25vhknnm3h4hhz9lp5gh536fbk"; depends=[gamlss_data gamlss_dist nlme MASS survival]; };
 gamlss_add = derive { name="gamlss.add"; version="4.3-3"; sha256="0cs4mcpm0ckaim3g8q7m4yb6y3izqgvndzgkqgrwr75cxz0wd4vh"; depends=[gamlss_dist gamlss mgcv nnet rpart]; };
 gamlss_cens = derive { name="gamlss.cens"; version="4.3.1"; sha256="1y3a4b6n86h0r287065kr574ix0qpc2nnjpp8fp49nbpxwxlz962"; depends=[gamlss_dist gamlss survival]; };
@@ -3514,6 +3571,7 @@ gapminder = derive { name="gapminder"; version="0.1.0"; sha256="06hi4m9i86nkdyz7
 gaselect = derive { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp Rcpp RcppArmadillo]; };
 gaussDiff = derive { name="gaussDiff"; version="1.1"; sha256="0fqjdxp2ibbami75ba16d02dz4rz5sk8mni45di9anydx44g9d45"; depends=[]; };
 gaussquad = derive { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[polynom orthopolynom]; };
+gazepath = derive { name="gazepath"; version="1.0"; sha256="00k6617wra9pcvyr94mr48c21l7z6grlpgf9g02lh23p6900fjxq"; depends=[]; };
 gb = derive { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; };
 gbRd = derive { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
 gbm = derive { name="gbm"; version="2.1.1"; sha256="0jkjr09w9cgfb21aznvr9nivxjmj1zxfsl7gafy4mwh719jzygy0"; depends=[survival lattice]; };
@@ -3528,8 +3586,9 @@ gdalUtils = derive { name="gdalUtils"; version="0.3.1"; sha256="1a6sg3x5yfffa9xr
 gdata = derive { name="gdata"; version="2.13.3"; sha256="05k5l4gz0381z89sp64xhngcsykazzznwmankwsnimx5alwrfk2m"; depends=[gtools]; };
 gdimap = derive { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[rgl oro_nifti movMF gridExtra colorspace geometry gsl abind]; };
 gdistance = derive { name="gdistance"; version="1.1-7"; sha256="1wcpjx76pnkpc6kmqx7bq73qbvzfzjb9s46qb7gi7kabpkya97il"; depends=[raster igraph Matrix sp]; };
+gdm = derive { name="gdm"; version="1.0"; sha256="08wafxvds4sxaxv7mbbkbzilkpfz1xnzdc5jdw3pldvmbgk861vd"; depends=[Rcpp raster reshape2 vegan plyr Rcpp]; };
 gee = derive { name="gee"; version="4.13-18"; sha256="1s2cjgg4ypw72g710m93g6az763xz6sxw91nd6cwm5jjvr9vb91f"; depends=[]; };
-geeM = derive { name="geeM"; version="0.7.2"; sha256="0qxamrkmiy70g9kkncrwgh3gx8dq5ixfwbcl8k4dgf5i5051giw9"; depends=[Matrix]; };
+geeM = derive { name="geeM"; version="0.7.3"; sha256="15qbfki7ds75ws0ymwncr0y26ddnky5a882d7vh04145s1prl6xw"; depends=[Matrix]; };
 geepack = derive { name="geepack"; version="1.2-0"; sha256="1pxh9nsyj9a40znm4zza4nbi3dkhb96s3azi43p9ivvfj3l21m74"; depends=[]; };
 geesmv = derive { name="geesmv"; version="1.0"; sha256="1xxsiz6rwqxx113vmlddx89g190nmv1yaimmibz8ai0sam5hqnp9"; depends=[nlme gee matrixcalc MASS]; };
 geigen = derive { name="geigen"; version="1.5"; sha256="06k4fc7j8asqv1winmz28hb3r8fvlgikrvi064ysvj2fqwh7jnq1"; depends=[]; };
@@ -3555,20 +3614,20 @@ genoPlotR = derive { name="genoPlotR"; version="0.8.2"; sha256="0q12sg13yn5f3j5g
 genpathmox = derive { name="genpathmox"; version="0.2"; sha256="1m08j10mrvkrnlgxbhjn3qmjz29p121fc4haww5qrici06nipfdm"; depends=[plspm quantreg mice diagram]; };
 genridge = derive { name="genridge"; version="0.6-5"; sha256="0ms8n1yrga5qqg9ni41ifyw6320aajyrwvjh6d27q1k96j2dicp4"; depends=[car]; };
 gensemble = derive { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
-geoBayes = derive { name="geoBayes"; version="0.2.150308"; sha256="0n1i3l0qk5yy3h7hdjd03wd197qrv76n4vq3pv8av4n2k4m7dk2v"; depends=[coda sp]; };
+geoBayes = derive { name="geoBayes"; version="0.2.150402"; sha256="123b2xds69clkgjvczkdbl673cahmiprrr1cki2alspryy37icar"; depends=[coda sp]; };
 geoCount = derive { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp Rcpp RcppArmadillo]; };
 geoR = derive { name="geoR"; version="1.7-4.1"; sha256="19mafynvnpabwm5i6m4ax6d9rrh3fgyg9sslb552v6ry9nfq31h0"; depends=[sp MASS splancs RandomFields]; };
 geoRglm = derive { name="geoRglm"; version="0.9-4"; sha256="1wzq8p4xi40j4cagg7ji8qz9kynrwlyrlcvv0358pbl19nvg7hxb"; depends=[geoR]; };
 geocodeHERE = derive { name="geocodeHERE"; version="0.1.2"; sha256="0sr8r6f41bpi0rncjcf0aydda68wnsrbmqzsgc1f1has2rb1g9p0"; depends=[httr]; };
 geomapdata = derive { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
 geometry = derive { name="geometry"; version="0.3-5"; sha256="1x1dhdbqnq1wi1r4njj3l1g8yag2dig19rna3a5pwf1j1gxbl0i8"; depends=[magic]; };
-geomorph = derive { name="geomorph"; version="2.1.3"; sha256="1jym15xlpbgc6lfd8dzl6ixc9mn79m1a9a8jiw1yjw9kgkvp8w6p"; depends=[rgl jpeg ape geiger phytools]; };
+geomorph = derive { name="geomorph"; version="2.1.4"; sha256="19zf9g0lpkrdl3pkkjryzas42h3ng9q01ap182xxd36vr8p55sd8"; depends=[rgl jpeg ape geiger phytools]; };
 geonames = derive { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
 geophys = derive { name="geophys"; version="1.3-6"; sha256="1yfhilgc2nv5jfp0n7iah0wl041an2850c2qnzrvx0vv9fywgw9g"; depends=[RPMG RSEIS RFOC GEOmap cluster]; };
 georob = derive { name="georob"; version="0.1-5"; sha256="0awcqcpv82pn2z7lgir73pg2b0whvrrfy55gi0jrjn7lzyakhqaq"; depends=[sp constrainedKriging lmtest nlme nleqslv quantreg RandomFields robustbase snowfall]; };
 geoscale = derive { name="geoscale"; version="1.1"; sha256="1xmn8y33jz1f16sjbzrld20gy7w54awrr79lhs9s4r8k1gmn0zqg"; depends=[]; };
 geospacom = derive { name="geospacom"; version="0.5-7"; sha256="00yi2wwnjh2z8xhzfbp1jhh5fhq2z885s0gv937xsin4a63m76fd"; depends=[rgeos classInt sp maptools geosphere]; };
-geosphere = derive { name="geosphere"; version="1.3-11"; sha256="0gsbzbx7x4ly7dfh8ld3fa795ysf4sl8a1jg3jc12nrrx85cwl74"; depends=[sp]; };
+geosphere = derive { name="geosphere"; version="1.3-13"; sha256="124l1mfqf4qq5qsa0k3r5hkky9q2m2waq2rp4xcym49wr3jysf6c"; depends=[sp]; };
 geospt = derive { name="geospt"; version="1.0-1"; sha256="1nv5wn8s4vlbyyzi8is7zsa1vrijp1va0vhi8l2yny8fh22qhjij"; depends=[gstat genalg MASS sp minqa limSolve fields gsl plyr TeachingDemos sgeostat]; };
 geostatsp = derive { name="geostatsp"; version="1.2.1"; sha256="0p93b8mmjsqg7qg1c6v7c5ism8jqf7w21rydck7agh4i64q47s7y"; depends=[Matrix raster sp abind numDeriv pracma]; };
 geotools = derive { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
@@ -3578,8 +3637,9 @@ getopt = derive { name="getopt"; version="1.20.0"; sha256="00f57vgnzmg7cz80rjmjz
 gets = derive { name="gets"; version="0.2"; sha256="0vdg8g588asyzkld9v3rmscx3k727ncxnjzi8qxinlr2zhw9nbcq"; depends=[zoo]; };
 gettingtothebottom = derive { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
 gfcanalysis = derive { name="gfcanalysis"; version="1.2"; sha256="147vgv4z14xn0j94g7z0y099gz8xj2yb02r6j3mfi4412dg5f5fp"; depends=[raster rgdal geosphere RCurl rgeos plyr ggplot2 sp stringr animation rasterVis]; };
+ggExtra = derive { name="ggExtra"; version="0.1.0"; sha256="12b2bd8n3hyp5azdxh14dslq6mwaplvxph90dhiydkhzmya27i7i"; depends=[ggplot2]; };
 ggROC = derive { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
-ggRandomForests = derive { name="ggRandomForests"; version="1.1.3"; sha256="0yz25imvlpblrw2v9b5s39na9diljh2g93mmcv9gljad40iy34va"; depends=[randomForestSRC ggplot2 survival dplyr reshape2]; };
+ggRandomForests = derive { name="ggRandomForests"; version="1.1.4"; sha256="0h55593mr2x0kvp97rrm1spj17zbr1p9pqrpngsxmp11iahhccqh"; depends=[randomForestSRC ggplot2 survival reshape2]; };
 ggdendro = derive { name="ggdendro"; version="0.1-15"; sha256="1xa1pswkf7xnrxs1zqw71ws0r6r0nmc2gnc76bd372czfdn4npci"; depends=[MASS ggplot2]; };
 ggenealogy = derive { name="ggenealogy"; version="0.1.0"; sha256="0shy6ylrx49yccyydhahqk1nnljqgf1cm11fl4cmb44la5zd3wjn"; depends=[ggplot2 igraph plyr reshape2]; };
 gglasso = derive { name="gglasso"; version="1.3"; sha256="0qqp5zak4xsakhydn9cfhpb19n6yidgqj183il1v7yi90qjfyn66"; depends=[]; };
@@ -3590,6 +3650,7 @@ ggparallel = derive { name="ggparallel"; version="0.1.1"; sha256="1z8w4bm4ahmmwb
 ggplot2 = derive { name="ggplot2"; version="1.0.1"; sha256="0794kjqi3lrxb33lr1mykd58959hlgkhdn259vj8fxrh65mqw920"; depends=[plyr digest gtable reshape2 scales proto MASS]; };
 ggsubplot = derive { name="ggsubplot"; version="0.3.2"; sha256="1rrq47rf95hnwz8c33sbnpvc37sb6v2w37863hyjl6gc0bhyrvzb"; depends=[ggplot2 plyr proto scales stringr]; };
 ggswissmaps = derive { name="ggswissmaps"; version="0.0.2"; sha256="1cl8m9j3d2kf8dbpq09q36v7nwkgz7khqds431l0kmkzq02qhddf"; depends=[ggplot2]; };
+ggtern = derive { name="ggtern"; version="1.0.5.0"; sha256="0ykgz3268381glkrv1gbn9qnyrkxsmihc3srv8zrldbq18zbr0a8"; depends=[ggplot2 plyr gtable scales reshape2 proto MASS sp]; };
 ggthemes = derive { name="ggthemes"; version="2.1.2"; sha256="049fjk0f960sjsnqns2kgk7dvr6jr5rrpxgl8qbxx4idz95bvdi7"; depends=[ggplot2 colorspace proto scales]; };
 ggvis = derive { name="ggvis"; version="0.4.1"; sha256="1sl6ygglgsg7xhzzkxaap8pzb2zmfw0y481w7r7s1nyg7pdgr0r2"; depends=[assertthat jsonlite shiny magrittr dplyr lazyeval htmltools]; };
 ghyp = derive { name="ghyp"; version="1.5.6"; sha256="0y3915jxb2rf01f7r6111p88ijhmzyz4qsmy7vfijlilkz0ynn20"; depends=[numDeriv gplots]; };
@@ -3606,19 +3667,19 @@ glba = derive { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l5
 glcm = derive { name="glcm"; version="1.2"; sha256="00bkhd4arvg7ahdr5kfvran46b2sywv9i0rlwalx9pmyvjwnzm5b"; depends=[Rcpp Rcpp RcppArmadillo]; };
 gld = derive { name="gld"; version="2.2.1"; sha256="1x9xlqj87xmk90hn20k1yvnvyndxdbi67yrxrfdhr3lhxabq5msw"; depends=[]; };
 gldist = derive { name="gldist"; version="2160.2"; sha256="1dcf3pb4xqvhqj4m3xc3ihzjbzxjspjrnc8819hmlnmdd0csghmx"; depends=[]; };
-glinternet = derive { name="glinternet"; version="0.9.0"; sha256="0qihlzdb9ifqlyx5l34vkwi6z59xd7wbl72a3pj725n9kkk7bmig"; depends=[]; };
+glinternet = derive { name="glinternet"; version="1.0.0"; sha256="0aa75xq2w64iknbyl6qw9ckk8v64a96xz0ar1mbqd8zhx0xvibyy"; depends=[]; };
 gllm = derive { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
 glm2 = derive { name="glm2"; version="1.1.2"; sha256="1x9pq2ddsz9al8w044qch34s3fahca63dz85lvm5qn16945ccw1s"; depends=[]; };
 glmc = derive { name="glmc"; version="0.2-4"; sha256="03m1ym9w0b0gqib13pnh1yrjijlcwsn5lijg0nsr4hd6gxw29cla"; depends=[emplik]; };
 glmdm = derive { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; };
-glmgraph = derive { name="glmgraph"; version="1.0.0"; sha256="1q3j2djw0v5187agnrfabhgwm6yh0i05yzxdaba3kgbcsdrdr8mn"; depends=[Rcpp Rcpp RcppArmadillo]; };
+glmgraph = derive { name="glmgraph"; version="1.0.1"; sha256="1jzkz2lri7nbxxkryhf95503wd651ic59h6iafkx9ahwpmibyv4l"; depends=[Rcpp Rcpp RcppArmadillo]; };
 glmlep = derive { name="glmlep"; version="0.1"; sha256="0jnm3cf2r9fyncxzpk87g4pnxbryqcxxrc5y2a80pv48al3sxlzk"; depends=[]; };
 glmm = derive { name="glmm"; version="1.0.2"; sha256="0qlsqg1sp4p4qy95k52dc7c58lfmlxh0vk0jdpqzpi4rrh7ngpan"; depends=[trust mvtnorm Matrix]; };
 glmmBUGS = derive { name="glmmBUGS"; version="2.3"; sha256="1j96c1c2lqplhjvyigpj494yxj85bpmc7cnd1hl1rc8b552jr192"; depends=[MASS abind]; };
 glmmGS = derive { name="glmmGS"; version="0.5-1"; sha256="1aqyxw3nrjri8k8wlwvddy25dj7mjqndssd5p5arax8vaqgrdnjz"; depends=[]; };
 glmmLasso = derive { name="glmmLasso"; version="1.3.3"; sha256="122dl5l4ngl9xvyz1kr58hryyxmld0zpwp5437ckwbnkf9bv1ldk"; depends=[minqa]; };
 glmmML = derive { name="glmmML"; version="1.0"; sha256="0b1q5mj325xga3lfks28r03363bjfa31rlgjzwk4s0a6g21bdl4a"; depends=[]; };
-glmnet = derive { name="glmnet"; version="1.9-8"; sha256="1ndaq6qbn8vxs7ha4x9k0qcblr1byixvrhh572794xzgdn548prm"; depends=[Matrix]; };
+glmnet = derive { name="glmnet"; version="2.0-2"; sha256="1nfbh1y41ly09lcdb5z02dy8l4qkll21yicmwg25wlkzk5sxb3z3"; depends=[Matrix foreach]; };
 glmnetcr = derive { name="glmnetcr"; version="1.0.2"; sha256="1pyg23hdqksiaqdcrsaqz9vb7mgclm41hh0vb7ndkdv284bzzlbz"; depends=[glmnet]; };
 glmpath = derive { name="glmpath"; version="0.97"; sha256="054v188ffjl6x11cld5s9py22kxcs0iq58x4yhxb0ny7mbma5hkn"; depends=[survival]; };
 glmpathcr = derive { name="glmpathcr"; version="1.0.3"; sha256="0qa63c7kwpxf6smczgzf4fmvczw1ynqq5vgcw3bxdbs37q4ypj8n"; depends=[glmpath mvtnorm]; };
@@ -3643,7 +3704,7 @@ gnmf = derive { name="gnmf"; version="0.7"; sha256="00y1dx1c66gv769yiwnb91xbr77w
 gnumeric = derive { name="gnumeric"; version="0.7-2"; sha256="14c7a8aiqvqfbrjb1akpfjwidrzdhrw8a07ask083krki6vbi7hh"; depends=[XML]; };
 goalprog = derive { name="goalprog"; version="1.0-2"; sha256="1h3nd3d53hbz5hl3494lpfjnp1ddklc17nhgw18362jd1nk14awy"; depends=[lpSolve]; };
 gof = derive { name="gof"; version="0.9.1"; sha256="1s12gga9d6yizn2y7lzql4jd80lp5jpyml8ybn7xqswp8am82vpg"; depends=[]; };
-goft = derive { name="goft"; version="1.0"; sha256="061x6mnzidmnza9q7z2ikik9zrn434yjx1690bxbh41ckvb92hnx"; depends=[gPdtest mvShapiroTest]; };
+goft = derive { name="goft"; version="1.1"; sha256="19mb2i2iri09v2dgkyl1ral2m7bzyizncnz24niwg13afpwbq12h"; depends=[gPdtest mvShapiroTest]; };
 goftest = derive { name="goftest"; version="1.0-2"; sha256="11xw0cfj71z5smywsds9ijbhf3glxkqnhxmwwdqkv4gjrrr2y1bv"; depends=[]; };
 gogarch = derive { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fGarch fastICA]; };
 gooJSON = derive { name="gooJSON"; version="1.0.01"; sha256="02sldh5lsrjprc9mbf99jyid7ij62db5f1h60z719gxl4pk6fjms"; depends=[rjson]; };
@@ -3677,6 +3738,7 @@ gridSVG = derive { name="gridSVG"; version="1.4-3"; sha256="1jgrhckjbvccp5zqbkki
 grnn = derive { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; };
 groc = derive { name="groc"; version="1.0.4"; sha256="1v32gwr8ghv47dmzp1x02n3aaqv3cfywh7xzx2486v4p960s42gc"; depends=[rrcov pls mgcv robust robustbase MASS]; };
 grofit = derive { name="grofit"; version="1.1.1-1"; sha256="1rnym5fxbg3bin2idmymrwvf1fcd646bipbgjd6wby8my69zy4c5"; depends=[]; };
+groupRemMap = derive { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; };
 grouped = derive { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; };
 growcurves = derive { name="growcurves"; version="0.2.3.9"; sha256="1f8hh8ppp6bgrb8crm46xrria3vdnz62aya9lhwcdaggfmy7j25l"; depends=[Rcpp RcppArmadillo reshape2 scales ggplot2 Formula testthat Rcpp RcppArmadillo]; };
 growfunctions = derive { name="growfunctions"; version="0.11"; sha256="087qpykjj46a5zp48dx59k51mdyqckc39zgmrnhc5rhgm5df8sv3"; depends=[Rcpp Matrix spam mvtnorm ggplot2 reshape2 scales Rcpp RcppArmadillo]; };
@@ -3705,10 +3767,11 @@ gsw = derive { name="gsw"; version="1.0-3"; sha256="0ca3h567r23bdldic7labk1vbz8h
 gtable = derive { name="gtable"; version="0.1.2"; sha256="0k9hfj6r5y238gqh92s3cbdn34biczx3zfh79ix5xq0c5vkai2xh"; depends=[]; };
 gtcorr = derive { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; };
 gte = derive { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; };
-gtools = derive { name="gtools"; version="3.4.1"; sha256="0d5v864v3qnmmxas8xf74aarli9nr3l16bwj9qzs2s9k498q6azs"; depends=[]; };
+gtools = derive { name="gtools"; version="3.4.2"; sha256="1s0vfi07gxaqvllidsws4f9admvc61sw19g2hvffa74sccqiwr6a"; depends=[]; };
 gtop = derive { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts quadprog lassoshooting]; };
 gtx = derive { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; };
 gumbel = derive { name="gumbel"; version="1.05"; sha256="0d7isx7bhvryhaa25kxb4fm58ph81xaqscj19aaqzs8yg79ac2ar"; depends=[]; };
+gvc = derive { name="gvc"; version="0.2.0"; sha256="0d7plcd5yy6xw1i6dvh2df8jg6fcyfd6kjypbflppnbl5n1zab12"; depends=[decompr]; };
 gvcm_cat = derive { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[Matrix MASS mgcv]; };
 gvlma = derive { name="gvlma"; version="1.0.0.2"; sha256="0gj52hg665nmlwgbjh9yvz7a3sbzlbj41ksxchnnlxaxipdf6sl8"; depends=[]; };
 gwerAM = derive { name="gwerAM"; version="1.0"; sha256="1c3rzd1jf52a4dn63hh43m9s9xnjvqn67amlm9z1ndrnn6fwfg1b"; depends=[MASS Matrix]; };
@@ -3724,7 +3787,7 @@ harvestr = derive { name="harvestr"; version="0.6.0"; sha256="1jg4d98bwx2cm3hlia
 hash = derive { name="hash"; version="2.2.6"; sha256="0mkx59bmni3b283znvbndnkbar85fzavzdfgmwrhskidsqcz34yz"; depends=[]; };
 hashFunction = derive { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; };
 hasseDiagram = derive { name="hasseDiagram"; version="0.1.1"; sha256="1szj5pi9i5ijqakxx4vwvwpz7y76jbgcgm76vfg4cnxvndf7sf4l"; depends=[]; };
-haven = derive { name="haven"; version="0.1.1"; sha256="0lc6zsl688ms76qjb3lsbid968byq3084513q6g9a1caa3qmvhz0"; depends=[Rcpp Rcpp BH]; };
+haven = derive { name="haven"; version="0.2.0"; sha256="1ww55ciibq62bix3pdwabpycxv1dh01zsrf0vb6jxxh1idxbm5hg"; depends=[Rcpp Rcpp BH]; };
 hawkes = derive { name="hawkes"; version="0.0-4"; sha256="1ghwq3icxwmrai3xn9r8cnvlh3z3j18lznhw1bm31h9mkkp2dk0a"; depends=[Rcpp Rcpp RcppArmadillo]; };
 hazus = derive { name="hazus"; version="0.1"; sha256="1c0ahjdy9di1683nk5k4rmr6rhb66523ny039nyv842rgqdy625j"; depends=[reshape2]; };
 hbim = derive { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
@@ -3743,7 +3806,7 @@ hdlm = derive { name="hdlm"; version="1.2"; sha256="0s4lzg3s2k7f7byygb11s7f78l3r
 hdrcde = derive { name="hdrcde"; version="3.1"; sha256="027nxpzk1g0yx8rns7npdz30afs5hwpdqjiamc7yjrsi0rzm71lw"; depends=[mvtnorm locfit ash ks KernSmooth]; };
 heatex = derive { name="heatex"; version="1.0"; sha256="0c7bxblq24m80yi24gmrqqlcw8jh0lb749adsh51yr6nzpap6i9n"; depends=[]; };
 heatmap_plus = derive { name="heatmap.plus"; version="1.3"; sha256="0rzffm15a51b7l55k0krk6w7v8czy3vpwz1qmbybr7av0pln7wn3"; depends=[]; };
-heatmap3 = derive { name="heatmap3"; version="1.0.7"; sha256="037aw51ynhi45yzsdd9af9kv1lza2k5lvx8m8jbzp6adadpwr305"; depends=[fastcluster]; };
+heatmap3 = derive { name="heatmap3"; version="1.1.1"; sha256="14zkij0gr9awzic71k2j7pniamkywfvwrifdk7jbds70zsi30ph5"; depends=[fastcluster]; };
 heatmapFit = derive { name="heatmapFit"; version="2.0.2"; sha256="00p39y6x13yxrxfqx6gzmb80fk1hsyi8wa6brx40hj37pyyfis0p"; depends=[]; };
 heavy = derive { name="heavy"; version="0.2-35"; sha256="04aw0r2hgnxf9nsd18q2b5d130vj578nyv5wacivikgfifyy0y39"; depends=[]; };
 helloJavaWorld = derive { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
@@ -3761,9 +3824,10 @@ hgam = derive { name="hgam"; version="0.1-2"; sha256="1flcc67n8kbh9m5phdfl587xg1
 hglasso = derive { name="hglasso"; version="1.2"; sha256="1qq41ma33wz7qjs5zx72yvngpsiq62z9sd6d5hvvl83brq0fcr4b"; depends=[glasso mvtnorm igraph fields]; };
 hglm = derive { name="hglm"; version="2.0-11"; sha256="0yqnky2p5avxn7nv8wnk57xkd0dpk89jas6d577q50ms4dpwdl6z"; depends=[Matrix MASS hglm_data]; };
 hglm_data = derive { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[Matrix MASS]; };
+hgm = derive { name="hgm"; version="1.11"; sha256="1p6391bcvsgf2mvkdrwc3fj3h6hkzshqmzb6f31kmpiihjwv3392"; depends=[deSolve]; };
 hht = derive { name="hht"; version="2.1.2"; sha256="10lpndwpddcqxyrk9pq9dwaqpj4apxdic971nd68cn3pql6fssdn"; depends=[EMD fields spatstat]; };
 hiPOD = derive { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; };
-hiddenf = derive { name="hiddenf"; version="1.1"; sha256="04pl3glvg3m1xzvxnc5lwjz839zrpc8zhnsxcswvvaqpgzip5f1p"; depends=[]; };
+hiddenf = derive { name="hiddenf"; version="1.3"; sha256="02vdvvhfas8ziyipm13ihmvas4krgzifz5dg513p5qy2lzvz6xd3"; depends=[]; };
 hier_part = derive { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; };
 hierDiversity = derive { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; };
 hierNet = derive { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; };
@@ -3772,8 +3836,8 @@ hierfstat = derive { name="hierfstat"; version="0.04-14"; sha256="0zbl5cq0cidv0g
 highD2pop = derive { name="highD2pop"; version="1.0"; sha256="1s4v6m2d3vzvxsgmjzczv1zj3kv3ygvv6gbkkbjwsdhkvc1rdmf0"; depends=[fastclime]; };
 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=[]; };
+highlight = derive { name="highlight"; version="0.4.5"; sha256="004ncg3dhfj4dywa2pk32r2pwcm90dp0vnanip0fqflkgwn1qbbp"; depends=[]; };
+highr = derive { name="highr"; version="0.4.1"; sha256="1ssjq92p8351i8ry4k239s1n6dkail9aj5al8asb7h9z6ibfwvhw"; 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]; };
@@ -3801,6 +3865,7 @@ hpcwld = derive { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgz
 hpoPlot = derive { name="hpoPlot"; version="2.0"; sha256="080jzi1zw510clbbkmf2wkwbfgna06kfz91i7d90b9pqi7krj28j"; depends=[functional magrittr]; };
 hqmisc = derive { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; };
 hrr = derive { name="hrr"; version="1.1.1"; sha256="17jzsgh2784y7jdwpa50v7qz99dw6k2n25sisnam6h1a39b96byn"; depends=[]; };
+hsdar = derive { name="hsdar"; version="0.1.2"; sha256="1zzz0drvykcs4mfj7xxcvvzcmk6l2038l0ngpjx52ih05yzajzxi"; depends=[sp raster rgdal rootSolve signal]; };
 hsicCCA = derive { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
 hsmm = derive { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
 hsphase = derive { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[snowfall Rcpp RcppArmadillo Rcpp]; };
@@ -3832,7 +3897,6 @@ hypergea = derive { name="hypergea"; version="1.2.3"; sha256="13a8r7f2qq7wi0h7jr
 hypergeo = derive { name="hypergeo"; version="1.2-9"; sha256="0ydwza0h8ykzbrsvvp4wd5jiy05rx5bj93c7bplx68j3c68c9f1q"; depends=[elliptic contfrac]; };
 hypervolume = derive { name="hypervolume"; version="1.2.2"; sha256="1nc5hybw5aa5pdrf9j1jv6d69q1im7whz0d05rmyskcayy2x3pyi"; depends=[Rcpp rgl MASS geometry pdist Rcpp]; };
 hypothesestest = derive { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; };
-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.2"; sha256="0py83q8fcrh0kjysvljx22b7s2gsccq19rzvwf3alq8vl59sm48i"; depends=[Rcpp msm Rcpp RcppArmadillo]; };
@@ -3871,13 +3935,13 @@ ifa = derive { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk78
 ifs = derive { name="ifs"; version="0.1.4"; sha256="0fzani8rnn4rdwlghq967hhi4zfjnk3gwpk3v6wys738xj7yfwp1"; depends=[]; };
 ifultools = derive { name="ifultools"; version="2.0-1"; sha256="16lrmajyfa15akgjq71w9xlfsr4y9aqfw7y0jf6gydaz4y6jq9b9"; depends=[splus2R MASS]; };
 igraph = derive { name="igraph"; version="0.7.1"; sha256="1nvb30zjjw861idbd8zap9qqg22k87zdi6qqvjf1s29v7hkx7kq7"; depends=[Matrix]; };
-igraphdata = derive { name="igraphdata"; version="0.2"; sha256="0hm757fc2snqlav3wx1vdmwy2gr5cskig97c2zlvk88sfwgx4i2m"; depends=[]; };
+igraphdata = derive { name="igraphdata"; version="0.2.2"; sha256="0lmgz9zglz0rn0iyjs9kdcm1xp09kh21sv91wnj74666jp0wsg4x"; depends=[]; };
 igraphtosonia = derive { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
 ihs = derive { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
 iki_dataclim = derive { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[zoo lubridate climdex_pcic PCICt]; };
 ilc = derive { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[demography rainbow forecast date survival]; };
 imguR = derive { name="imguR"; version="1.0.0"; sha256="0yhlir0qxi6hjmqlmmklwd4vkymc5bzv9id9dlis1fr1f8a64vwp"; depends=[RCurl httr png jpeg]; };
-import = derive { name="import"; version="1.0.1"; sha256="14frkzjll9jj7cxlsvvcrrzpicx25mn90zz4rbm568ai5k9gsa5g"; depends=[]; };
+import = derive { name="import"; version="1.0.2"; sha256="1m6xnj08faf5ahb0ga4z13x3pwhvw2gh4wg72m9wcfcyr0rp74lx"; depends=[]; };
 imprProbEst = derive { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
 imputeLCMD = derive { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[tmvtnorm norm]; };
 imputeMDR = derive { name="imputeMDR"; version="1.1.2"; sha256="0ds5a4wav9vb9z5nji8hv5l76310rd970xf702fd0ckx1sh6rgd7"; depends=[]; };
@@ -3899,7 +3963,7 @@ informR = derive { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrj
 infotheo = derive { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; };
 infra = derive { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; };
 infutil = derive { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; };
-inline = derive { name="inline"; version="0.3.13"; sha256="1dijlcnm7wfd6jgy6wsj6imwg43f91cl7iiz5j2jhhavw2pczr62"; depends=[]; };
+inline = derive { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
 inlinedocs = derive { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
 insideRODE = derive { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve nlme lattice]; };
 insol = derive { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
@@ -3912,7 +3976,8 @@ intcox = derive { name="intcox"; version="0.9.3"; sha256="1m1lzmymh2pk570k6nxq3n
 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]; };
-interpretR = derive { name="interpretR"; version="0.2.0"; sha256="1wbsyaw6n89is3gw8na92axads7lp8z2bsdrvxg14nzknl9nsr3q"; depends=[randomForest AUC]; };
+internetarchive = derive { name="internetarchive"; version="0.1.2"; sha256="08gbkqbzx963c1jy3a540fsd0ff9ylr7la1clwjn46lp4cc4yv1h"; depends=[httr jsonlite dplyr]; };
+interpretR = derive { name="interpretR"; version="0.2.1"; sha256="02k1a864ldb6ych76vk0rdpv8idxpjynwhdh0d85y013xi5fsc3k"; depends=[randomForest AUC]; };
 interval = derive { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[survival perm MLEcens]; };
 intervals = derive { name="intervals"; version="0.15.0"; sha256="0lvxaq5ia7hj65n00awz454a2vdxpskxjw45wsakgh0sc60hk8yz"; depends=[]; };
 interventionalDBN = derive { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; };
@@ -3920,7 +3985,7 @@ intpoint = derive { name="intpoint"; version="1.0"; sha256="0zcv64a0clgf1k3ylh97
 introgress = derive { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[nnet genetics RColorBrewer]; };
 intsvy = derive { name="intsvy"; version="1.6"; sha256="1bv8qap3d8yssfm80ilrn6wg3207hiy34sd92wl64bwpvqyi6i7p"; depends=[memisc foreign plyr ggplot2 reshape]; };
 invGauss = derive { name="invGauss"; version="1.1"; sha256="0l93pk2sh74dd6a6f3970nval5p29sz47ynzqnphx0wl3yfmmg9c"; depends=[survival optimx]; };
-investr = derive { name="investr"; version="1.2.1"; sha256="1gz709zfcf85rchjpi85pzki3a0ibvwhnxickcxsj07knklc4a6d"; depends=[nlme]; };
+investr = derive { name="investr"; version="1.3.0"; sha256="057wq6c5r7hrg1nz7460alsjsk83cvac2d1d4mjjx160q3m0zcvj"; depends=[nlme]; };
 io = derive { name="io"; version="0.2.2"; sha256="07vifr1h8ldiam8ngp6yrx6mvdnmmnnsq3hcs2pyphws6hgdmwwh"; depends=[filenamer stringr]; };
 ionflows = derive { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[]; };
 iosmooth = derive { name="iosmooth"; version="0.91"; sha256="03kyzhcl5lipaiajs53dc8jaazxv877nl0njbq88cp4af3gd6s82"; depends=[]; };
@@ -3937,7 +4002,7 @@ irr = derive { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27
 irtProb = derive { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
 irtoys = derive { name="irtoys"; version="0.1.7"; sha256="11nz675haigs6vg08qjibs8yccy2pbz0b9r8761fs8gw3n7bpfz4"; depends=[sm ltm]; };
 irtrees = derive { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
-isa2 = derive { name="isa2"; version="0.3.3"; sha256="0czviglmbb7hmhghrg4hla4xhbjr98a5ivqkbq70rnfmqzffcxcz"; depends=[]; };
+isa2 = derive { name="isa2"; version="0.3.4"; sha256="12qbfvcj8whhy7d68l7ra5wnkpx87ldl6mir7r5n8afb3fkww0kp"; depends=[lattice]; };
 isdals = derive { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; };
 isingLenzMC = derive { name="isingLenzMC"; version="0.2.3"; sha256="1rkry39yhxvq3ypnnxgdv15kd5w0l5w56ywmkcsgkwlxdfrvlyn2"; depends=[]; };
 ismev = derive { name="ismev"; version="1.40"; sha256="1isxgq62q6dk50c3w1l0j4nfgwsj6c2wnx2sm3ncxzlqml0ih6jn"; depends=[mgcv]; };
@@ -3976,10 +4041,10 @@ joineR = derive { name="joineR"; version="1.0-3"; sha256="0q98nswbxk5dz8sazzd66j
 joint_Cox = derive { name="joint.Cox"; version="1.0"; sha256="1460i8ydwd0ix3slm9bn8jca5b1vs0w2wwx1md4npbmf5ly5x42l"; depends=[]; };
 jointDiag = derive { name="jointDiag"; version="0.2"; sha256="0y1gzrc79vahfhn4jrj5xys8pmkzxj4by7361730gi347f0frs0a"; depends=[]; };
 jointPm = derive { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
-jomo = derive { name="jomo"; version="0.1-2"; sha256="1d5bqcxbl5zpy3lqmf8k2khbwislf7smw9fknlgb99sf5p3w9ca0"; depends=[]; };
+jomo = derive { name="jomo"; version="0.2-0"; sha256="09vccbvy9y5p5w049l2v5qr1xbs915sihpddnrrjr4cc1w17ifzs"; depends=[]; };
 jpeg = derive { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
 js = derive { name="js"; version="0.2"; sha256="1dxyyrmwwq07l6pdqsvxscpciy4h1021h9ymx8hi2vqvv0mdrz76"; depends=[V8]; };
-jsonlite = derive { name="jsonlite"; version="0.9.14"; sha256="1dshp8c0a6mfn401s20jlab86jd86bb0fcfswcyjdm39y8sd81fz"; depends=[]; };
+jsonlite = derive { name="jsonlite"; version="0.9.16"; sha256="12whrj9shnf8wd3a5yi9zcvinhgvik9nb2wp6202j869jdwxq5ym"; depends=[]; };
 jtrans = derive { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
 kSamples = derive { name="kSamples"; version="1.0.1"; sha256="11qylllwpm3rhrzmdlkbdqixpmx4qlvgmfwp9s4jfy5h3q68mfw7"; depends=[SuppDists]; };
 kappaSize = derive { name="kappaSize"; version="1.1"; sha256="0jrjal8cvy2yg0qiyilmv3jl3ib5k9jg8gp2533kdsx4m0sack04"; depends=[]; };
@@ -4012,17 +4077,18 @@ kmi = derive { name="kmi"; version="0.5.1"; sha256="0519mi7kwrsfpili7y8nmyiky6qw
 kml = derive { name="kml"; version="2.2"; sha256="1g8wgmvs31r3hp7y8n9pkxc9qy5fxvb3nicmzgacmghaiwbwc8g3"; depends=[clv longitudinalData]; };
 kml3d = derive { name="kml3d"; version="2.2"; sha256="1n94kfi49rgb9149bgc9043f0y5xpaclmfjr8fkwairqz5nnmgbv"; depends=[clv rgl misc3d longitudinalData kml]; };
 kmlcov = derive { name="kmlcov"; version="1.0.1"; sha256="09s9ganfsnwp22msha78g6pjr45ppyfyqjf6ci64w3w15q5qlcd9"; depends=[]; };
+kmodR = derive { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; };
 knitcitations = derive { name="knitcitations"; version="1.0.5"; sha256="1a9lw9gdb31akdwiif5xzbs4s0s9xkhm3n735xnkiyc9n6afwzn3"; depends=[RefManageR digest httr]; };
 knitr = derive { name="knitr"; version="1.9"; sha256="17kwz14n16c3zjrpvm3c6rfn501gwlzgiikzwmc6krxvxafghik9"; depends=[evaluate digest formatR highr markdown stringr]; };
 knitrBootstrap = derive { name="knitrBootstrap"; version="0.9.0"; sha256="1cw5dvhjiypk6847qypxphfl9an54qjvd6qv029znhwijsg56mmg"; depends=[knitr markdown]; };
 knnGarden = derive { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; };
 knnIndep = derive { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; };
 knncat = derive { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; };
-knockoff = derive { name="knockoff"; version="0.2"; sha256="06aq5xp86bnrnwx5hznsr3rxnd19hxc3b53a8iwr00d1hx6mi6ap"; depends=[glmnet RJSONIO]; };
+knockoff = derive { name="knockoff"; version="0.2.1"; sha256="197icnyxxmi6f0v0p2zm4910grbgkfjkd3xql79ny04ik047v0kp"; depends=[glmnet RJSONIO]; };
 koRpus = derive { name="koRpus"; version="0.05-5"; sha256="03rw0yb67y652j8hcr5m4c0py0rr3gp87y0hdxpypd81rkikwhfm"; depends=[]; };
 kobe = derive { name="kobe"; version="1.3.2"; sha256="1z64jwrq6ddpm22cvk2swmxl1j7qyz0ddk3880c7zfq6gk7f9bxl"; depends=[plyr reshape ggplot2 MASS emdbook coda]; };
 kofnGA = derive { name="kofnGA"; version="1.1"; sha256="1ykk3rmyrv8c556rl3wp0i1d522dghaq4qk5acg06hhk9j9962fg"; depends=[]; };
-kohonen = derive { name="kohonen"; version="2.0.15"; sha256="1mamn6lwnd54jw7bbxgrxj511abn9wg5rxrm9fac7jndf00kjaim"; depends=[class MASS]; };
+kohonen = derive { name="kohonen"; version="2.0.18"; sha256="08inl7rx30gjpqbdbhccy65bingimzgi4lckfvs0r6lba04a1f8l"; depends=[class MASS]; };
 kolmim = derive { name="kolmim"; version="0.2"; sha256="1cq1miny83shxas4zijcbzcnxv29vjyxj3pip8brf52sjvrj4max"; depends=[]; };
 kpodclustr = derive { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; };
 kriging = derive { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; };
@@ -4061,13 +4127,13 @@ lasso2 = derive { name="lasso2"; version="1.2-19"; sha256="0zkwjsd42a6z4gylq9xbs
 lassoscore = derive { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
 lassoshooting = derive { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
 latdiag = derive { name="latdiag"; version="0.2-1"; sha256="1xjy6as3wjrl2y1lc5fgrbhqqcvrhdan89mpgvk9cpx71wxv95vc"; depends=[]; };
-latentnet = derive { name="latentnet"; version="2.6.0"; sha256="0aw184r1w28d4lmznnx4hp8kwws0r13fmbx1wlsbg3zagmwwjn8d"; depends=[statnet_common network ergm sna mvtnorm abind coda]; };
-lattice = derive { name="lattice"; version="0.20-30"; sha256="10985l95p7mx403kz3pc8j5iqfsb1zz7w6hsw53xwd436ykf132j"; depends=[]; };
+latentnet = derive { name="latentnet"; version="2.7.0"; sha256="0g0a2s00f6rc9r6vmwm32489qqiwihcllmypc2wgqwayfmy8innn"; depends=[statnet_common network ergm sna mvtnorm abind coda]; };
+lattice = derive { name="lattice"; version="0.20-31"; sha256="1b3m3rg1zd8ssk5jjswk5y93js89vh6939kfajh6i6wphndxigb1"; depends=[]; };
 latticeDensity = derive { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[splancs spdep spatstat spam]; };
 latticeExtra = derive { name="latticeExtra"; version="0.6-26"; sha256="16x00sg76mga8p5q5ybaxs34q0ibml8wq91822faj5fmg7r1050d"; depends=[RColorBrewer lattice]; };
 lava = derive { name="lava"; version="1.4.0"; sha256="0zf62xk2j1gbwxqglq6lsxs3f7fb0hynnlfh1w870xz8imgf20yp"; depends=[numDeriv]; };
 lava_tobit = derive { name="lava.tobit"; version="0.4-7"; sha256="1da98d5pndlbbw37k64fmr2mi1hvkhjxsmm3y9p4b772pz9i1pvj"; depends=[lava mvtnorm survival]; };
-lavaan = derive { name="lavaan"; version="0.5-17"; sha256="0rb9bra1nzsbrvvjwcj5vh7l689wdvaq1r86r85919b6n3x38v4b"; depends=[MASS mnormt pbivnorm quadprog]; };
+lavaan = derive { name="lavaan"; version="0.5-18"; sha256="0ih5wvhmxln3w5h7q5w6gsmbs3w8118l9hc2afgsnzpg8a5jy1n3"; depends=[MASS mnormt pbivnorm quadprog]; };
 lavaan_survey = derive { name="lavaan.survey"; version="1.1"; sha256="1vscv165kilkc00pgs2s9qn404l3rv45zc9kzmrghxz42jsy04zc"; depends=[lavaan survey MASS Matrix]; };
 lawstat = derive { name="lawstat"; version="2.5"; sha256="01y00jfapmh3bmrmz740flkahw0b8im8sp5ac8hsp4pf9k09cvws"; depends=[mvtnorm VGAM Kendall Hmisc]; };
 lazy = derive { name="lazy"; version="1.2-15"; sha256="1pdqgvn0qpfg5hcg5159ccf5qj2nd1ibai9p85rwjpddfynk6jks"; depends=[]; };
@@ -4081,13 +4147,13 @@ lbiassurv = derive { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j3
 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]; };
 lcmm = derive { name="lcmm"; version="1.7.2"; sha256="1sg5vx3nx8ik5z2c2pi3p9h5b5k0z7m1jc404jkv3gr17nilcp4i"; depends=[survival]; };
-lctools = derive { name="lctools"; version="0.1-3"; sha256="1wn9qymbcq9q99xnjbk3qswrfljvfqqhihvgr0brbpq3pbbxh55x"; depends=[reshape weights]; };
+lctools = derive { name="lctools"; version="0.2-2"; sha256="0yf30gjqp7adjw0l129xzmaj2wmc6hbqhdw35dfwwcxk5nys5dq0"; depends=[reshape weights]; };
 lda = derive { name="lda"; version="1.3.2"; sha256="1iizsksp8wz34ji7p2kc6npxz9rzhs6217793nfri6y6mq23vs8z"; depends=[]; };
 ldbounds = derive { name="ldbounds"; version="1.1-1"; sha256="15ixrq615x64zmi6dryq3ww0dqxd0qf5xx1bs3w934sf99l46bhs"; depends=[lattice]; };
 ldlasso = derive { name="ldlasso"; version="3.2"; sha256="0ij68zvgm8dfd2qwx6h6ygndac29qa0ddpf11z959v06n8jsnk11"; depends=[GenABEL quadprog]; };
 ldr = derive { name="ldr"; version="1.3.3"; sha256="1c48qm388zlya186qmsbxxdcg1mdv3nc3i96lqb40yhcx2yshbip"; depends=[GrassmannOptim Matrix]; };
 leaderCluster = derive { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; };
-leafletR = derive { name="leafletR"; version="0.3-1"; sha256="1jgmjm4f91saq2cjfgi240zz3i1r1nfb267i0gj15k2nak6ng86j"; depends=[brew jsonlite]; };
+leafletR = derive { name="leafletR"; version="0.3-2"; sha256="183qrfmcanb4c5n3w0vd9xb5mcygjfjc4qr1mzz5jxgjd039g28n"; depends=[brew jsonlite]; };
 leapp = derive { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[MASS corpcor]; };
 leaps = derive { name="leaps"; version="2.9"; sha256="1ax9v983401hvb6cdswkc1k7j62j8yk6ds22qdj24vdidhdz5979"; depends=[]; };
 learningr = derive { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
@@ -4096,7 +4162,7 @@ leiv = derive { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8
 lessR = derive { name="lessR"; version="3.3"; sha256="0hzvf85x81p5lcszrpf897azh4fgpij2zyk0z5icma67aifdf5bf"; 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.1-1640"; sha256="1l0y64rk58x40nrz7xl17cc672hf4q7yz77r2f5blgmxjg769pj5"; depends=[Matrix Formula xtable]; };
+lfe = derive { name="lfe"; version="2.2-1699"; sha256="1a2y4f25isvnvk0yg6j36s729makr8b1bzwivx4x67aqg8fd09rv"; depends=[Matrix Formula xtable]; };
 lfl = derive { name="lfl"; version="1.0"; sha256="10ypsnzjzygihz019clwnf3gv5b64d873231pjkp772k1n3wgv9a"; depends=[Rcpp foreach forecast plyr tseries e1071 zoo Rcpp]; };
 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]; };
@@ -4176,6 +4242,7 @@ logspline = derive { name="logspline"; version="2.1.5"; sha256="18hpzcg71v3zjzp9
 lokern = derive { name="lokern"; version="1.1-6"; sha256="0iixxs23zsb0qadppcwmwf6vbxcjnm8zmwyz1xkkmhrpp06sa3jw"; depends=[sfsmisc]; };
 lomb = derive { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
 longCatEDA = derive { name="longCatEDA"; version="0.17"; sha256="1yb0117ycj4079590mrx3lg9m5k7xd1dhb779r3rmnww94pmvja9"; depends=[]; };
+longclust = derive { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; };
 longitudinal = derive { name="longitudinal"; version="1.1.11"; sha256="0rzi177v9k6gy1wv06vf81r1q0ml81ssf83v0z8rpmx5j91d71ac"; depends=[corpcor]; };
 longitudinalData = derive { name="longitudinalData"; version="2.2"; sha256="1kdgnkhk39a9r4fq6zmrvzcvs7qjd21knpzfjglxyx723r9p3fs7"; depends=[clv class rgl misc3d]; };
 longmemo = derive { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
@@ -4183,7 +4250,7 @@ longpower = derive { name="longpower"; version="1.0-11"; sha256="1l1icy653d67wlv
 loop = derive { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
 lordif = derive { name="lordif"; version="0.2-2"; sha256="0898k5w9wky318k8x0zknjqdzdify0yyrnb1506j341l4n1bm04s"; depends=[MASS msm mvtnorm polycor sfsmisc ltm Hmisc rms]; };
 lorec = derive { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; };
-lpSolve = derive { name="lpSolve"; version="5.6.10"; sha256="0hrgac5gfihhk4spy5smwgnawgn5nbv7aydb1w28lgd46a4zldvc"; depends=[]; };
+lpSolve = derive { name="lpSolve"; version="5.6.11"; sha256="0mgpns9wflqaz9ynwxwkvmc1694yhf275wgrqfjfy3qxz1hxq7s0"; depends=[]; };
 lpSolveAPI = derive { name="lpSolveAPI"; version="5.5.2.0-14"; sha256="1ffmb9xv6m25ii4n7v576g8xw31qlsxd99ka8cjdhqs7fbr4ng5x"; depends=[]; };
 lpc = derive { name="lpc"; version="1.0.2"; sha256="1r6ynkhqjic1m7fqrqsp7f8rpxqih5idn4j96fqrdj8nj01znv29"; depends=[]; };
 lpint = derive { name="lpint"; version="2.0"; sha256="0p1np8wlfbax0c7ysc5fs9dai8s00h1v0gan89dbd6bx06307w2r"; depends=[]; };
@@ -4210,9 +4277,9 @@ ltsbase = derive { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jf
 ltsk = derive { name="ltsk"; version="1.0.3"; sha256="17l4mwggd4s39l6x1b6gvwgd6gjl0h37wfis1i6l9k6hiaqhb6vr"; depends=[fields]; };
 lubridate = derive { name="lubridate"; version="1.3.3"; sha256="1f07z3f90vbghsarwjzn2nj6qz8qyfkqalszx8cb5kliijdkwy8z"; depends=[plyr stringr memoise]; };
 luca = derive { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[survival genetics]; };
-lucid = derive { name="lucid"; version="1.1"; sha256="1dywjl9zhmaqbhmsazdffhnnjbdcsgrzw54c0im23jz22jq8jw52"; depends=[nlme]; };
+lucid = derive { name="lucid"; version="1.2"; sha256="1rvc5d7sb0bcncw79g13i1rxjicngbpln9hq0qfdi7yx9hhrdpnz"; depends=[nlme]; };
 lunar = derive { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; };
-lvm4net = derive { name="lvm4net"; version="0.1"; sha256="0b140jybn6jpr1qh3s84vg0ba34356vc8pa4v2zfp9ggipfl073b"; depends=[ergm ellipse igraph]; };
+lvm4net = derive { name="lvm4net"; version="0.2"; sha256="0al0answp3rngq69bl3ch6ylil22wdp1c047yi5gbga853p7db0c"; depends=[MASS ergm network ellipse igraph]; };
 lxb = derive { name="lxb"; version="1.3"; sha256="0mvjk0s9bzvznjy0cxjsqv28f6jjzvr713b2346ym4cm0y4l3mir"; depends=[]; };
 lymphclon = derive { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[MASS expm corpcor]; };
 m4fe = derive { name="m4fe"; version="0.1"; sha256="06lh45591z2lc6lw91vyn066x0m1zwxxfp6nbirp1rz901v843ph"; depends=[]; };
@@ -4241,13 +4308,13 @@ manipulate = derive { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf
 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]; };
-mapfit = derive { name="mapfit"; version="0.9.6"; sha256="1mfw4ihshf3lc3xfdyh2rawaqly7kynncda4j35si080ygk23aj5"; depends=[Matrix]; };
-mapmisc = derive { name="mapmisc"; version="1.1.3"; sha256="10i99rd6ds1dr0b741sin43kkj6v7d4mky653kcz3mqq5904wnns"; depends=[sp raster]; };
+mapfit = derive { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
+mapmisc = derive { name="mapmisc"; version="1.2.1"; sha256="1sds83cbsdfb6ac2y13fy1lm7bi27qzkkpjv1cjml8yjwcazfbfj"; depends=[sp raster]; };
 mapplots = derive { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
 mapproj = derive { name="mapproj"; version="1.2-2"; sha256="1fdb72hvcp6jm7rhvs8zdkya6ifs92lfqnmq5vj5amwckkxfidc6"; depends=[maps]; };
 maps = derive { name="maps"; version="2.3-9"; sha256="1gzy81sl4vpr4hsnh4jsp5rd26jdkzsw99qxwfmbadjyf55q06wv"; depends=[]; };
 maptools = derive { name="maptools"; version="0.8-34"; sha256="1ii4vgapdbf0i9f71agfmv85lmw1da686igw1252kgfrbf2mjdfw"; depends=[sp foreign lattice]; };
-maptpx = derive { name="maptpx"; version="1.9-1"; sha256="1yrlgz5bkjjs3m59dqp60n95lax0fp7xw00v59kymmw5hr3sis6f"; depends=[slam]; };
+maptpx = derive { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
 maptree = derive { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
 mar1s = derive { name="mar1s"; version="2.1"; sha256="0psjva7nsgar5sj03adjx44pw0sdqnsd96m4g6k8d76pv30m1g7l"; depends=[cmrutils fda zoo]; };
 marelac = derive { name="marelac"; version="2.1.4"; sha256="0mm1rmaxrbhk6r9z62ns832p2q9fajq0jpvd3if3rg2wgdbb1505"; depends=[shape seacarb]; };
@@ -4258,7 +4325,7 @@ markovchain = derive { name="markovchain"; version="0.1.1"; sha256="1y4f4xf8557j
 marmap = derive { name="marmap"; version="0.9.2"; sha256="1csi6v6z2p3nmyqwy8bmbj036693rzmxrc317g0a45gsqxggp3n4"; depends=[DBI RSQLite gdistance geosphere sp raster ncdf plotrix shape reshape2 adehabitatMA ggplot2]; };
 marqLevAlg = derive { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
 matR = derive { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[MGRASTer BIOM_utils]; };
-matchingMarkets = derive { name="matchingMarkets"; version="0.1-2"; sha256="02hx8q13n0l2880480vfkizlz6i1l78q95kn08c4mnnqd0jglifv"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo]; };
+matchingMarkets = derive { name="matchingMarkets"; version="0.1-3"; sha256="1q76sw77r90m8wrzj2d81w0fnkqfg8fz5sgpc7m64c5if82z3awa"; depends=[Rcpp lpSolve partitions Rcpp RcppArmadillo RcppProgress]; };
 mathgraph = derive { name="mathgraph"; version="0.9-11"; sha256="0xikgzn24p0qqlrmaydmjk5yz5pq2rilsvpx86n3p2k2fc3wpwjy"; depends=[]; };
 matie = derive { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[dfoptim mvtnorm seriation igraph gplots cba]; };
 matlab = derive { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
@@ -4286,7 +4353,7 @@ mcgibbsit = derive { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh469
 mcheatmaps = derive { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
 mcll = derive { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[statmod locfit]; };
 mclogit = derive { name="mclogit"; version="0.3-1"; sha256="0zyms6v9qjh6a5ccahfanarp4sg49yingb8wpjcz61skqvm8j7qx"; depends=[Matrix]; };
-mclust = derive { name="mclust"; version="4.4"; sha256="1xwk5w3nzwmwavn1ni53bnhf3klvy65c05819j1aqa6dna1j1jkq"; depends=[]; };
+mclust = derive { name="mclust"; version="5.0.0"; sha256="0ny6px5qf4ks16l19m7ffzibvcgsylih96cxs3wnw4rnhglilvwh"; depends=[]; };
 mcmc = derive { name="mcmc"; version="0.9-3"; sha256="148l28nb1qv82x2hj46c26yhn0lw8x5jsrp2dav9sbysv1bdj2f8"; depends=[]; };
 mcmcplots = derive { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda sfsmisc colorspace denstrip]; };
 mcmcse = derive { name="mcmcse"; version="1.0-1"; sha256="1jn5hl6aw83qmwccyfmcsvcymx9cp4d3qnfzzqvlw22x26rx88r6"; depends=[]; };
@@ -4299,7 +4366,7 @@ mdatools = derive { name="mdatools"; version="0.6.0"; sha256="13pfzr3lvqifln9lzd
 mded = derive { name="mded"; version="0.1-1"; sha256="1r2sjg661abzsbqdyq2mlyacnv5rd60jfg2156cq5qyknxkin01m"; depends=[]; };
 mdscore = derive { name="mdscore"; version="0.1-2"; sha256="1g473rwffkb2x6y6wcm98i6xr5dhz11ypnbrvhb2klbvi81jj511"; depends=[MASS]; };
 mdsdt = derive { name="mdsdt"; version="1.0"; sha256="0ngf2p6lm32124qyfh18zlgf0dipj3njn6d0m8f192563kp50q0p"; depends=[ellipse mnormt polycor]; };
-measuRing = derive { name="measuRing"; version="0.1"; sha256="1nlsxrld6dsqv4cyssjpva2hh38csyjr52bpgrvrh1kdjd951qrc"; depends=[tiff zoo pastecs]; };
+measuRing = derive { name="measuRing"; version="0.3"; sha256="16lgvk9lm0vjy50das0qq0h0z683hh94spjcdmkljmxxzwmzfl4b"; depends=[pastecs png tiff]; };
 meboot = derive { name="meboot"; version="1.4-5"; sha256="1h33f3dpx906q5nmd57hhkq07mbs2kg8mv6mi4imaa2zpr5vc4py"; depends=[dynlm nlme]; };
 medSTC = derive { name="medSTC"; version="1.0.0"; sha256="1f7w6jbxairqvghr5b7vgdllg3ian16a1fgi7vqlq0mhy2j6phan"; depends=[]; };
 mederrRank = derive { name="mederrRank"; version="0.0.7"; sha256="08jbqmb418qb7v2x6lm4wig1pfzzfx6fhb49mbfhlkbmssbqsjfq"; depends=[BB numDeriv]; };
@@ -4323,7 +4390,7 @@ metaMA = derive { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4n
 metaMix = derive { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table Matrix gtools Rmpi ggplot2]; };
 metaRNASeq = derive { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
 metabolomics = derive { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots]; };
-metacom = derive { name="metacom"; version="1.4.2"; sha256="1vb8qyilwvqb6b5sxqlmbw25r12q8f5h0mqbh3mbcmr0zarb35ql"; depends=[devtools vegan lattice]; };
+metacom = derive { name="metacom"; version="1.4.3"; sha256="0djq2ry2vriayn839f0pgkq4j8j1zyd8ribmzn6ngfhz305fszlq"; depends=[devtools vegan lattice]; };
 metacor = derive { name="metacor"; version="1.0-2"; sha256="04k3ph0yg3jp8x4g6l1h4m0qwl51mx0626xmm0fzr1pv4b4a1ypw"; depends=[rmeta gsl]; };
 metafolio = derive { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[Rcpp plyr colorspace MASS Rcpp RcppArmadillo]; };
 metafor = derive { name="metafor"; version="1.9-5"; sha256="1ayvkm57c7s91m9kcsdax0fk61v0kvsbgaymlzg1sgsxkgnwcgj4"; depends=[Matrix]; };
@@ -4339,13 +4406,13 @@ mets = derive { name="mets"; version="1.1.0"; sha256="0nfyfmhcd4sy2j1nymgw4yz0b5
 mewAvg = derive { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
 mfp = derive { name="mfp"; version="1.5.1"; sha256="0flqrvicgks7nxxijhndshpf541drlgqjidm3nql1bg5hnpc5fcq"; depends=[survival]; };
 mfx = derive { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[sandwich lmtest MASS betareg]; };
-mgcv = derive { name="mgcv"; version="1.8-5"; sha256="133w7x0bys5dhsavfzh3h6gwgji0bbg2s22lgrrzigzgx65m9bfw"; depends=[nlme Matrix]; };
+mgcv = derive { name="mgcv"; version="1.8-6"; sha256="0605cqrbk26zg8s8qdd8kqwq56wihx7r6hfzr4x0xzk4y1g0m2rq"; depends=[nlme Matrix]; };
 mgpd = derive { name="mgpd"; version="1.99"; sha256="0cxpgza9i0hjm5w1i5crzlgh740v143120zwjn95cav8pk8n2wyb"; depends=[evd numDeriv corpcor fields]; };
 mgraph = derive { name="mgraph"; version="1.03"; sha256="0av2c0jvqsdfb3i0s0498wcms0n2mm0z3nnl98mx2fy7wz34z8b2"; depends=[rgdal]; };
 mhsmm = derive { name="mhsmm"; version="0.4.14"; sha256="1zrqnzbmlk3kmwbq9rl4bdkc9iawkgn3qr7nzsa782v55i7w2wiz"; depends=[mvtnorm]; };
-mht = derive { name="mht"; version="3.0.11"; sha256="1d1ca3jp5q9xmnlnjsqi247vz6gm25bb8x5lzwd6z0n87lv26n1k"; depends=[glmnet]; };
+mht = derive { name="mht"; version="3.1.2"; sha256="01zcaf9k0qayzm8dn5dvnm5n3qgqpj8r96qhqaa5vbjcr6ci2x2r"; depends=[glmnet Matrix]; };
 mhurdle = derive { name="mhurdle"; version="1.0-1"; sha256="1x631fgbq3ika05svyavzadyjd7vi9bcmsgb58wfhpf9xq6j5rcr"; depends=[Formula truncreg maxLik pbivnorm]; };
-mi = derive { name="mi"; version="0.09-19"; sha256="1r3b6mm3pr95lb52m2vynmg0l2wy80hznjq2rff1qwplbq1pl04n"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS]; };
+mi = derive { name="mi"; version="0.10-2"; sha256="01dyrxq37cm3xs4j178zn4b4xsjqnbjkpzn70pgk8ciis9158k43"; depends=[arm abind car foreign lme4 MASS Matrix nnet R2WinBUGS nlme]; };
 miRada = derive { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
 miRtest = derive { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor MASS RepeatedHighDim]; };
 micEcon = derive { name="micEcon"; version="0.6-12"; sha256="1kxhr3qqgswq8glrjfcjz0hyb163lwf303yhwlgrwjciqgp5dq17"; depends=[miscTools]; };
@@ -4362,10 +4429,10 @@ midasr = derive { name="midasr"; version="0.4"; sha256="190qliv7v80rr3jh9yvchwl3
 migest = derive { name="migest"; version="1.6"; sha256="1mjjcba74nk10kdbsaphih3zdyaqmf02hrv13s34klwdwkp3nv0m"; depends=[]; };
 migration_indices = derive { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; };
 migui = derive { name="migui"; version="0.00-09"; sha256="0mrvsls9q039pay0vf59xwg6bbr7ahwl4x3iwvar6sbfg8606as8"; depends=[tkrplot mi foreign]; };
-mime = derive { name="mime"; version="0.2"; sha256="0kg1wwxh7v7b7wqbxf47ngy978hc2a9nknwra5racpd2gzyg3ghn"; depends=[]; };
+mime = derive { name="mime"; version="0.3"; sha256="1i9f9z88cahvb5whdgmp0ipk0b9glk0xn8ik519vzpydnn1slvxk"; depends=[]; };
 minPtest = derive { name="minPtest"; version="1.7"; sha256="088kckpbfy2yp0pk3zrixrimywrvkaib5ywa7fkr5phnzlsl80sv"; depends=[scrime Epi]; };
 minerva = derive { name="minerva"; version="1.4.1"; sha256="0dg5xnl9srdvid49na8478bnvagv0khiv6hl7z8gw6m745681i89"; depends=[]; };
-miniCRAN = derive { name="miniCRAN"; version="0.1-1"; sha256="0azyv5wcl4dk1z4j6pq26y7h7f9lvq6m198dj4aa142k9smxfrnw"; depends=[XML httr igraph]; };
+miniCRAN = derive { name="miniCRAN"; version="0.2.4"; sha256="1p8kypq0r4sckvdq7qfznfjp3mpjy3cvm9dnwpdfn4dnl4n377z0"; depends=[XML httr]; };
 miniGUI = derive { name="miniGUI"; version="0.8.0"; sha256="1iq52x7wbcin7ya207jj3k9vym7mavm5z61vggyabdmr768pci39"; depends=[]; };
 minimax = derive { name="minimax"; version="1.0"; sha256="1g0d9q5h1avbb0yg7ajw5330820i3n5cgkpsif754l4j3ikya8p3"; depends=[]; };
 minimist = derive { name="minimist"; version="0.1"; sha256="007y829d766b1v6wkrhk7pkg99r38bvmhc8bwvs8rs13dr7444ln"; depends=[V8]; };
@@ -4373,8 +4440,8 @@ minpack_lm = derive { name="minpack.lm"; version="1.1-8"; sha256="0nvsxqwg3k9k3d
 minqa = derive { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp Rcpp]; };
 minque = derive { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
 minxent = derive { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
-mipfp = derive { name="mipfp"; version="1.5"; sha256="1hjayf9m0qp5m67ndq6w03c6zgrh74jfhd7yzh1xhsnbsxi5iqi3"; depends=[cmm]; };
-mirt = derive { name="mirt"; version="1.8"; sha256="1lmq5nbh46ik97f6cf37iixzwws15rnpacaig7rv7bax23d6gcwc"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; };
+mipfp = derive { name="mipfp"; version="2.0"; sha256="1sh33lgvq31nk8vkl9p195v4z3whv2c1fc7bnhc8wxgglm6vc126"; depends=[cmm Rsolnp numDeriv]; };
+mirt = derive { name="mirt"; version="1.9"; sha256="0bav1ykmbw8d64l61iwd4ma2xz4y3z2wqx8ba63583rmbsynkkvk"; depends=[lattice GPArotation Rcpp sfsmisc numDeriv Rcpp]; };
 mirtCAT = derive { name="mirtCAT"; version="0.4.2"; sha256="133q6kdj8hkgfrby6sb9kdpmlk097zzwapb0nh2lnswyxfpl7s6w"; depends=[mirt shiny lattice Rcpp Rcpp RcppArmadillo]; };
 misc3d = derive { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
 miscF = derive { name="miscF"; version="0.1-2"; sha256="195rb9acdirfhap0z35yvcci5xn4j84mlbafki4l1vfgqgnh0ajj"; depends=[MCMCpack mvtnorm Rcpp RcppArmadillo Rcpp RcppArmadillo]; };
@@ -4422,7 +4489,7 @@ mlogit = derive { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ix
 mlogitBMA = derive { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[BMA abind maxLik]; };
 mlr = derive { name="mlr"; version="2.3"; sha256="0cvg2bxxw3c69lj5wy4ds54wn5h299c5mjcsbax1p0k408z5aa6z"; depends=[ParamHelpers BBmisc ggplot2 checkmate parallelMap plyr reshape2 survival]; };
 mlxR = derive { name="mlxR"; version="2.1.1"; sha256="13ddm4hhnjx7r058qlvvxn9npqa0vq6y5l1g0zrlhckjp7bpp90a"; depends=[ggplot2 XML Rcpp]; };
-mma = derive { name="mma"; version="1.0-0"; sha256="1xc138v2n0kyfjz9payps9wqamfmglvrs58ggf96wa6jp16gfcff"; depends=[gbm]; };
+mma = derive { name="mma"; version="1.0-1"; sha256="0xg3010fljc95as2jf777jd2qlrhzmpw1swm5hrjh4a2svkj1yf2"; depends=[gbm]; };
 mmand = derive { name="mmand"; version="1.1.0"; sha256="0awi9wxxalz81d6766djbjsk980n65dhz02fcqb69ifc7x80lc33"; depends=[reportr Rcpp Rcpp RcppArmadillo]; };
 mmap = derive { name="mmap"; version="0.6-12"; sha256="12ql03wzwj23h8lwd07rln6id44mfrgf9wcxn58y09wn3ky1rm6a"; depends=[]; };
 mmcm = derive { name="mmcm"; version="1.2-5"; sha256="193mlvl8fp5y2150m0xw5bhr7nkr4fgmwjbv1dg314a7ara42v4y"; depends=[mvtnorm]; };
@@ -4436,7 +4503,7 @@ mmod = derive { name="mmod"; version="1.2.1"; sha256="0c2ijg5116hacq0f18xhkbxank
 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=[]; };
+mnormt = derive { name="mnormt"; version="1.5-2"; sha256="0k3mj7yyh599z93iw8zhfwvj6xjl4g2wzs3hdj1df7vbz1yynp8i"; depends=[]; };
 modMax = derive { name="modMax"; version="1.0"; sha256="0p8vnlbw53lqbaq3819jhixq6ns2lwxf56w2md7y98rshf92h474"; depends=[gtools igraph]; };
 modTempEff = derive { name="modTempEff"; version="1.5.2"; sha256="00xdvc0i3p8wq913giy44w0xz07sa4bdgqpi7pmpbv2c5wj30pk1"; depends=[mgcv]; };
 modeest = derive { name="modeest"; version="2.1"; sha256="0l4y7yhkgsxycdd2lck0g8g6k2r059hwlrrcpl46md3rva4jgbnp"; depends=[]; };
@@ -4450,6 +4517,7 @@ mombf = derive { name="mombf"; version="1.5.9"; sha256="0lc3rrmm2vsa4mg2zkbhp5dp
 momentchi2 = derive { name="momentchi2"; version="0.1.0"; sha256="02k4hzhqmqh7sx7dzb6w84fc1f5523md3284y4gvdbaw9y34ayk8"; depends=[]; };
 moments = derive { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; };
 mondate = derive { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
+mongolite = derive { name="mongolite"; version="0.2"; sha256="0lyq565c8xqxcm5sbg1rp3myppbw4hbqr3fiqzvcqpp72ar6ywvv"; depends=[jsonlite]; };
 monitoR = derive { name="monitoR"; version="1.0.2"; sha256="1nrw8xrp99p62w4bpsbca9ahdra9cid1piidwhjc4f6vqsbkp479"; depends=[tuneR]; };
 monmlp = derive { name="monmlp"; version="1.1.2"; sha256="14x6xz07hg2c5n36rc314z66jqvgmicjxi2vsqyy91vwjxs9akrm"; depends=[]; };
 monomvn = derive { name="monomvn"; version="1.9-5"; sha256="1fh0c1234hb5f3rwy85i4rlzc3n1851q5mivckcjs2vdm9rz25mg"; depends=[pls lars MASS]; };
@@ -4478,12 +4546,13 @@ mpmi = derive { name="mpmi"; version="0.41"; sha256="1iwdhvdglsamzq18f0r5mh0anrd
 mpoly = derive { name="mpoly"; version="0.0.5"; sha256="1zhmd3lsa0n56yr3bdhg3r668zrmf35phm8g69c18a3rr5qmcdqg"; depends=[stringr rSymPy rJython rJava rjson partitions plyr]; };
 mppa = derive { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; };
 mpt = derive { name="mpt"; version="0.5-1"; sha256="1b6n7kivkj4ndcc27jmznx9dh40kvjjk7hfxh21kmnknl5ap4ffb"; depends=[]; };
+mra = derive { name="mra"; version="2.16.4"; sha256="134fw4bv34bycgia58z238acj7kb8jkw51pjfa2cwprrgsjdpf5g"; depends=[]; };
 mratios = derive { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
 mrds = derive { name="mrds"; version="2.1.12"; sha256="1v7lv3ssg9m8bx2gskzf31lkg3sxsdkvknrdx9aawdh3mzxwcys7"; depends=[optimx mgcv Rsolnp]; };
 mreg = derive { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; };
 mritc = derive { name="mritc"; version="0.5-0"; sha256="1344x7gc7wvmcqp0sydppavavvps5v7bs0dza2fr8rz3sn4as8sa"; depends=[lattice misc3d oro_nifti]; };
 msBP = derive { name="msBP"; version="1.0-2.1"; sha256="1yprhglqykh6v2jicab25a0ny1r49kaj3i04fspi3was2md2qbzd"; depends=[DPpackage]; };
-msSurv = derive { name="msSurv"; version="1.2-1"; sha256="1c6db2mymaflxys736vh0gdapwlnr2ld0nkj4wbcb7saw377g7v9"; depends=[class lattice]; };
+msSurv = derive { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; 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.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[Matrix MASS]; };
@@ -4526,6 +4595,7 @@ multispatialCCM = derive { name="multispatialCCM"; version="1.0"; sha256="1fzd91
 multitable = derive { name="multitable"; version="1.6"; sha256="067bgl793wwvb1rhan70ih0ga3dxja2c6zx7fwzml5rqi6p728pr"; 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]; };
+multiway = derive { name="multiway"; version="1.0-0"; sha256="1yp9cgi5pkby1qszc8qrw3pv8q254cr6grhmdlmaf2yrhmpfahv9"; depends=[]; };
 multiwayvcov = derive { name="multiwayvcov"; version="1.2.1"; sha256="15gxcrg2i1aqbxkif5dmdz81yzqj7a4hq0dcd0narzsvm5b4w9py"; depends=[sandwich boot]; };
 multxpert = derive { name="multxpert"; version="0.1"; sha256="03mvf4m0kabm22vy4zkj1cfh884larpj8cbgg3p9l3pag20snf1l"; depends=[mvtnorm]; };
 muma = derive { name="muma"; version="1.4"; sha256="0midx3wzyvcz8rk9kvsfll3xg41pkz40si4jw2ps54ykkf9rkm99"; depends=[car pdist pls gplots mvtnorm robustbase gtools bitops caTools pcaPP rrcov]; };
@@ -4533,9 +4603,9 @@ munfold = derive { name="munfold"; version="0.3-3"; sha256="1szm3c1xi1s7r1w6h7xb
 munsell = derive { name="munsell"; version="0.4.2"; sha256="1bi5yi0i80778bbzx2rm4f0glpc34kvh24pwwfhm4v32izsqgrw4"; depends=[colorspace]; };
 muscle = derive { name="muscle"; version="3.8.31-4"; sha256="0pijc8x6pwsb6z4061v1r7iwq5lsnia5qn1bikwpxy8ir19nic72"; depends=[]; };
 musicNMR = derive { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; };
-mutoss = derive { name="mutoss"; version="0.1-9"; sha256="170a9ibz6p9w7jkvv03003glrzk6z8jy1z9r4j7481qvrlyrgp6w"; depends=[mvtnorm plotrix multcomp]; };
+mutoss = derive { name="mutoss"; version="0.1-10"; sha256="1pijr3admnciiwdgxbdac4352m7h08jyvpj7vdd27yx07wp2rri3"; depends=[mvtnorm plotrix multcomp]; };
 mutossGUI = derive { name="mutossGUI"; version="0.1-9"; sha256="1xdby6n0w1155kx6mhinvgqm0ssgyy4443pkq3k88a5s4bfxw5bw"; depends=[mutoss multcomp plotrix rJava JavaGD CommonJavaJars JGR]; };
-mvMORPH = derive { name="mvMORPH"; version="1.0.3"; sha256="14z5bjkljna81hqp06d2jmincspflcb65z4gs5wklgzz3nz0sidm"; depends=[phytools ape corpcor subplex spam]; };
+mvMORPH = derive { name="mvMORPH"; version="1.0.4"; sha256="1071wcnbgrys9hmr2xv7aqsnzvaci2s15pf6b984w8mbr5drwix8"; depends=[phytools ape corpcor subplex spam]; };
 mvProbit = derive { name="mvProbit"; version="0.1-0"; sha256="0fnrlralydlsf9iphq385f8hpqigfmi8rafvgp443gygvpq5b6g0"; depends=[mvtnorm maxLik abind bayesm miscTools]; };
 mvSLOUCH = derive { name="mvSLOUCH"; version="1.1.5"; sha256="1cq1j4f1k0xhq2ncmji1a4p4m6h7k2afsr39abib4g3md902v0hp"; depends=[ouch ape numDeriv mvtnorm corpcor]; };
 mvShapiroTest = derive { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; };
@@ -4546,10 +4616,11 @@ mvctm = derive { name="mvctm"; version="1.0"; sha256="1naxjh2k3vv4wlpzzx0y2zwvbn
 mvcwt = derive { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
 mvglmmRank = derive { name="mvglmmRank"; version="1.0-2"; sha256="0gpp0ibgji86pxscqzcws0d1qn1ciqqvyfb0x2v18580r4cx8jv7"; depends=[Matrix numDeriv]; };
 mvinfluence = derive { name="mvinfluence"; version="0.6"; sha256="1cd5p6cl2zln8madjf3vsbmqlg4nsklzzy6ngdd5glj1a9qapd6c"; depends=[car heplots]; };
+mvmesh = derive { name="mvmesh"; version="1.0"; sha256="168s3n3ibiwdk0wys4kjj1xdpkz891rq5dv3lqf4pil83kbw8jw9"; depends=[rcdd rgl]; };
 mvmeta = derive { name="mvmeta"; version="0.4.5"; sha256="0faczanbz6i7794sqxm21a6v52cs5hrjjzdypdvi23bkl4mkxjrb"; depends=[]; };
 mvna = derive { name="mvna"; version="1.2-3"; sha256="1gwv17j6w9c38bqvnasv9kfigbdxiqkzwj89gqmkxgw715f9nnpp"; depends=[lattice]; };
 mvnfast = derive { name="mvnfast"; version="0.1.3"; sha256="1ghm6zdrh2ax8r4jin8gka0qjwcsixn5faclf17sr5bx7l5b62np"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
-mvngGrAd = derive { name="mvngGrAd"; version="0.1.4"; sha256="0vipdmbakr1r25jx87cz1xlvrajfzvm9aq1gzg3npz5140pgc3m2"; depends=[]; };
+mvngGrAd = derive { name="mvngGrAd"; version="0.1.5"; sha256="0ir4pakfb2jq84rbfqix6rph8q6cgadjdn49rrdl4439b8hlsg8k"; depends=[]; };
 mvnmle = derive { name="mvnmle"; version="0.1-11"; sha256="02mpmrr22cqb3v8x7kydgg715yl3lrdgzgdqpchmp0xrl2db8gq4"; depends=[]; };
 mvnormtest = derive { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; };
 mvnpermute = derive { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; };
@@ -4576,7 +4647,7 @@ nLTT = derive { name="nLTT"; version="1.0"; sha256="0yvsjfrsx48p2gyisdyvisplz61d
 nabor = derive { name="nabor"; version="0.4.4"; sha256="0465wkyggz4665b2ph1qpyxsmak0arfzpxaci1r0lrf5ddyp0n6y"; depends=[Rcpp Rcpp RcppEigen BH]; };
 nadiv = derive { name="nadiv"; version="2.13.2"; sha256="1r63z08k46b6hryxracicsw1hr91x4pgk2x58c9nijdni4my7kkc"; depends=[Matrix]; };
 namespace = derive { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; };
-nanop = derive { name="nanop"; version="2.0-4"; sha256="0795kksw6yry9il8xj21iq13xw6jipqcv5vjs3k7s19dbah2k8pi"; depends=[distrEx rgl]; };
+nanop = derive { name="nanop"; version="2.0-5"; sha256="0zdn2hgp516hcqpc2w2vzhhalcr05dlw539zj3afzi75w8rwb71z"; depends=[distrEx rgl]; };
 nasaweather = derive { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
 nat = derive { name="nat"; version="1.6.4"; sha256="1a4wr1378y8crmpk150gmzjc12wn4q9l6nbghddizyw9827b5my1"; depends=[rgl nabor igraph filehash digest nat_utils plyr yaml]; };
 nat_nblast = derive { name="nat.nblast"; version="1.5"; sha256="1slpk126fwgn90j3aazlf3pw2ij050dghc1yqadv6mjcj82qpm5i"; depends=[rgl nat nabor dendroextras plyr spam]; };
@@ -4609,13 +4680,13 @@ netmeta = derive { name="netmeta"; version="0.7-0"; sha256="0nsy817bj3fh4sz632pl
 nets = derive { name="nets"; version="0.1"; sha256="0zshiavdi1z8mq6q93vsyb5wx5nq37qln9gcyvamvi2pgy5xg4k2"; depends=[igraph]; };
 nettools = derive { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[rootSolve dtw WGCNA Matrix minerva combinat igraph]; };
 netweavers = derive { name="netweavers"; version="1.1"; sha256="0p8hb3m0lbkf0pw9vdhv94spdba432klpqgn07jvxfhfhmr8cyz0"; depends=[igraph]; };
-network = derive { name="network"; version="1.11.3"; sha256="1sp55dzf2g5znybppd1w3bmkxfx8vqh98pws438r5wwln2pjdcs2"; depends=[]; };
+network = derive { name="network"; version="1.12.0"; sha256="04n634ia6m86zkmjdla8v6j4x11kdrx72gaj4am7iwv1ha14nfks"; depends=[]; };
 networkD3 = derive { name="networkD3"; version="0.1.2.1"; sha256="0xc3qbcb0xvdfvx2vb68rzif72x3zna32wrhz9lg9s7dfkz4xmfm"; depends=[htmlwidgets plyr rjson]; };
 networkDynamic = derive { name="networkDynamic"; version="0.7.1"; sha256="0iv4lyfxmjllxk0cx09gdrg7zf2myf57wd3a2gqymids5gvpsy2d"; depends=[network statnet_common network]; };
 networkDynamicData = derive { name="networkDynamicData"; version="0.1.0"; sha256="1vln4n8jldqi1a6qb9j9aaxyjb8pfgwd8brnsqr8hp9lm3axd24b"; depends=[networkDynamic network]; };
 networkTomography = derive { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; };
 networkreporting = derive { name="networkreporting"; version="0.0.1"; sha256="1vfvx5gf90p31gy6kcv7l2ibzbfl382gffa79dl8gascbsg6s8z8"; depends=[functional ggplot2 plyr reshape2 stringr]; };
-networksis = derive { name="networksis"; version="2.1-2"; sha256="05x0mp9ig7nff1js0zv7hq8p7jr7dqscs46zlbrxrrcy1waydb0s"; depends=[ergm network]; };
+networksis = derive { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; };
 neuRosim = derive { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; };
 neural = derive { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; };
 neuralnet = derive { name="neuralnet"; version="1.32"; sha256="0p9r5j8q0flv15wn5s6qi9if7npna107l1ffv37nzx1b4vgswnl9"; depends=[MASS]; };
@@ -4623,13 +4694,14 @@ neuroblastoma = derive { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq
 neuroim = derive { name="neuroim"; version="0.0.3"; sha256="0n5jkyvdaiigv51s5bb508w5xkh0qkd1zbs67nnms14s1664fhiz"; depends=[stringr hash iterators abind Matrix yaImpute]; };
 ngram = derive { name="ngram"; version="1.1"; sha256="0p5wm55anch1i0y3478f5d4sivs7q8j3kwlg89nk3337win06499"; depends=[]; };
 ngramr = derive { name="ngramr"; version="1.4.5"; sha256="1cqapla0lknxl669w5x3av9nr4vy9qrfznznqj22xlqaj0p53c18"; depends=[httr RCurl plyr rjson stringr reshape2 ggplot2 scales]; };
+ngramrr = derive { name="ngramrr"; version="0.1.1"; sha256="1h12nm0dg2mkq5b2zn12cij24nl8inqn04m4jxdi1lr6r81y1wsq"; depends=[tau]; };
 ngspatial = derive { name="ngspatial"; version="1.0-5"; sha256="0dd7gm6irq08054ndj2gykz4nnfqfq3wbivg6fmlkdnn18kbckkk"; depends=[Rcpp batchmeans Rcpp RcppArmadillo]; };
 nhlscrapr = derive { name="nhlscrapr"; version="1.8"; sha256="0y2shw3g84flh88a15czdsb62xwdqxhvzkn4kpbn0k9ddyfzxc48"; depends=[RCurl rjson biglm bitops]; };
 nice = derive { name="nice"; version="0.4"; sha256="1alq8n8pchn9v0fvwrifdisazkh519x109bqgnpgnwf79wblmnhy"; depends=[]; };
 nicheROVER = derive { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
 nlADG = derive { name="nlADG"; version="0.1-0"; sha256="0nvd5hzd1p81jwx5p7js86wblgg615vdnpbvy5rhmhf1ig583z1b"; depends=[ggm]; };
 nlWaldTest = derive { name="nlWaldTest"; version="1.0.1"; sha256="1rwpkkddivpcamhsp22nmy5gz2006y9kbdzj8lhh20s1vsyhn2b3"; depends=[stringr numDeriv]; };
-nleqslv = derive { name="nleqslv"; version="2.6"; sha256="100nncpi2sx7flcxrl16csv7yprwan20ih1gydz6as5cg3k3lx9i"; depends=[]; };
+nleqslv = derive { name="nleqslv"; version="2.7"; sha256="1livdnwrs8vzsbhvjqf3rmnanaywsr464jb6988s6pmyc2b0q9zp"; depends=[]; };
 nlme = derive { name="nlme"; version="3.1-120"; sha256="1ji8nrf714nf18by9g7k4czkgnj1cq464pvjv195c5fnhwhmpmjc"; depends=[lattice]; };
 nlmeODE = derive { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve nlme lattice]; };
 nlmeU = derive { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
@@ -4645,10 +4717,10 @@ nlt = derive { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6c
 nlts = derive { name="nlts"; version="0.2-0"; sha256="14kvzc1p4anj9f7pg005pcbmc4k0917r49pvqys9a0a51ira67vb"; depends=[locfit acepack]; };
 nmcdr = derive { name="nmcdr"; version="0.3.0"; sha256="1557pdv7mqdjwpm6d9zw3zfbm1s8ai3rasd66nigscmlq102w745"; depends=[CDFt]; };
 nnet = derive { name="nnet"; version="7.3-9"; sha256="1z1lhi35w5l7l645d764w9h4aiv6hapjv8fwb9b51b36vyg1r0zg"; depends=[]; };
-nnlasso = derive { name="nnlasso"; version="0.1"; sha256="0pqpkq8vb18qm8rj16wx3z6fb7mgkb8ddw00c701d5mi9gqhaf5c"; depends=[]; };
+nnlasso = derive { name="nnlasso"; version="0.2"; sha256="1q1psc6s5xw2nsz09q20n5rksq07gx21q9ap22dr7haln5jrvpzr"; depends=[]; };
 nnls = derive { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
 nodeHarvest = derive { name="nodeHarvest"; version="0.6"; sha256="16151rwmqkf5vlyrlxlirz8s0nimxppx1f7f4pwfxi9vipwph125"; depends=[quadprog randomForest]; };
-nodiv = derive { name="nodiv"; version="1.0.2"; sha256="0a8p5q1r68gmwv73557xgwxp9xwh8yw287yr71lplc1dx8fxjjny"; depends=[picante raster ape sp vegan]; };
+nodiv = derive { name="nodiv"; version="1.0.3"; sha256="0fwx7f30qxfnhgzn5lrphwv0clvap3w887xf6316lbr86sjw4x3v"; depends=[picante raster ape sp vegan]; };
 noia = derive { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
 noncensus = derive { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
 nonlinearTseries = derive { name="nonlinearTseries"; version="0.2.1"; sha256="1pq93g25arnc68kyvv6ymywdvbqv6620dvqzv1l43c1xssw364bc"; depends=[Matrix rgl tseries TSA]; };
@@ -4671,7 +4743,7 @@ np = derive { name="np"; version="0.60-2"; sha256="0zs1d4mmgns7s26qcplf9mlz9rkp6
 npIntFactRep = derive { name="npIntFactRep"; version="1.2"; sha256="0fx5923wdzz6122bbyil5imwbhgwlm50wcrscy78qdx8n4n07rv8"; depends=[ez plyr]; };
 nparLD = derive { name="nparLD"; version="2.1"; sha256="1asq00lv1rz3rkz1gqpi7f83p5vhzfib3m7ka1ywpf2wfbfng27n"; depends=[MASS]; };
 nparcomp = derive { name="nparcomp"; version="2.6"; sha256="111ypwyc885lvn64a5sb2k552j6wr3iihmhgx5y475axdiva5pzf"; depends=[multcomp mvtnorm]; };
-npbr = derive { name="npbr"; version="1.0"; sha256="12s25vn4f0373y2ijmpam0an4p64xr3m71xgf20g5przmr77bm0a"; depends=[Rglpk Benchmarking]; };
+npbr = derive { name="npbr"; version="1.1"; sha256="011zmz1s6kkdgylkl6dc79dpardgpc5dlh6g6y2l84hgax1rbdl6"; depends=[quadprog Rglpk Benchmarking np]; };
 npcp = derive { name="npcp"; version="0.1-1"; sha256="0b2mqx0zrvai5aw6b47qpi4bwcfjrv0bh8ahrgx7n1sf045grm3a"; depends=[]; };
 npde = derive { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
 nplplot = derive { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
@@ -4722,7 +4794,7 @@ onls = derive { name="onls"; version="0.1-0"; sha256="1kfgikswddly9lar6wa1hhz89r
 opefimor = derive { name="opefimor"; version="1.1"; sha256="0xv57l38wx3w67h312g5xcpi9m7ggd6crqvqjh5gddq0g1g93bjq"; depends=[]; };
 openNLP = derive { name="openNLP"; version="0.2-4"; sha256="11zgqi8ydv6pqjs1sbi9gsh2fxg6jyaba16h5kbi15rc75fcvw47"; depends=[NLP openNLPdata rJava]; };
 openNLPdata = derive { name="openNLPdata"; version="1.5.3-1"; sha256="1a048irgv56yi2lvhpqh8vh4dl7g7zfg934qypjxg8mcdcqi820y"; depends=[rJava]; };
-openair = derive { name="openair"; version="1.1-5"; sha256="1i0vif16n4y3m64q3ryrkh725b5j6b7b1g58hwz5hxzj4m2fls7l"; depends=[lazyeval dplyr maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapproj hexbin mapdata RgoogleMaps Rcpp Rcpp]; };
+openair = derive { name="openair"; version="1.5"; sha256="0swhaldfhz6zgs50aws18kypilv15k7w99nqcmb7y0wgvkkwda2h"; depends=[lazyeval dplyr maps plyr reshape2 mgcv lattice latticeExtra cluster RColorBrewer mapproj hexbin mapdata RgoogleMaps Rcpp Rcpp]; };
 opencpu = derive { name="opencpu"; version="1.4.6"; sha256="19anprhkwqw2kii417qy3laalrlj207zfvklc05m0vz9sra7sxj0"; depends=[evaluate httpuv knitr jsonlite devtools httr brew openssl]; };
 openintro = derive { name="openintro"; version="1.4"; sha256="1k6pzlsrqikbri795vic9h191nf2j7v7hjybjfkrx6847c1r4iam"; depends=[]; };
 openssl = derive { name="openssl"; version="0.3"; sha256="0h71jc1w99qg4y01q6j3yhmjhwf06r9pv150id2ls5f1z3hr0l6p"; depends=[]; };
@@ -4765,6 +4837,7 @@ oro_dicom = derive { name="oro.dicom"; version="0.4.3"; sha256="1n0rvinq14fbylg1
 oro_nifti = derive { name="oro.nifti"; version="0.4.3"; sha256="1sr91x0fzl7zc6m5mndhql7abmmsckyjl7s45rj4n3g8qzbqn790"; depends=[bitops]; };
 oro_pet = derive { name="oro.pet"; version="0.2.3"; sha256="06agl6rvd01h6mnilj0vl52dxw6b7b41vl6vmbvaq5qy1wmiaiz7"; depends=[oro_dicom oro_nifti]; };
 orsk = derive { name="orsk"; version="1.0-1"; sha256="155wc9sfla3717b6xmhmsmvsnh2qbzzkffhibmj4xc0pd9lwwz2v"; depends=[BB BHH2]; };
+orthogonalsplinebasis = derive { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
 orthopolynom = derive { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
 osDesign = derive { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
 osmar = derive { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[XML RCurl geosphere]; };
@@ -4793,6 +4866,7 @@ pacman = derive { name="pacman"; version="0.3.0"; sha256="10fjkr4zjcx7cyfmnpdnb9
 paf = derive { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
 pairedCI = derive { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; };
 pairheatmap = derive { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; };
+pairsD3 = derive { name="pairsD3"; version="0.0.6"; sha256="1fkwz8b9cqzhi7a8hv5bzgna9b0i0dvvpkffvbknsd9d24sjzr6c"; depends=[htmlwidgets shiny]; };
 pairwise = derive { name="pairwise"; version="0.2.5"; sha256="0r08v95f6f2safi6c0x84v5gib5qnkv46dmi97rdb9l2xzly249b"; depends=[]; };
 pairwiseCI = derive { name="pairwiseCI"; version="0.1-22"; sha256="1lgir9gcikx8c9pd2wdsqnik9rwr4qkymcf4ndp8s491vj6cm6sa"; depends=[MCPAN coin boot mratios binMto MASS]; };
 palaeoSig = derive { name="palaeoSig"; version="1.1-3"; sha256="1zm8xr7fpnnh6l4421vjavi6bg44iars3mna4r5fw3spmbswyv7b"; depends=[vegan TeachingDemos rioja mgcv MASS]; };
@@ -4829,7 +4903,7 @@ partitionMetric = derive { name="partitionMetric"; version="1.1"; sha256="1wry9d
 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-20"; sha256="10d4hyzc8icgb51k4dkc1bwprky7sg35vpa9s3jcl9ifw6na0bgm"; depends=[mvtnorm modeltools strucchange survival coin zoo sandwich mvtnorm]; };
-partykit = derive { name="partykit"; version="1.0-0"; sha256="1kd7hrcivvl638l7frgjz8qp8nz52h0yz5kypgqfma84jqfvd6ca"; depends=[survival]; };
+partykit = derive { name="partykit"; version="1.0-1"; sha256="12ja72nginkzl9zrpiidqwrih2zgwxksdkhbw7hbdjbsr4zb7q62"; depends=[survival]; };
 parviol = derive { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; };
 pass = derive { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[MASS lars ncvreg]; };
 pastecs = derive { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
@@ -4888,11 +4962,11 @@ penalized = derive { name="penalized"; version="0.9-45"; sha256="0svmhsh0lv3d571
 penalizedLDA = derive { name="penalizedLDA"; version="1.0"; sha256="1ib33l5nqmvi6qn9ykybkdpc0pp55k1b6x4vqpklzp3dgckg0lp6"; depends=[flsa]; };
 penalizedSVM = derive { name="penalizedSVM"; version="1.1"; sha256="0zc36cgcrdy4rwhg4hhhahymqfalvc5v2zmqq56ikz5blln82qvq"; depends=[e1071 MASS corpcor statmod tgp mlegp lhs]; };
 pencopula = derive { name="pencopula"; version="0.3.5"; sha256="1cy36pprbrfabk9n3x4d1xbj1vd2dda7xq3ihj2hzniwn77j63wi"; depends=[lattice fda quadprog latticeExtra]; };
-pendensity = derive { name="pendensity"; version="0.2.7"; sha256="1f7v0dqcip6mvza9h6j1ajkc6awjs0g8i07v529xn7fhygzwwccr"; depends=[lattice fda]; };
+pendensity = derive { name="pendensity"; version="0.2.8"; sha256="18mnpsmfnqkbhg75lnqvs0iigx3mk9zr923wpygqviw5qxlwk5km"; depends=[lattice fda]; };
 pensim = derive { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[penalized MASS]; };
 peperr = derive { name="peperr"; version="1.1-7"; sha256="01a6sxcmb8v2iz2xdwhdnr92k3w2vn3hr0hg9b6mkpzjf4n45q3k"; depends=[snowfall survival]; };
 peplib = derive { name="peplib"; version="1.5.1"; sha256="1bdgmwbk76ryl5gxcgf3slds92yilg9p1x1lx0hnzzwcgx99wif3"; depends=[]; };
-peptider = derive { name="peptider"; version="0.1.7"; sha256="1jmbklrs32gyb8ph6lkfqkjc97xzhah8g0zkb52s22bvx22iqvhf"; depends=[discreteRV plyr dplyr]; };
+peptider = derive { name="peptider"; version="0.2"; sha256="1mrwa5pcmc0vbs7n39003bxia2hd6msjkl0j0b21d05accbvzph1"; depends=[discreteRV plyr dplyr]; };
 pequod = derive { name="pequod"; version="0.0-3"; sha256="14nag0bd2icg294y7n47c6xlw54rrdia887d2ni6achjqgwvffzh"; depends=[ggplot2 car]; };
 perARMA = derive { name="perARMA"; version="1.5"; sha256="1d9vrxv8r6qgxhaz3pv8n34c526gi5cd8w7wxy9qc914y8kplmzr"; depends=[corpcor gnm matlab Matrix signal]; };
 performanceEstimation = derive { name="performanceEstimation"; version="1.0.0"; sha256="176crk5vf9fw52qwsbwcwyp0l9v0kg27jwz2krx295d8kq22ygrj"; depends=[ggplot2 foreach doParallel]; };
@@ -4911,7 +4985,7 @@ pglm = derive { name="pglm"; version="0.1-2"; sha256="1arn2gf0bkg0s59a96hyhrm7ad
 pgmm = derive { name="pgmm"; version="1.1"; sha256="0ajdcnxxy18ifidid4xnq9a03bsrvcbh3dh2vhviggkhq8gji1dn"; depends=[]; };
 pgs = derive { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
 phalen = derive { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
-phangorn = derive { name="phangorn"; version="1.99-12"; sha256="0yp2ih3f15xx1vd4vk1hdg3gl7l1a9y2j88cd6b6z2x1d6waj1yv"; depends=[ape quadprog igraph Matrix fastmatch nnls]; };
+phangorn = derive { name="phangorn"; version="1.99-13"; sha256="1d6awphvzkznqvp30bxdi6j6chlakfxrvmkk9a4by21fxa29xmp9"; depends=[ape quadprog igraph Matrix nnls]; };
 phaseR = derive { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
 phcfM = derive { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
 pheatmap = derive { name="pheatmap"; version="1.0.2"; sha256="0nmq5w2jcljbd81v428xl4mvqzrm4vxxlwyhkimi4hj8a9rqw743"; depends=[RColorBrewer scales gtable]; };
@@ -4919,7 +4993,8 @@ phenability = derive { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6
 phenex = derive { name="phenex"; version="1.0-7"; sha256="0q563cv9lskikf3ls0idp56lirw9gxn71rgxp9xn8an05gwdg0xr"; depends=[]; };
 phenmod = derive { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat RColorBrewer lattice pheno]; };
 pheno = derive { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme SparseM quantreg]; };
-pheno2geno = derive { name="pheno2geno"; version="1.2.1"; sha256="0rh4fzka453i5djsyv4c0z3x6d5r7fvyvxi6x1a1806nzy7w43hj"; depends=[qtl VGAM mixtools]; };
+pheno2geno = derive { name="pheno2geno"; version="1.3.1"; sha256="1k1hw5qxrwxy502zkcfcz0nxjqmvdk1fgghjc512vq7x5znblz3v"; depends=[qtl VGAM mixtools]; };
+phenology = derive { name="phenology"; version="4.1"; sha256="0zg77jzmj5di2kid9v95wj6w326adyfcsdf7rxlq7n84439jsbz3"; depends=[fields zoo coda HelpersMG shiny]; };
 phia = derive { name="phia"; version="0.2-0"; sha256="1v2znss1snqrn3bpd0513jmw0x39p9vpwdc60klx725yrr2cfznw"; depends=[car Matrix]; };
 phmm = derive { name="phmm"; version="0.7-5"; sha256="0dil0ha199yh85j1skwfdl0v02vxdmb0xcc1jdbayjr5jrn9m1zk"; depends=[survival lattice Matrix]; };
 phom = derive { name="phom"; version="1.0.3"; sha256="0x05p6fn4kycilal65k7dy6h3w5i3ca9w93ryp4gqd4lp50l1749"; depends=[Rcpp Rcpp]; };
@@ -4947,7 +5022,7 @@ picasso = derive { name="picasso"; version="0.3.0"; sha256="0z314akr1x2a28hh5hbb
 pingr = derive { name="pingr"; version="1.1.0"; sha256="0j03qcsyckv3zh2v4m8wz8kyfl0k8qi71rm20rc0spy1s9ng7fcb"; depends=[]; };
 pipe_design = derive { name="pipe.design"; version="0.1"; sha256="0hy3n15b4a2319xn2gix9vca3qryy7hjsxlh0z8k96l24ql0r62z"; depends=[ggplot2 gtools]; };
 pipeR = derive { name="pipeR"; version="0.6"; sha256="15hq6i1cv072jpw71slij534s85xljkjk2ygxpkgq3cyngbq3jxb"; depends=[]; };
-pitchRx = derive { name="pitchRx"; version="1.6"; sha256="16x152xz7vs4bwi4xh05sbj38xgqzk8g95vfm0vm5mf94qnnaa6c"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; };
+pitchRx = derive { name="pitchRx"; version="1.7"; sha256="0mx948bahw0zr0915hz9lcws7iq2l0ikgx4gjnnfhhpiii86xs57"; depends=[ggplot2 XML2R plyr MASS hexbin mgcv]; };
 pixmap = derive { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; };
 pkgKitten = derive { name="pkgKitten"; version="0.1.2"; sha256="0nk51c3cx9hy8dwdi7llf9k6kq8495dvy8bxjlajwiwd39jipvgs"; depends=[]; };
 pkgmaker = derive { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[registry codetools digest stringr xtable]; };
@@ -4998,7 +5073,7 @@ png = derive { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqc
 pnmtrem = derive { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
 pnn = derive { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
 poLCA = derive { name="poLCA"; version="1.4.1"; sha256="0bknnndcxsnlq6z9k1vbhqiib1mlzlx4badz85kc7a3xbrdrfs9f"; depends=[scatterplot3d MASS]; };
-pocrm = derive { name="pocrm"; version="0.8"; sha256="04i9slfb9hmhhhq6m2iz7p3cm3v1v6nsvnr117dp55cxanfymd6f"; depends=[dfcrm nnet]; };
+pocrm = derive { name="pocrm"; version="0.9"; sha256="0p7a7xm1iyyjgzyi7ik2n34gqc3lsnallrijzdakghb8k5cybm4m"; depends=[dfcrm nnet]; };
 poibin = derive { name="poibin"; version="1.2"; sha256="12dm1kdalbqy8k7dfldf89v6zw6nd0f73gcdx32xbmry2l2976sa"; depends=[]; };
 poilog = derive { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
 pointRes = derive { name="pointRes"; version="1.0.2"; sha256="1q9vjvmxs1f5g8f2aj674wk8piqzjqxzdrvxnawgw1pfi66adnms"; depends=[ggplot2 gridExtra plyr TripleR]; };
@@ -5063,7 +5138,7 @@ predictmeans = derive { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0
 predmixcor = derive { name="predmixcor"; version="1.1-1"; sha256="0v99as0dzn0lqnbbzycq9j885rgsa1cy4qgbya37bbjd01b3pykd"; depends=[]; };
 prefmod = derive { name="prefmod"; version="0.8-32"; sha256="0v5r195gzbfi6jbqz8r1x2fzj3anqxf4hxaxb9krm9rkwgphrwpi"; depends=[gnm colorspace]; };
 presens = derive { name="presens"; version="1.0.0"; sha256="0hwciahpfp7h7dchn6k64cwjwxzm6cx28b66kv6flz4yzwvqd3pb"; depends=[birk marelac]; };
-preseqR = derive { name="preseqR"; version="1.1"; sha256="10xmybkhyn88p7aa3wa753lykzlcm4md3ai03nlx6wisnqh6dd55"; depends=[]; };
+preseqR = derive { name="preseqR"; version="1.1.1"; sha256="0hz9a7jji2k55a57l03ajkf0j7yp6dgyapyqr1ip0v18fjpfj98q"; depends=[]; };
 prettyGraphs = derive { name="prettyGraphs"; version="2.1.5"; sha256="19jag5cymancxy5lvkj5mkhdbxr37pciqj4vdvmxr82mvw3d75m4"; depends=[]; };
 prettyR = derive { name="prettyR"; version="2.1"; sha256="0q6w51758yaxa3l276vqvkvry6v4xz33lx8791b5hyrq837ypx8z"; depends=[]; };
 prettyunits = derive { name="prettyunits"; version="1.0.0"; sha256="0lh83pf30hnqcq6ppq8axlyawp0qxpym0lqq8pchh3gq8mgcdz1h"; depends=[magrittr assertthat]; };
@@ -5101,8 +5176,8 @@ proxy = derive { name="proxy"; version="0.4-14"; sha256="1ijip1jmpm7dg11yv2rjcpk
 pryr = derive { name="pryr"; version="0.1"; sha256="1vp63v1l4myahmmbphc043x1kpmvvdhs6dr640dxi0napvkdqlq6"; depends=[stringr codetools Rcpp Rcpp]; };
 psData = derive { name="psData"; version="0.1.2"; sha256="0w8kzivqrh1b6gq803rfd10drxdwgy0cxb5sff273m6jxzak52f2"; depends=[countrycode DataCombine foreign xlsx]; };
 psbcGroup = derive { name="psbcGroup"; version="1.1"; sha256="17kpxddvy9m87i9r1hazc8g6mm35p1452ngz80byhgw9p0jkvn5p"; depends=[LearnBayes SuppDists mvtnorm]; };
-pscl = derive { name="pscl"; version="1.4.8"; sha256="1isgj3gsazpl2l69162n0xrgbsrsybwg18rz58amdq0h023c5dbz"; depends=[MASS lattice]; };
-psd = derive { name="psd"; version="1.0-0"; sha256="17mp995yrw3pspavvf2s0fsqqdx7nbxw9k4hqph42052bpy3a54s"; depends=[Rcpp RColorBrewer signal zoo Rcpp RcppArmadillo]; };
+pscl = derive { name="pscl"; version="1.4.9"; sha256="15fij6n43hry1plgzrak9vmk9xbb7n4v2frv997bhwxbs6jhhfhf"; depends=[MASS lattice]; };
+psd = derive { name="psd"; version="1.0-1"; sha256="1ssda4g98m0bk6gkrb7c6ylfsd2a84fq4yhp472n4k8wd73mkdn6"; depends=[Rcpp RColorBrewer signal zoo Rcpp RcppArmadillo]; };
 pse = derive { name="pse"; version="0.4.0"; sha256="1ln6b5ch99fmmcsfn8m8fl4ir7cadwq5ckggwizw9cbllw3drv0b"; depends=[Hmisc boot]; };
 pseudo = derive { name="pseudo"; version="1.1"; sha256="0dcx6b892cic47rwzazsbnsicpgyrbdcndr3q5s6z0j1b41lzknd"; depends=[KMsurv geepack]; };
 psgp = derive { name="psgp"; version="0.3-6"; sha256="0h9gyadfy0djj32pgwhg8vy2gfn7i7yj5nnsm6pvfypc3k71s2wf"; depends=[intamap automap gstat Rcpp RcppArmadillo]; };
@@ -5110,6 +5185,7 @@ psidR = derive { name="psidR"; version="1.2"; sha256="14cpxk7z0inrpvhsdb3z6r5nrp
 pso = derive { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
 pspearman = derive { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; };
 pspline = derive { name="pspline"; version="1.0-16"; sha256="170apwfv2lbf2rggzzynrf9vi2mr0y15sm4zy8djxxpzv217iaf7"; depends=[]; };
+pssm = derive { name="pssm"; version="1.0"; sha256="1af5zvznh04vz5psbmq3xxclm2zh4gl4gxi1ps6aqmiqjpm57dwq"; depends=[MASS abind numDeriv MHadaptive]; };
 psy = derive { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
 psych = derive { name="psych"; version="1.5.1"; sha256="18nlxv15dh16326jj754bclrp6nnaiw04jsklshm8i2p3m5nzr4k"; depends=[mnormt]; };
 psychometric = derive { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme multilevel nlme]; };
@@ -5144,8 +5220,8 @@ qat = derive { name="qat"; version="0.73"; sha256="1fff4sv1n3i0gfgj83sy4pygxalif
 qcc = derive { name="qcc"; version="2.6"; sha256="0bsdgpsqvkz2w1qanxwx8kvrpkpzs9jgw8ml2lyqhmhqbxyg125r"; depends=[MASS]; };
 qcr = derive { name="qcr"; version="0.1-18"; sha256="16dfda3rwivsdhp7j5izzbk2rzwfabfmxgpq4kjc4h7r90n2vly2"; depends=[qcc]; };
 qdap = derive { name="qdap"; version="2.2.0"; sha256="0lbc38x4gvh6q2sb6d524ksfhpvxm8knfy85bmwbf6d3q4s0b6q4"; depends=[ggplot2 qdapDictionaries qdapRegex qdapTools RColorBrewer chron dplyr gdata gender gridExtra igraph NLP openNLP plotrix RCurl reports reshape2 scales stringdist tm venneuler wordcloud xlsx XML]; };
-qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.2"; sha256="0s1dqp3hjllkvq638hvggcbfsdwks91r0ymynl7cdh7dr5pg91bc"; depends=[]; };
-qdapRegex = derive { name="qdapRegex"; version="0.2.0"; sha256="0hypa3xax02k61kwh59wb4r7y8s0g6hfhaih0kj9n442xqvrym5h"; depends=[stringi]; };
+qdapDictionaries = derive { name="qdapDictionaries"; version="1.0.5"; sha256="1nk432nyw4srz92zsikv830dpjxflrrgjhq5va6pd3ifpy3nzdrw"; depends=[]; };
+qdapRegex = derive { name="qdapRegex"; version="0.3.2"; sha256="1hygkck4wilm2f2cg5q82a867608j3dqp7wqj3kbnh5a970lw41y"; depends=[stringi]; };
 qdapTools = derive { name="qdapTools"; version="1.1.0"; sha256="0k3mvcjj2fg2v3z8jm2z02zmrpgjpwbpcaanmp2vlykqzacsrl52"; depends=[chron data_table RCurl XML]; };
 qdm = derive { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; };
 qgraph = derive { name="qgraph"; version="1.3.1"; sha256="1wmpsgmzl9qg4vjjjlbxqav3ck7p26gidsqv3qryx56jx54164wg"; depends=[psych ellipse lavaan sem plyr Hmisc igraph jpeg png colorspace Matrix sna corpcor reshape2 ggplot2 glasso huge fdrtool d3Network ggm gtools]; };
@@ -5155,7 +5231,7 @@ qiimer = derive { name="qiimer"; version="0.9.2"; sha256="08625hz2n7yk9zk1k9sa46
 qlcMatrix = derive { name="qlcMatrix"; version="0.9.2"; sha256="1d8953bj69d0nia3qh3s1djf9m7wkvfdxqd234026gh1d3qchkr2"; depends=[Matrix]; };
 qlspack = derive { name="qlspack"; version="2.2"; sha256="0b9sqvnvldhd8vymajrbql0vn70rml13jgsq5ihm6skzq5qms7y6"; depends=[geepack]; };
 qmap = derive { name="qmap"; version="1.0-3"; sha256="1c7qvmd5whi446nzssqvhz1j2mpx22nlzzdrcql84v18ry0dr18m"; depends=[fitdistrplus]; };
-qmethod = derive { name="qmethod"; version="1.2.4"; sha256="0s3s1vasppbnzq78xf7klqppg91c4qvq59dka9dj7zl8zlr6hx3r"; depends=[psych GPArotation]; };
+qmethod = derive { name="qmethod"; version="1.3.0"; sha256="1c3ifay92rff0k3cfpm9nq81mj91s157iqd0wx89b9bx5zr4d58x"; depends=[psych GPArotation digest knitr xtable]; };
 qmrparser = derive { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
 qpcR = derive { name="qpcR"; version="1.4-0"; sha256="029qhncfiicb3picay5yd42g6qi0x981r6mgd67vdx71cac9fp59"; depends=[MASS minpack_lm rgl robustbase Matrix]; };
 qqman = derive { name="qqman"; version="0.1.2"; sha256="024ln79hig5ggcyc3466r6y6zx2hwy2698x65cha5zpm51kq1abs"; depends=[]; };
@@ -5163,6 +5239,7 @@ qqtest = derive { name="qqtest"; version="1.0"; sha256="12hw4d2gddb4fgdi986pyqgv
 qrLMM = derive { name="qrLMM"; version="1.1"; sha256="1yg9ph6jy0sn4d82vn4v7yy3mqczbnzsq8qqp9dw38vh2456rmf2"; depends=[nlme matrixcalc mvtnorm ghyp quantreg psych]; };
 qrNLMM = derive { name="qrNLMM"; version="1.0"; sha256="0vlinc3bggapff29dyz14vn122gy6aq3rp38v2bpnxfkbpj10lvy"; depends=[matrixcalc mvtnorm ghyp quantreg psych ald]; };
 qrfactor = derive { name="qrfactor"; version="1.4"; sha256="0f02lh8zrc36slwqy11x03yzfdy94p1lk5jar9h5cwa1dvi5k8gm"; depends=[mvoutlier mgraph pvclust cluster maptools]; };
+qrng = derive { name="qrng"; version="0.0-1"; sha256="1pi8cy6sxgqdnsgm1ygrg6s7mx7fxqc9l9s8b94ia91z3xq1yn9m"; depends=[]; };
 qrnn = derive { name="qrnn"; version="1.1.2"; sha256="01wsz9qcdiayi7gsyy2y09jyyapanyhlc4pdyman2f7z5nl9yv9i"; depends=[]; };
 qtbase = derive { name="qtbase"; version="1.0.4"; sha256="02yilvywkcqn3y9ayix18cgkwhi0gh69fl3fcw28fs2zxf1hqy75"; depends=[]; };
 qtl = derive { name="qtl"; version="1.36-6"; sha256="1qn8fv0s2934pbds2962isr8y96s2k0jlh6y27rz21qlpryrbijb"; depends=[]; };
@@ -5181,17 +5258,19 @@ qualCI = derive { name="qualCI"; version="0.1"; sha256="09mzsy5ryyrn1gz9ahrh95cp
 qualV = derive { name="qualV"; version="0.3-1"; sha256="0p4yfgq2wxwis2w28mdb61x6hzm6sb9bczjdm9bc05ga5srr3sdd"; depends=[KernSmooth]; };
 qualityTools = derive { name="qualityTools"; version="1.54"; sha256="0ylp5a49b4q4max4yz30ia7r12s4jrvqn9zx5a21qcnpinf8b932"; depends=[]; };
 quantchem = derive { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
+quanteda = derive { name="quanteda"; version="0.7.2"; sha256="0mpalvnhqkmqczpc1qaipvqxlyqfli510p81h6mf0sq9f82nzmks"; depends=[Matrix data_table SnowballC wordcloud proxy Rcpp ca Rcpp RcppArmadillo]; };
 quantification = derive { name="quantification"; version="0.1.0"; sha256="0987389rr21fl3khgd3a1yq5821hljwm0xlyxgjy1km5hj81diap"; depends=[car]; };
 quantmod = derive { name="quantmod"; version="0.4-4"; sha256="0a8gr2qb2b2w58zyxbyz3dbprmyiwf5cd62xqv4d3rk29l7vk4n8"; depends=[xts zoo TTR]; };
 quantreg = derive { name="quantreg"; version="5.11"; sha256="0pyc1zknkjyvaix76bn84l90zavajsc7jx17x0zanllnh34siizp"; depends=[SparseM]; };
 quantregForest = derive { name="quantregForest"; version="0.2-3"; sha256="06c73f66nnw3vd2dv8h5skzyxbr89i3pyprbb0if721h5d7pm0s7"; depends=[randomForest]; };
 quantregGrowth = derive { name="quantregGrowth"; version="0.3-0"; sha256="0iyqd4gf780xqj2gcinlx0h6r6wy4vc7sp8r4qa1s638qcrp3qwa"; depends=[quantreg]; };
-quantspec = derive { name="quantspec"; version="1.0-2"; sha256="09x3wg7msj11b5kpxbxbbhgw4v05alxaw06gyx076kdnbi9mv0bm"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; };
-questionr = derive { name="questionr"; version="0.4.2"; sha256="04s9g1njfmsnay3szfnmxw72z60mz0gp8yapwv1hi0p63rr5hv5r"; depends=[shiny highr classInt htmltools]; };
-queueing = derive { name="queueing"; version="0.2.3"; sha256="1gcnd96vqygbhpa1mfls8adjdhkqy8c8427jf2qqq49s3vgzc08y"; depends=[]; };
+quantspec = derive { name="quantspec"; version="1.0-3"; sha256="1g4arhhybw021dnz0imdfwwj328gc8yw75cgnnd00skdc402cfhk"; depends=[quantreg abind zoo snowfall Rcpp Rcpp]; };
+questionr = derive { name="questionr"; version="0.4.3"; sha256="13mmmjxg9vkn53dp9hng330bkilzdf2zqisgs21ng08b6p9dv7n4"; depends=[shiny highr classInt htmltools]; };
+queueing = derive { name="queueing"; version="0.2.4"; sha256="03zz5437bkai2bmk9hcwf09cmyrnbs2cxlafbcf1lp6iahj66il9"; depends=[]; };
 quint = derive { name="quint"; version="1.0"; sha256="19dxrssy4dw7v3s4hhhy6yilbc7zb6pvcnh3mm1z6vv5a1wfr245"; depends=[partykit Formula rpart]; };
 quipu = derive { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae stringr pixmap shiny xtable]; };
 qvcalc = derive { name="qvcalc"; version="0.8-9"; sha256="1ysbsm65n05vypvvpsbdfbrb60gij50vsmybzi4405g5z2ds1j72"; depends=[]; };
+qwraps2 = derive { name="qwraps2"; version="0.1"; sha256="1wxviwn3kyz9wp1rf937yqbpvdnib4wsfsd5yws6lpl0y3jwxshb"; depends=[dplyr ggplot2]; };
 r2d2 = derive { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
 r2dRue = derive { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[rgdal sp matrixStats]; };
 r2lh = derive { name="r2lh"; version="0.7"; sha256="1kkyjv9x2klrjnaaw4a16sxdfqmpp9s5mlclzlczlqjypbf2aa6d"; depends=[]; };
@@ -5207,7 +5286,7 @@ rCUR = derive { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5
 rCarto = derive { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[RColorBrewer maptools classInt]; };
 rChoiceDialogs = derive { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; };
 rClinicalCodes = derive { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[stringr RCurl XML rjson tm]; };
-rDEA = derive { name="rDEA"; version="1.0-2"; sha256="1npknid10w6by7ka7dham4vdbx6hyy09dvakq8mp5vfysxf5akf3"; depends=[slam truncreg truncnorm maxLik]; };
+rDEA = derive { name="rDEA"; version="1.1-1"; sha256="17j7cz08nd5sgr1z75jlrdjl9ffkdhmzmqcyrf1qcy36v9i2fqzk"; depends=[slam truncreg truncnorm maxLik]; };
 rDNA = derive { name="rDNA"; version="1.30.1"; sha256="12h83zirv55sryc1zww97ws8kvsym1z7p7y5d4w43nam8mi3fpcd"; depends=[rJava]; };
 rDVR = derive { name="rDVR"; version="0.1.1"; sha256="19a4f9k65bd49vkn3sxkjdmcpwyawk7gwmvancvqr745gfgs0wzg"; depends=[RCurl]; };
 rEMM = derive { name="rEMM"; version="1.0-8"; sha256="1d8nwranqfvr9c0g2ny7akawgqk5hjnr1mclk87gmbmwn9iwik34"; depends=[proxy MASS clusterGeneration igraph]; };
@@ -5221,7 +5300,7 @@ rJava = derive { name="rJava"; version="0.9-6"; sha256="008g6s6rcb5lnz5y2a2rs4iq
 rJavax = derive { name="rJavax"; version="0.3"; sha256="0sv2fjinp4wmdfvcpgm4hv8v3fkiiv84ywqyr4hz86j50ncd79km"; depends=[rJava]; };
 rJython = derive { name="rJython"; version="0.0-4"; sha256="13fpcw37cca738v9idqgi3gv9avfkfwfacxj54p2c4wyg46ghnah"; depends=[rJava rjson]; };
 rLTP = derive { name="rLTP"; version="0.1"; sha256="0dv8jj8rgcx4cbbs10sqdblcznxgm9ld5md922ghnka4ymar244m"; depends=[RCurl]; };
-rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.4"; sha256="1qs8f4sv044bxrf45wzfj444plkcq3i61353881x8shn13h3awas"; depends=[plyr]; };
+rLakeAnalyzer = derive { name="rLakeAnalyzer"; version="1.7.3"; sha256="1w9z0m8ddslsk4d9r8dm5npm1s8sqdjv11x0gc08awa77iwak4wh"; depends=[plyr]; };
 rLindo = derive { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
 rNMF = derive { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[nnls knitr]; };
 rNOMADS = derive { name="rNOMADS"; version="2.1.3"; sha256="1m2qbkqaninczs4v558vpzkiqh0rngkmpp9sk7y4k5j3g4x1jrpf"; depends=[rvest scrapeR stringr fields GEOmap MBA RCurl XML]; };
@@ -5230,20 +5309,22 @@ rPref = derive { name="rPref"; version="0.5"; sha256="0wgyf785izfhx1jvff4as1dir1
 rPython = derive { name="rPython"; version="0.0-5"; sha256="0d608v1x8walwnx7aa3m0n7999jlbiymhl7605z4n7ps6l1140mv"; depends=[RJSONIO]; };
 rSCA = derive { name="rSCA"; version="2.1"; sha256="1lpix8xsjzyhgksmigvqxpv2bvaka0b1q2kcvdyfrfcw713n19rw"; depends=[]; };
 rSFA = derive { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; };
-rSPACE = derive { name="rSPACE"; version="1.1.0"; sha256="1kj6l41wdm2dqygwfdlfrys9idykjfj6vmv6pzbgp998a29fm53s"; depends=[raster RMark ggplot2 tcltk2 sp plyr]; };
+rSPACE = derive { name="rSPACE"; version="1.1.1"; sha256="03ibsrhvjs5fn6syr65aw07s05apxbbm7biwlylha28yrazp2z89"; depends=[raster RMark ggplot2 tcltk2 sp plyr]; };
 rSymPy = derive { name="rSymPy"; version="0.2-1.1"; sha256="1mrfpyalrq8b6yicy28jsj0xy7hlawa72imsfhabwd3hrx6ld150"; depends=[rJython]; };
+rTableICC = derive { name="rTableICC"; version="1.0.2"; sha256="11mjlgvmghppy2m35w799z93b4f8wn307dl3c9dyk2sib9nxcpyv"; depends=[partitions aster]; };
 rTensor = derive { name="rTensor"; version="1.2"; sha256="1qikicdi8d5yhw43660m8v587f5xzs2k2lpmbhfw037n0liivay2"; depends=[]; };
 rUnemploymentData = derive { name="rUnemploymentData"; version="1.0.0"; sha256="1gbmr3kcv3wv4lmr7171sd76p95nhsa104955yi7y6wd5h0hk1ba"; depends=[stringr choroplethr rvest]; };
 rWBclimate = derive { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr plyr rgdal jsonlite reshape2 sp]; };
 rYoutheria = derive { name="rYoutheria"; version="1.0.0"; sha256="1yj66ars5a8mbv2axl6l5g7wflwz3j4mhwk3iz5w33rfhixixm9l"; depends=[plyr RJSONIO reshape2 RCurl]; };
 race = derive { name="race"; version="0.1.59"; sha256="13jprlnngribgvyr7fbg9d36i8qf3cax85n71dl71iv0y24al1cy"; depends=[]; };
 radar = derive { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; };
-radiant = derive { name="radiant"; version="0.1.75"; sha256="0rk971rr15w87b50rhf8vdr6vhs3lfd08vdrp1f7h9higrwk0as8"; depends=[lubridate ggplot2 dplyr magrittr car MASS gridExtra AlgDesign GPArotation psych wordcloud markdown knitr ggdendro broom tidyr pryr shiny shinyAce]; };
+radiant = derive { name="radiant"; version="0.1.83"; sha256="0456iddvsnw2p0mnchig18ccbl0z53spb3nqwx43ms31b1nbfpjw"; depends=[lubridate ggplot2 dplyr magrittr car MASS gridExtra AlgDesign GPArotation psych wordcloud markdown knitr ggdendro broom tidyr pryr shiny shinyAce]; };
 radir = derive { name="radir"; version="1.0"; sha256="1aiy92r854h1l9fsa8j65w495hj7hll7k1csfnvb92h0wh0bxyzy"; depends=[hermite]; };
 rags2ridges = derive { name="rags2ridges"; version="1.4"; sha256="1vwd39vp8xdrcz1kfsjng3lzfrfb3czsxg1kvll5d275xsrhz5ix"; depends=[igraph expm reshape ggplot2 Hmisc fdrtool snowfall]; };
-rainbow = derive { name="rainbow"; version="3.2"; sha256="043qbbyb1i7b8n3vspr6rdwlpqg3wdn31rsq3hmlahvwrfqma70n"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; };
+rainbow = derive { name="rainbow"; version="3.3"; sha256="0xiqljshkdhhkdgcvz5n9qgbxgxskpxbq14vbpil9nqw2syj9xvj"; depends=[MASS pcaPP hdrcde cluster colorspace ks]; };
 raincpc = derive { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; };
 rainfreq = derive { name="rainfreq"; version="0.3"; sha256="0985ck2bglg22gfj7m0hc7kpk0apljsbssf1ci99mgk47yi8fk9v"; depends=[RCurl SDMTools]; };
+ramify = derive { name="ramify"; version="0.2.0"; sha256="1fn2r6mr461yp00z8c7f1wsyhz3ag13q6ckf84sj11rgg6jivzjj"; depends=[]; };
 ramps = derive { name="ramps"; version="0.6-13"; sha256="1y7jaajzbf6d9xwr0rg0qr43l8kncgwbpfy5rpka90g3244v8nwz"; depends=[coda maps Matrix nlme fields]; };
 randaes = derive { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
 random = derive { name="random"; version="0.2.3"; sha256="1ljz54i73bzxh69v7xjklajcl526pdapr0jgdwd6prfilafhf618"; depends=[curl]; };
@@ -5267,7 +5348,7 @@ rapportools = derive { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12a
 rareGE = derive { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
 rareNMtests = derive { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
 rasclass = derive { name="rasclass"; version="0.2.1"; sha256="04g2sirxrf16xjmyn4zcci757k7sgvsjbg0qjfr5phbr1rssy9qf"; depends=[car nnet RSNNS e1071 randomForest]; };
-raster = derive { name="raster"; version="2.3-33"; sha256="1mjsy36r2rflsnl0y0n805mq536jqvsba20xdhpl1iv2sknmxz2a"; depends=[sp]; };
+raster = derive { name="raster"; version="2.3-40"; sha256="1swfhf6c70ybvlkw5v2wg0zbzsmzn63n9fkwj4sfp3n08flikma2"; depends=[sp]; };
 rasterVis = derive { name="rasterVis"; version="0.35"; sha256="0kdpng32b3l0hsf24zzj5m5srcka1wr26dpxfjxxsyilg6frp83r"; depends=[raster lattice latticeExtra sp zoo hexbin RColorBrewer]; };
 rateratio_test = derive { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
 raters = derive { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
@@ -5278,19 +5359,19 @@ rbamtools = derive { name="rbamtools"; version="2.10.0"; sha256="00y5393nac4x1vz
 rbefdata = derive { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[XML RCurl rjson wordcloud rtematres RColorBrewer]; };
 rbenchmark = derive { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; };
 rbhl = derive { name="rbhl"; version="0.1.0"; sha256="1m2n1qczhhdlv9pkmw9dlqi2wmdw8wac8d557c4rk0vnzwzgpgpi"; depends=[httr XML RJSONIO plyr]; };
-rbiouml = derive { name="rbiouml"; version="1.5"; sha256="1q0n207lhb2jj1s5qb4jslxaxj7xj49l487v0mlncnlf6217j3pz"; depends=[RCurl RJSONIO]; };
 rbison = derive { name="rbison"; version="0.4.5"; sha256="1bvirsil4674r5xb0ksmzdrg0km988rsmq93mr0q6a089zw9lhna"; depends=[plyr httr mapproj ggplot2 gridExtra maptools sp dplyr jsonlite]; };
 rbitcoinchartsapi = derive { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RJSONIO RCurl]; };
 rbmn = derive { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
 rbounds = derive { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
 rbugs = derive { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
 rbundler = derive { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
-rcbalance = derive { name="rcbalance"; version="1.3"; sha256="1s38rfn44wmllwpqzxm0w2bjl649i7qfadwdnn0mnp1q86vsmi3q"; depends=[MASS plyr]; };
+rcbalance = derive { name="rcbalance"; version="1.4"; sha256="00l2q8rivmsry5ahbbickv1y912bmydp52h371pzq3g08rzpqknb"; depends=[MASS plyr]; };
 rcdd = derive { name="rcdd"; version="1.1-8"; sha256="09bb92rp44palx9dvc9pb0gdmb1g22289xjk8p9s918lalc6i9aw"; depends=[]; };
 rcdk = derive { name="rcdk"; version="3.3.2"; sha256="02rlg3w8dbmag8b4z4wayh7xn61xc9g3647kxg91r0mvfhmrxl2h"; depends=[fingerprint rJava rcdklibs png iterators]; };
 rcdklibs = derive { name="rcdklibs"; version="1.5.8.4"; sha256="0mzkr23f4d639vhxfdbg44hzxapmpqkhc084ikcj93gjwvdz903k"; depends=[rJava]; };
 rcicr = derive { name="rcicr"; version="0.3.0"; sha256="0fvv6diqg6sw3ar3gzvhl3mbm6zvx0k12lzsa92mccg0giqa9n0w"; depends=[matlab aspace jpeg]; };
 rclinicaltrials = derive { name="rclinicaltrials"; version="1.4.1"; sha256="1x8mj4gzfpgvdj3glwanr76g5x8pks8fm806bvnfls35g967z4p4"; depends=[httr XML plyr]; };
+rcorpora = derive { name="rcorpora"; version="1.0.1"; sha256="10bmsmx9pznfpddddvk7khm7klxg1c82bf85613bnpcwjyb7xcid"; depends=[jsonlite]; };
 rcppbugs = derive { name="rcppbugs"; version="0.1.4.1"; sha256="0wb5mzw1sdrr7lc6izilv60k5v0wcvy8q31a863b63a9jvh16g8d"; depends=[Rcpp Rcpp RcppArmadillo BH]; };
 rcrossref = derive { name="rcrossref"; version="0.3.0"; sha256="1w822n6mlld7fa92iy38xjvgnkhyns3mvy7vaqabgr2bikcz6545"; depends=[jsonlite XML httr plyr bibtex dplyr]; };
 rda = derive { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
@@ -5298,6 +5379,7 @@ rdatamarket = derive { name="rdatamarket"; version="0.6.5"; sha256="1y4493cvhcgy
 rdd = derive { name="rdd"; version="0.56"; sha256="1x61ik606mwn46x3qzgq8wk2f6d5qqr95h30bz6hfbjlpcxw3700"; depends=[sandwich lmtest AER Formula]; };
 rdetools = derive { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
 rdrobust = derive { name="rdrobust"; version="0.80"; sha256="02adafhbjp259hbbbk32yllgn35xxim2mwn6yixv4wh5dgr974v6"; depends=[]; };
+rdrop2 = derive { name="rdrop2"; version="0.6"; sha256="1yxg38v7r34f9rid5q6q1g9f30q3zc4dnkziyps3514l5dnbvk3j"; depends=[assertthat data_table dplyr httr jsonlite magrittr]; };
 rdryad = derive { name="rdryad"; version="0.1.1"; sha256="0mqpkmwkznyxj0nn1v389p741dlc66dixcvljsn2rvg0q6p75fkj"; depends=[XML RCurl OAIHarvester ape gdata plyr stringr RJSONIO]; };
 readBrukerFlexData = derive { name="readBrukerFlexData"; version="1.8.2"; sha256="1cagv6l29h3p87h7c2bgba23v2wxrs2kg4zg1dk046m2x11mwx3c"; depends=[]; };
 readGenalex = derive { name="readGenalex"; version="0.4.1"; sha256="02rdx5ya06wpn0r6709aw6f86hk2xivfvjq5mggmm4dmlzgkwg0x"; depends=[]; };
@@ -5305,11 +5387,13 @@ readMLData = derive { name="readMLData"; version="0.9-7"; sha256="0l752j1jq37j9p
 readMzXmlData = derive { name="readMzXmlData"; version="2.8"; sha256="0x5h3dh6fkc30m6gx6pzmrxr31s80d1qgpcakspjza53qn6fjb16"; depends=[base64enc digest XML]; };
 readODS = derive { name="readODS"; version="1.4"; sha256="00xcas8y0cq3scgi9vlfkrjalphmd7bsynlzpy7izxa5w9b7x79f"; depends=[XML]; };
 readbitmap = derive { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; };
-reader = derive { name="reader"; version="1.0.4"; sha256="0hfv6x80c3jlhy5pspibbpfqqik0rly399qh4b1wn5da0vrbmvs3"; depends=[NCmisc]; };
-readstata13 = derive { name="readstata13"; version="0.5-3"; sha256="0mfl8w3rgpix02zjxik09l2fg33v066bm1i6l9dirjk65741fa48"; depends=[Rcpp Rcpp]; };
+reader = derive { name="reader"; version="1.0.5"; sha256="1g22pnlfr2c974s6rqnyixknhgy2crqbxg2cg2s3ja1sk29v4gr0"; depends=[NCmisc]; };
+readr = derive { name="readr"; version="0.1.0"; sha256="0w6576lrnwk1p90mjwsgy7hi3rk5dqmksnwnmn1gw46lh2888bc8"; depends=[Rcpp curl Rcpp BH]; };
+readstata13 = derive { name="readstata13"; version="0.6.1"; sha256="0h5x6j74m7z715nknh4s62ffs7j3ccpcvy0ws8wf3bdzfa27jvq5"; depends=[Rcpp Rcpp]; };
+readxl = derive { name="readxl"; version="0.1.0"; sha256="0a0mjcn70a0nz1bkrdjwq495000kswxvyq1nlad9k3ayni2ixjkd"; depends=[Rcpp Rcpp]; };
 reams = derive { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
 rebird = derive { name="rebird"; version="0.1.1"; sha256="0s8wmp2sghs56ppca57fjfab7wngszmy1g8rd3hiwx6br0sjidcg"; depends=[RJSONIO httr RCurl plyr]; };
-rebmix = derive { name="rebmix"; version="2.7.0"; sha256="180kvij3aaxvqcbidfjir9jvlhjib20nam5pvin9qn2prhdscjmk"; depends=[]; };
+rebmix = derive { name="rebmix"; version="2.7.1"; sha256="1m3mmqi4kfai0hx2khkblqairp59fgh0japg23rgib1djmdcqb4n"; depends=[]; };
 rebus = derive { name="rebus"; version="0.0-5"; sha256="06rl6knnk93k537hhjx4r55hq6hssij7xc426ilki329vwfi5kyf"; depends=[]; };
 recalls = derive { name="recalls"; version="0.1.0"; sha256="121r2lf32x4yq8zxx6pbnphs7ygn382ns85qxws6jnqzy52q41vh"; depends=[RCurl RJSONIO]; };
 reccsim = derive { name="reccsim"; version="0.9-1"; sha256="17nsp91xq20vfwjfwav80qjs2wc7gwpmrdnwv7lc61baq0kkcs7k"; depends=[]; };
@@ -5334,8 +5418,8 @@ regpro = derive { name="regpro"; version="0.1.0"; sha256="0d47ffsqx1633pmf3abi7w
 regress = derive { name="regress"; version="1.3-14"; sha256="0qnks28fr8siq95iiiqyvz82cbdg14i18rj7g9rqyjhiam12fshl"; depends=[]; };
 regsubseq = derive { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; };
 regtest = derive { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; };
-rehh = derive { name="rehh"; version="1.11"; sha256="1fvcwi9ijj886aswphblkxzgivmk76gr1m3s6zqblcbybxypm5cg"; depends=[gplots]; };
-relSim = derive { name="relSim"; version="0.1-47"; sha256="13asl14f3547nl50jwrk72pbm2vx140k27gz3b38j28cpmvi03mz"; depends=[DNAtools]; };
+rehh = derive { name="rehh"; version="1.12"; sha256="0qqmh48vxi1yqf6ykfsi6wighly5msf4lqx058lbn555g3vg17jp"; depends=[gplots]; };
+relSim = derive { name="relSim"; version="0.2-0"; sha256="0cqcp7r263sk874l17wz84mzm4b1dxbfbsk74937rcz1wfc623k5"; depends=[Rcpp Rcpp]; };
 rela = derive { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; };
 relaimpo = derive { name="relaimpo"; version="2.2-2"; sha256="1rxjg2yw2gyshaij98w83cshxwscnq3ql7bg13n7v4nbjsi1l6zh"; depends=[MASS boot survey mitools corpcor]; };
 relations = derive { name="relations"; version="0.6-4"; sha256="02pzyygz4jnv91v90xkldplcwsbd4z5rbmyldlgjdlbpacs3chna"; depends=[cluster slam sets]; };
@@ -5351,9 +5435,9 @@ remMap = derive { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clf
 remix = derive { name="remix"; version="2.1"; sha256="0s1gaf7vj08xd4m7lc9qpwvk0mpamabbxk71970mfazx6hk24dr0"; depends=[plyr survival Hmisc ascii]; };
 remote = derive { name="remote"; version="0.3.0"; sha256="1f41j26grkv4830bvi6z16b63yksplrq3yg1amd4l634lwhp6x55"; depends=[Rcpp raster foreach Rcpp]; };
 rentrez = derive { name="rentrez"; version="0.4.1"; sha256="1prpzfq5106f0r5z4ffjvs9qkmfaf67icj8k1wngqwmvl2wg88gq"; depends=[XML httr jsonlite]; };
-repfdr = derive { name="repfdr"; version="1.1"; sha256="1k85y27k42kw5zmbrnnqb62x3djjzdm4zrvm2g4dl8ykdlnaikv9"; depends=[]; };
+repfdr = derive { name="repfdr"; version="1.1-3"; sha256="15f7x7vqwlpyzvzsybyz825a9dmglbrngjmajrsqlwffypgxjvi8"; depends=[]; };
 replicationInterval = derive { name="replicationInterval"; version="0.3"; sha256="1zqs114514xj59dlkhw5kmq73grghmb3i5rnnq05qzgf5wjn581i"; depends=[MBESS]; };
-repmis = derive { name="repmis"; version="0.4"; sha256="0m54pif9sj1lf23wbykxlsab3q1b90bwz8cwkh2ibic6gyh5h4dg"; depends=[data_table digest httr plyr R_cache xlsx]; };
+repmis = derive { name="repmis"; version="0.4.2"; sha256="1pjf010h4rkrwarq541wh8x1267894fsdg8na41z8cp3hr5aql21"; depends=[data_table digest httr plyr R_cache]; };
 repolr = derive { name="repolr"; version="2.0"; sha256="10wg07sfxcxzswf3zh5sx2cm9dxjx11zymy82a4q9awnacb5gp9b"; depends=[gee]; };
 reportRx = derive { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[reshape survival xtable aod cmprsk geoR stringr]; };
 reportr = derive { name="reportr"; version="1.1.2"; sha256="0lxnmay9vgg7dsa3scszx3v4lb6m3bv6kjl0dk7hrl7bd67azdrk"; depends=[]; };
@@ -5362,7 +5446,7 @@ reporttools = derive { name="reporttools"; version="1.1.1"; sha256="0cnxzq679f86
 repra = derive { name="repra"; version="0.4.2"; sha256="1djcs83z8ckpmsbyzscnysmy45z28kswzm852176b9pip21mb1w8"; depends=[data_table dplyr Rcpp reshape2 ggplot2 assertthat Rcpp]; };
 represent = derive { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
 reproducer = derive { name="reproducer"; version="0.1.2"; sha256="067yj1dhhikjrnkklsfp6p03gp4lqxwfdwhl6z8djj4rkzi48xm5"; depends=[openxlsx ggplot2 gridExtra]; };
-resample = derive { name="resample"; version="0.2"; sha256="1p6hyd0wi037bsz0xd9gkw28sp4nkj1zmqs9h0lzkxbspn6h0q7j"; depends=[]; };
+resample = derive { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; };
 resemble = derive { name="resemble"; version="1.1.1"; sha256="0mz5mxm6p1drfx2s9dx35m2bnvirr8lkjjh5b4vdk9p2cdv1qkkv"; depends=[RcppArmadillo foreach iterators pls Rcpp Rcpp RcppArmadillo]; };
 reshape = derive { name="reshape"; version="0.8.5"; sha256="08jm9fb02g1fp9vmiqmc0yki6n3rnnp2ph1rk8n9lb5c1s390f4k"; depends=[plyr]; };
 reshape2 = derive { name="reshape2"; version="1.4.1"; sha256="0hl082dyk3pk07nqprpn5dvnrkqhnf6zjnjig1ijddxhlmsrzm7v"; depends=[plyr stringr Rcpp Rcpp]; };
@@ -5371,7 +5455,9 @@ restlos = derive { name="restlos"; version="0.1-3"; sha256="03bsakp9kd8i468wz7xh
 restorepoint = derive { name="restorepoint"; version="0.1.5"; sha256="0xmpxprirnd1yavwk3vkc0cp715d187mn0amppya7kd47iw10wsy"; depends=[]; };
 retimes = derive { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
 retistruct = derive { name="retistruct"; version="0.5.10"; sha256="1wg2a906y09hcqba42hh9r2x59w35dms2aa5mw44avigc1nwm0s2"; depends=[foreign RImageJROI png ttutils sp geometry RTriangle rgl R_matlab]; };
+retrosheet = derive { name="retrosheet"; version="1.0.2"; sha256="079rfc55sy315i7zhv1a8r6drgpiglbf3b4gwyria2mfbn94a5qb"; depends=[RCurl XML data_table stringi]; };
 reutils = derive { name="reutils"; version="0.1.2"; sha256="0f2c6zxk6x2plq649b1ml6b112j6y8ys074pn30yw35ncg3h86fa"; depends=[assertthat RCurl XML]; };
+reval = derive { name="reval"; version="1.0"; sha256="14vzsg3azggfrm1cnrxigbhnpxpjifjf61r71hf73ggpspx2gj5r"; depends=[doParallel foreach]; };
 revealedPrefs = derive { name="revealedPrefs"; version="0.2"; sha256="1f871y4wkjznzgwxfbnmrfiafq43cyf0i5hjy68ybxc7bbvfryxc"; depends=[Rcpp Rcpp RcppArmadillo]; };
 reweight = derive { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; };
 rex = derive { name="rex"; version="0.2.0"; sha256="1q9dkk94w152naw1lpd2l2v08ikrfgilqx9v5z14dyqaascqbmva"; depends=[magrittr lazyeval]; };
@@ -5392,6 +5478,7 @@ rgcvpack = derive { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizq
 rgdal = derive { name="rgdal"; version="0.9-2"; sha256="0jzhjy3qnb9aimmwyssinbyxz49hzcfksmxhsqyz3g8868k946g5"; depends=[sp sp]; };
 rgenoud = derive { name="rgenoud"; version="5.7-12"; sha256="17gzkn4laylnksy8h2w8c0whcxpchsx7bwjzk1q5sfqxswclqq0g"; depends=[]; };
 rgeos = derive { name="rgeos"; version="0.3-8"; sha256="0snbfxzh700fn415li0wia94zgb0x73vwdrbrpimvz9k3y43yvp8"; depends=[sp sp]; };
+rgexf = derive { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[XML Rook igraph]; };
 rggobi = derive { name="rggobi"; version="2.1.20"; sha256="1a7l68h3m9cq14k7y96ijgh0iz3d6j4j2anxg50pykz20lnykr9g"; depends=[RGtk2]; };
 rgl = derive { name="rgl"; version="0.95.1201"; sha256="0vd2zww17p2lcdipv7ijclbisy6ms6d1a4qnwpj1y1kbkhcplw1j"; depends=[]; };
 rglobi = derive { name="rglobi"; version="0.2.6"; sha256="042lc71j49bndlmcxmqdjly48qvqjpif7dgzk4cxsmbil5jmyzks"; depends=[rjson RCurl]; };
@@ -5417,20 +5504,22 @@ rite = derive { name="rite"; version="0.3.4"; sha256="196ashcfj5p52qpnpnrkg7vxq8
 riv = derive { name="riv"; version="2.0-4"; sha256="1c9k62plqgxcgcm2j1s26hqvgww96n6bfjz2yk7m3p2wf8gkkyam"; depends=[MASS rrcov quantreg]; };
 rivernet = derive { name="rivernet"; version="1.0"; sha256="0za5k00k9vivpq4wr1xqc4aw7mlcxhjj2b3iiip1qy13fg7bhbjm"; depends=[]; };
 riverplot = derive { name="riverplot"; version="0.3"; sha256="1x02ci6744k3lsqh53vmpmv957b5wwr1idvn16nzixvzknixryq8"; depends=[]; };
-rivervis = derive { name="rivervis"; version="0.39.4"; sha256="1al0ylmpvkxfhkv9i4j6pvrlqn13pdwmzs7s6vazmgmkl3iggav4"; depends=[]; };
-rivr = derive { name="rivr"; version="0.9.1"; sha256="0rdrgsvxmkqwx65w7pz1sg5mkbqbi7c52cfyk7qzpvfgi5glp9zn"; depends=[Rcpp reshape2 Rcpp]; };
+rivervis = derive { name="rivervis"; version="0.45.0"; sha256="0dc02m923l1y689rd13zxz1122l8cipr4m2cf2bw7pis7zr3m119"; depends=[]; };
+rivr = derive { name="rivr"; version="0.9.2"; sha256="1xz7l7j8adhlzdasx9ljrh8z6cx017pl6761z8q4ixpcgr3vf5ws"; depends=[Rcpp reshape2 Rcpp]; };
 rjade = derive { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
-rjags = derive { name="rjags"; version="3-14"; sha256="1hfsa8jl5imk2j2qnafa5q95zn69bhvijdpvfs64vsiqsalsg7yk"; depends=[coda]; };
+rjags = derive { name="rjags"; version="3-15"; sha256="02nmaqv0xddh7bgrlwrr30gb10mcz2f5lilbyzfw6wpjgi2aihx5"; depends=[coda]; };
 rje = derive { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
 rjson = derive { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
 rjstat = derive { name="rjstat"; version="0.2"; sha256="1ylwp6d3cc8xb8129yr49grx9vb4xyp62ig0qa7vzkbdplba2zr2"; depends=[jsonlite assertthat]; };
+rkafka = derive { name="rkafka"; version="1.0"; sha256="02h3nlffgd48xm38i2arlrgbilraf6r7k65s35906v33i0kjzrgg"; depends=[rJava RUnit rkafkajars]; };
+rkafkajars = derive { name="rkafkajars"; version="1.0"; sha256="0ss9gjjq92hba6nkhnda0pbm3a5bqm00hy0zbj4kivg5dlsf30q0"; depends=[rJava RUnit]; };
 rkt = derive { name="rkt"; version="1.4"; sha256="01c8fwnml1n0sw5lw9p2nz15i1zhxirr0kh39qvjmdiw97c1v1yq"; depends=[]; };
 rkvo = derive { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp Rcpp]; };
 rlecuyer = derive { name="rlecuyer"; version="0.3-3"; sha256="1n0vny3k5s5152y0ggz9vfn4bqay9ncbdzkw9g4703pszrbwq7xh"; depends=[]; };
 rlist = derive { name="rlist"; version="0.4"; sha256="00h00jka64m7skrjp1454805fhr3q1k9sqih4pnvbb0maxlzgn7g"; depends=[yaml jsonlite]; };
 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=[]; };
+rmaf = derive { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
 rmarkdown = derive { name="rmarkdown"; version="0.5.1"; sha256="08v16n4a9rdr0fh54hlmfxifbpl40nfr24g3wrjxxacml16smcsd"; depends=[knitr yaml htmltools caTools]; };
 rmatio = derive { name="rmatio"; version="0.11.0"; sha256="0cmlh16nf3r94gpczq0j46g4dgjy9q1c647rqd9i14hvfrpxzcfa"; depends=[Matrix lattice]; };
 rmeta = derive { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
@@ -5479,7 +5568,7 @@ rorutadis = derive { name="rorutadis"; version="0.1.3"; sha256="0ik0dpmsyb4g9wl1
 rotations = derive { name="rotations"; version="1.3"; sha256="01qqiqlp370llk8w9g0nip08cd54rj9dsvf0qxznalyb7vpnvgxf"; depends=[ggplot2 Rcpp rgl sphereplot Rcpp RcppArmadillo]; };
 roughrf = derive { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[randomForest mice nnet]; };
 rowr = derive { name="rowr"; version="1.1.1"; sha256="1bpx9vd6i2ljwww3gp4c1fxbv9lsdxh3jdwkmrqqj2s18bkf0a7a"; depends=[]; };
-roxygen2 = derive { name="roxygen2"; version="4.1.0"; sha256="0jpaqrnkb6qfs6jly637j8sbng6r1gzw15phwkifsh0fgqbi61ap"; depends=[stringr brew digest Rcpp Rcpp]; };
+roxygen2 = derive { name="roxygen2"; version="4.1.1"; sha256="0qr562p3jb9kqim6mj344956pikmq1137gv1p086b4k90h5c3wyd"; depends=[stringr brew digest Rcpp Rcpp]; };
 royston = derive { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[nortest moments]; };
 rpanel = derive { name="rpanel"; version="1.1-3"; sha256="1wm0dcbyvxz4ily8skz2yda44n74x2nmc4pg11ja0yvk038gjfns"; depends=[]; };
 rpart = derive { name="rpart"; version="4.1-9"; sha256="108zsalgmp4mj66m2mxr56qrh3yz0pxfij81gri224r5brypqak1"; depends=[]; };
@@ -5499,7 +5588,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.1"; sha256="0da6pbzx2my052v8s9nyw0j5ljy4pfigyy82n72zp0jzhdzmq479"; depends=[quantreg]; };
-rr = derive { name="rr"; version="1.2"; sha256="0p3h15sbn2896ygxyvf4farys363r2p5jg41h07dzrcaif8i331l"; depends=[MASS arm coda]; };
+rr = derive { name="rr"; version="1.3"; sha256="00m5h01j3qb83s7bcjp4xx6pf16hjjhl0qryb929cnxn1ln0ddns"; 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]; };
@@ -5510,7 +5599,7 @@ rrlda = derive { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xr
 rrules = derive { name="rrules"; version="0.1-0"; sha256="0f9msp289akzricjrm8dvfbh2dihfbszr7ms4fld1cr30zssajin"; depends=[]; };
 rsae = derive { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
 rsatscan = derive { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-rscala = derive { name="rscala"; version="1.0.2"; sha256="13l1cmmj28kjrmxnvgi5zpxi8ak9956bzmsn1b3v7a3xb6glchij"; depends=[]; };
+rscala = derive { name="rscala"; version="1.0.4"; sha256="05pgyzin0d5lfz5rjf0c0j7b2zj7b8r1blgd126kjlvjkj1spy84"; depends=[]; };
 rscproxy = derive { name="rscproxy"; version="2.0-5"; sha256="1bjdv7drlnffcnyc0j8r22j7v60k1xj58bw8nk9l8wvnmngrjz86"; depends=[]; };
 rsdepth = derive { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
 rsdmx = derive { name="rsdmx"; version="0.4-5"; sha256="12rk0bcfsnkd2447jyc40857ksm7gbg4nn3slls9wsd641am6kxi"; depends=[XML RCurl plyr]; };
@@ -5523,13 +5612,13 @@ rsml = derive { name="rsml"; version="1.2"; sha256="1w9bqs32sn5ry5qjgnqnns56ylr5
 rsnps = derive { name="rsnps"; version="0.1.6"; sha256="1pqdmg1cwpm0cvr5ma7gzni88iq5kqv1w40v8iil3xvcmns8msjk"; depends=[plyr stringr httr RCurl XML jsonlite]; };
 rspa = derive { name="rspa"; version="0.1-6"; sha256="0zwmcjakpir8mvy8cvy8j85gar4s7gmizxc3z4mdrc4iadps9gqd"; depends=[editrules]; };
 rspear = derive { name="rspear"; version="0.1-2"; sha256="1rjg84plnvlcp3p2929f1afl43lb92d3bfsvlhsaw92z7iva1vad"; depends=[plyr]; };
-rsprng = derive { name="rsprng"; version="1.0"; sha256="1sfjwfm03pn73mcq4f2chsldjlhmpjxhqkpmaqf71jbmb7ph41ip"; depends=[]; };
-rstackdeque = derive { name="rstackdeque"; version="1.1"; sha256="1vvp8xsi7i0zds9pzh2a13nc1p73jkv9g4f24wv7a5qacymabv3k"; depends=[]; };
+rstackdeque = derive { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
 rstiefel = derive { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
 rstream = derive { name="rstream"; version="1.3.2"; sha256="1habswhdlx7l92s9p9554px4kf9f9mhk5vkdq2fv4wk3381c0fgi"; depends=[]; };
-rstudioapi = derive { name="rstudioapi"; version="0.2"; sha256="1ili2i71fmpbgavvva488vwy0qbrbiyl16za3a8d95ylwvpallmx"; depends=[]; };
+rstudioapi = derive { name="rstudioapi"; version="0.3.1"; sha256="0q7671d924nzqsqhs8d9p7l907bcam56wjwm7vvz44xgj0saj8bs"; depends=[]; };
 rsubgroup = derive { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[rJava foreign]; };
 rsunlight = derive { name="rsunlight"; version="0.3.0"; sha256="148byg8180657ny01xny28sdawbq87hf89f8c1rzfjl5qwcxmbqd"; depends=[httr plyr jsonlite stringr assertthat]; };
+rtable = derive { name="rtable"; version="0.1.0"; sha256="1jp7bd782ply2xb8p8xnmrds2w62bp7l2v4vlvbv1468kxhlfgf2"; depends=[xtable ReporteRs knitr tidyr shiny]; };
 rtape = derive { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; };
 rtdists = derive { name="rtdists"; version="0.2-6"; sha256="1f2yv4qq27i1fc0ys3kk31lsnbdzrmrk44widnxd19hxn4r05cs6"; depends=[evd msm gsl]; };
 rtematres = derive { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[XML RCurl plyr gdata]; };
@@ -5542,7 +5631,7 @@ rts = derive { name="rts"; version="1.0-3"; sha256="0jqk0p2q1vx9l6zf9pbc5k3lsw4h
 rtype = derive { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
 rucm = derive { name="rucm"; version="0.4"; sha256="1s3q6wfp9nb50rqsaq6h2wb48qvxncmlf8l4gm18pr25wkangfxq"; depends=[KFAS]; };
 rugarch = derive { name="rugarch"; version="1.3-4"; sha256="1za92hqfaws8azf2zml1q8mlbirrdw3rb4rvwg6sclfx7z7gsqkh"; depends=[Rsolnp nloptr ks numDeriv spd xts zoo chron SkewHyperbolic expm Rcpp Rcpp RcppArmadillo]; };
-runjags = derive { name="runjags"; version="1.2.1-0"; sha256="0rsqyrk9vzrnhw66c7hdqnbnvk6qsl882fshh2njzivaqxk2ibqq"; depends=[lattice coda]; };
+runjags = derive { name="runjags"; version="2.0.1-4"; sha256="1any5f7paf8a8yyvk594iixvh1l1dc87pil292sd1pq1lh2510lw"; depends=[lattice coda]; };
 ruv = derive { name="ruv"; version="0.9.4"; sha256="07bvyqrkm10vh63l8dm93spd7l0v105a87lsbjw4vg65czp1iayg"; depends=[]; };
 rv = derive { name="rv"; version="2.3.1"; sha256="0bjqwk7djl625fws3jlzr1naanwmrfb37hzkyy5szai52nqr2xij"; depends=[]; };
 rvHPDT = derive { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
@@ -5557,7 +5646,7 @@ rwt = derive { name="rwt"; version="1.0.0"; sha256="112wp682z4gkxsd3bqnlkdrh42bf
 ryouready = derive { name="ryouready"; version="0.3"; sha256="0nms3zfkis2fsxkyj3dr95vz3kk6pkm7l5ga7iz8pxy1ywrawj2i"; depends=[stringr car]; };
 rysgran = derive { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[soiltexture lattice]; };
 rzmq = derive { name="rzmq"; version="0.7.7"; sha256="0gf8gpwidfn4756jqbpdbqsl8l4ahi3jgavrrvbbdi841rxggfmx"; depends=[]; };
-s20x = derive { name="s20x"; version="3.1-12"; sha256="0kr3x5p7wspr9kgfq1361v78y6qnzkfbsdxqwl4zlzb2zpq6d5s4"; depends=[]; };
+s20x = derive { name="s20x"; version="3.1-15"; sha256="1l635mgqr95n2is56q34ahd0fpiymsdqbrmqf8vaa15spnfqcrwn"; depends=[]; };
 s2dverification = derive { name="s2dverification"; version="2.1.1"; sha256="1m3m5sbq96fhnl4slxgb2j0009kqfdivdn3nbb203pc0knjpflnq"; depends=[GEOmap geomapdata maps mapproj]; };
 s4vd = derive { name="s4vd"; version="1.0"; sha256="07pnkhyqf9iymj913813d93dmb3iqbdlcl0gsgacihyyinb4id5s"; depends=[biclust]; };
 sBF = derive { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; };
@@ -5566,9 +5655,9 @@ sGPCA = derive { name="sGPCA"; version="1.0"; sha256="16aa5jgvkabrlxaf1p7ngrls79
 sROC = derive { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
 sac = derive { name="sac"; version="1.0.1"; sha256="1rl5ayhg5y84fw9w3zf43dijjlw9x0g0w2z4haw5xmxfni72ms8w"; depends=[]; };
 saccades = derive { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; };
-sadists = derive { name="sadists"; version="0.1.0"; sha256="1qx0ki0w8i9w92phzcz57mm1kp4p2i5fznqvwa4amdqym66ky48c"; depends=[PDQutils hypergeo orthopolynom]; };
+sadists = derive { name="sadists"; version="0.2.0"; sha256="156a1xzii2nkfismwbrfli5yxz52alpkqdi7maqlx9b1qrpybmhs"; depends=[PDQutils hypergeo orthopolynom]; };
 sads = derive { name="sads"; version="0.1.10"; sha256="02662vbbk3jikp506ljil9zqchs6bq3lsw4fwbbi2wgg7xvb260g"; depends=[MASS bbmle poilog VGAM untb]; };
-sae = derive { name="sae"; version="1.0-2"; sha256="0a9g07m1a8v4iw9pnzlws356kv4f77qkz5yc454i7130zfp2kxxi"; depends=[nlme MASS]; };
+sae = derive { name="sae"; version="1.0-5"; sha256="05jvzq4cqb78pgdlxf8vlanx3v10n5njlw7g666nrnziy9ak8z4f"; depends=[nlme MASS]; };
 sae2 = derive { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
 saeSim = derive { name="saeSim"; version="0.7.0"; sha256="03zfw18fvx8blh9iijh3rnglg8zbsvd9dq3kqv6ajz3hwr90z29g"; depends=[dplyr functional ggplot2 MASS spdep parallelMap]; };
 saemix = derive { name="saemix"; version="1.2"; sha256="1whwn54iiapdfig6qpzji3z3skir6jrs34dq78zlynibgrg95hx6"; depends=[]; };
@@ -5584,12 +5673,13 @@ samplingVarEst = derive { name="samplingVarEst"; version="0.9-9"; sha256="04wgsq
 samplingbook = derive { name="samplingbook"; version="1.2.0"; sha256="1vynz6hsnz5d0vg66f8k67h24rb809k9chb4waymk6vwnp8lksz9"; depends=[pps sampling survey]; };
 samr = derive { name="samr"; version="2.0"; sha256="0rsfca07pvmhfn7b49yk2ycw00wsq6dmrpv9haxz8q0xv7n5n2q9"; depends=[matrixStats]; };
 sand = derive { name="sand"; version="1.0.2"; sha256="1y371ds86gcq2id996vp56h5dax2wm0mlk1ks2mp1k81n63l7wmf"; depends=[igraph igraphdata]; };
-sandwich = derive { name="sandwich"; version="2.3-2"; sha256="10ag2iwwxcwgbmbibfkpxxc8iih7bmya57zl4g983fb7zyd36mhz"; depends=[zoo]; };
+sandwich = derive { name="sandwich"; version="2.3-3"; sha256="1x2x0yxlrhdfyhk6jw4pim03yl5mg1wsi8cxxpbf9x4p68vd0w8y"; depends=[zoo]; };
 sanitizers = derive { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; };
 sanon = derive { name="sanon"; version="1.4"; sha256="0zg0paiz3rb0fk2mgi8rlzqy9vq3afy5vx6s15k1xqz8rjgsbd1x"; depends=[]; };
 sapa = derive { name="sapa"; version="2.0-1"; sha256="11xgd2ijfz5yn0zyl5gfy97h2cxi1vyxkrijy2s9b78wm7fzpnkv"; depends=[ifultools splus2R]; };
 saps = derive { name="saps"; version="1.0.0"; sha256="02si76ckinkm4ajclq4isy6gi0cf1mwfrq3w17i5gflbfqmf2qvj"; depends=[survival reshape2]; };
 sas7bdat = derive { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; };
+saturnin = derive { name="saturnin"; version="1.0"; sha256="0686c0y6dcnr8jcx26pd4g08hmlalbid6idg465pngshr57kl79k"; depends=[]; };
 saves = derive { name="saves"; version="0.5"; sha256="1b4mfi2851bwcp0frx079h5yl6y1bhc2s8ziigmr8kwy1y1cxw10"; depends=[]; };
 saws = derive { name="saws"; version="0.9-6.1"; sha256="0w40j6xczqs74z1z3na4510w06px7yn55s2mw9mddd6736l56fv1"; depends=[gee]; };
 sbgcop = derive { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
@@ -5607,7 +5697,7 @@ schoRsch = derive { name="schoRsch"; version="1.1"; sha256="0bi2vn9qr49yy3g45xgg
 scholar = derive { name="scholar"; version="0.1.2"; sha256="1h1a6psgmiifi7p87ar3fr0mcfmg44yh4683dmqxrxrfcvgaxvca"; depends=[stringr plyr R_cache XML]; };
 schoolmath = derive { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; };
 schwartz97 = derive { name="schwartz97"; version="0.0.6"; sha256="0l34f30l75zrg3n377jp0cw7m88cqkgzy6ql78mrx8ra88aspfzn"; depends=[FKF mvtnorm RUnit]; };
-scidb = derive { name="scidb"; version="1.1-2"; sha256="1nkyzvjpacm4imv778nc6gc468419shkyhxb59hsaw9840wcs1na"; depends=[Matrix iterators RCurl zoo]; };
+scidb = derive { name="scidb"; version="1.2-0"; sha256="17y1bml8kb896l3hsw356qdj25sfbdvm10dyxhaafdgcbp5ywcrn"; depends=[Matrix iterators RCurl zoo digest]; };
 scio = derive { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; };
 sciplot = derive { name="sciplot"; version="1.1-0"; sha256="0na4qkslg3lns439q1124y4fl68dgqjck60a7yvgxc76p355spl4"; depends=[]; };
 scoring = derive { name="scoring"; version="0.5-1"; sha256="0vxjcbp43h2ipc428qc0gx7nh6my7202hixwhnmspl4f3kai3wkp"; depends=[]; };
@@ -5615,13 +5705,13 @@ scout = derive { name="scout"; version="1.0.3"; sha256="0wmjmk0ckd211cq5ykd0yzjs
 scrapeR = derive { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[XML RCurl]; };
 scrime = derive { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
 scriptests = derive { name="scriptests"; version="1.0-15"; sha256="1f55rnz4zbywyn79l2ac2600k95fwxgnyh1wzxvyxjh4qcg50plv"; depends=[]; };
-scrm = derive { name="scrm"; version="1.3-3"; sha256="0if338nkbfiakb82wrvy25xsnf337gm4xz5b9027s5yblwwxngf1"; depends=[Rcpp Rcpp]; };
+scrm = derive { name="scrm"; version="1.5.0-1"; sha256="176k3qmlfs1cj8gm421p3hivs434xvm6ch3gva7x7766vz5mxi39"; depends=[Rcpp Rcpp]; };
 scrypt = derive { name="scrypt"; version="0.1.0"; sha256="1hc1rziigwggdx2pvklldkw88mdzbwa8b8a2a0ip4cm1w6flsl9n"; depends=[Rcpp Rcpp]; };
 scuba = derive { name="scuba"; version="1.7-0"; sha256="11mdc8pj552ag36ib4sfbjv8r0psa6wnb13spz0v3rbaslz25hpw"; depends=[]; };
 sda = derive { name="sda"; version="1.3.6"; sha256="1igdkgpxlni4d8h5k912aikbd66jqkabzq144xlgd2vp3kcbw4ly"; depends=[entropy corpcor fdrtool]; };
 sdcMicro = derive { name="sdcMicro"; version="4.4.0"; sha256="0ig43sdzn940mpv2d8v1v0k77nb5mwwsy8amkb6vdxs0rql7qvyy"; depends=[brew knitr data_table xtable car robustbase cluster MASS e1071 Rcpp sets Rcpp]; };
 sdcMicroGUI = derive { name="sdcMicroGUI"; version="1.1.1"; sha256="0icxxbfxl65da07bpi7l2jzk85y990ndhl60lwyp077sjq5rd20q"; depends=[sdcMicro gWidgetsRGtk2 cairoDevice vcd foreign Hmisc]; };
-sdcTable = derive { name="sdcTable"; version="0.17.1"; sha256="0wljdpggf8mhsjg0xrgb3xqd346zb4f8pk0jfgv38krhkfxz1ss5"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; };
+sdcTable = derive { name="sdcTable"; version="0.18.0"; sha256="13k96ahz6vzvbnvca18p0r1pv9k6sdmxbq04cf76an7r2g4w6kji"; depends=[stringr Rcpp Rglpk lpSolveAPI data_table Rcpp]; };
 sdcTarget = derive { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[magic foreach doParallel tuple]; };
 sddpack = derive { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
 sde = derive { name="sde"; version="2.0.13"; sha256="194dkwrww9win5chhlffjv1xkhpxx2bcv6hf81xaqk7pdf7ifj80"; depends=[MASS fda zoo]; };
@@ -5633,12 +5723,13 @@ sdtoolkit = derive { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb
 sdwd = derive { name="sdwd"; version="1.0.1"; sha256="1df8xx538ba3axi0jbkvyrdl7qnmkvh1x15kh57jmw3qbpf5gh56"; depends=[Matrix]; };
 seacarb = derive { name="seacarb"; version="3.0.6"; sha256="0xhyy8nd20f29j9y3x250fq8qp57gdv61gg4ck24v4jbl8qvwhla"; depends=[oce]; };
 sealasso = derive { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
+searchable = derive { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
 seas = derive { name="seas"; version="0.4-3"; sha256="1n0acg6fvaym4nx1ihw0vmb79csds0k4x9427qmcyxbl9hxxmllp"; depends=[]; };
 season = derive { name="season"; version="0.3-5"; sha256="08f382kq51r5g9p5hsnjf17dwivhx1vfgmmwp1vzmbqx1drlqkzx"; depends=[ggplot2 MASS mgcv survival coda]; };
 seasonal = derive { name="seasonal"; version="0.80.0"; sha256="06rwbvzgxrhqldni59qq0xzky4qzlkrx088i9qgs99id8ypbvvc5"; depends=[]; };
 seawaveQ = derive { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[survival NADA lubridate]; };
-secr = derive { name="secr"; version="2.9.3"; sha256="1jy9phy6h9rf3l08gd5bxnjj37gdbnwbwy9flcyakcjlycj5smvb"; depends=[abind MASS nlme sp mgcv raster]; };
-secrdesign = derive { name="secrdesign"; version="2.2.2"; sha256="028d6kaf09fh2kkdawgjln2qlh3xd89p3pbqmqwwsdp6p43x0wxy"; depends=[secr abind]; };
+secr = derive { name="secr"; version="2.9.4"; sha256="0g7j68ys9dd8rz1y8wsmy3lwwxpwwkps6wpx67l86lzz99nwh64g"; depends=[abind MASS nlme sp mgcv raster]; };
+secrdesign = derive { name="secrdesign"; version="2.3.0"; sha256="1f5swggkky721z0js2jr1gb3mrx9h6qlld70bjd86x9f73s9cm0n"; depends=[secr abind]; };
 secrlinear = derive { name="secrlinear"; version="1.0.5"; sha256="084d0spshf3lh1m50kyb0r8x9lz4yrfj6b7snywffxhqyjw147hf"; depends=[secr sp igraph maptools MASS]; };
 seedy = derive { name="seedy"; version="1.0"; sha256="1p9mbnkgdz3rlaj5ygaai81g8kvs68y4zcgf7745gr17vflys8kf"; depends=[]; };
 seeg = derive { name="seeg"; version="1.0"; sha256="1d45vl075p4qbd74gpaa8aw1h82p9n633fym10yp9bmcv4gwksg6"; depends=[car spatstat sgeostat]; };
@@ -5682,12 +5773,13 @@ seqmon = derive { name="seqmon"; version="0.2"; sha256="075hc6vgl1w3nisrihf5w6mk
 sequences = derive { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp Rcpp]; };
 sequenza = derive { name="sequenza"; version="2.1.1"; sha256="0vrdmfy8qyzjflyl5skcy9mazl56py5gzb1kn1xh2hiv3mshdrfx"; depends=[squash]; };
 seriation = derive { name="seriation"; version="1.0-14"; sha256="0a7m1x6dhk00wh6djiz75x462y06fammr7fd2z8ks32migsbbvpp"; depends=[TSP cluster gclus colorspace MASS]; };
-servr = derive { name="servr"; version="0.1"; sha256="035pf1xg0jgjrba39wxwlrh7n43kp29ymagfv7yskxj31dh3b34i"; depends=[httpuv]; };
+seroincidence = derive { name="seroincidence"; version="1.0.3"; sha256="1qk11xrv2qnw3wmcg357m9nbnc1qr3wl2nznj8xw10r3jc1736s8"; depends=[]; };
+servr = derive { name="servr"; version="0.2"; sha256="0gah99snaj8lk5zfzbxi3jwvpnlff9diz9gqv4qalfxpmb7fp6lc"; depends=[mime httpuv jsonlite]; };
 sesem = derive { name="sesem"; version="1.0.1"; sha256="0s4xkv6bc5nxhj09mk9agnj11b9h7swccs9jrn4lg3fy12vqhf5a"; depends=[lavaan mgcv gplots]; };
 session = derive { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
 setRNG = derive { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; };
 sets = derive { name="sets"; version="1.0-13"; sha256="1ys17iy2gjkfnp3914g6sfx3ilgm18pdfak59cqrwalwwnhc3zaz"; depends=[]; };
-settings = derive { name="settings"; version="0.1.1"; sha256="00b69vh4r8f40v6rm11hgry7dfqsrd2ij9h07y60xxzdjrwigm14"; depends=[]; };
+settings = derive { name="settings"; version="0.2.1"; sha256="0dxnysa3857d141rk46pyfkbgzk6ms3fhb2bz0y41jy72bdhxmrm"; depends=[]; };
 setwidth = derive { name="setwidth"; version="1.0-3"; sha256="1s6m24kmkafscgibgfldm70m57bv4gs0m7fdki18nwdi1rvwpkbf"; depends=[]; };
 severity = derive { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
 sfa = derive { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
@@ -5696,20 +5788,21 @@ sft = derive { name="sft"; version="2.0-7"; sha256="1fq1b32f08i4k9bv4hh7rhk1jj7k
 sgPLS = derive { name="sgPLS"; version="1.1"; sha256="09nf9qqhlddcgp2y44lxgva9vy3dgbmw1hbl0phw95wb8b9p1m0s"; depends=[mixOmics]; };
 sgeostat = derive { name="sgeostat"; version="1.0-25"; sha256="04zl932s6zb26r42h2l8qf3d43bmrq67281mrkh4spn4vcddv5da"; depends=[]; };
 sglOptim = derive { name="sglOptim"; version="1.0.122.1"; sha256="0ld53rdxai85r9hwz9jrsxr08lxin0ksxa6823r7cr96w18c1ssm"; depends=[Matrix Rcpp RcppProgress RcppArmadillo BH]; };
-sglasso = derive { name="sglasso"; version="1.1-0"; sha256="1iyj8clk2ibj94nxh1xi1wr50y2l53fxcivc2jdnilcqmscwbf1x"; depends=[Matrix]; };
+sglasso = derive { name="sglasso"; version="1.1-1"; sha256="0qfpnvk5r9a0ri2zxgv75qc46dnaf4193f3m32hvq3lmynx3cyjg"; depends=[Matrix]; };
 sglr = derive { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
 sgof = derive { name="sgof"; version="2.2"; sha256="087f4nbx9ppzi5za3f4w4msq2gd3r08v16fihppa30nqydg3ssbj"; depends=[poibin]; };
 sgr = derive { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
 sgt = derive { name="sgt"; version="1.1"; sha256="0j4xxh5lypcl0hyfx7gzrhb40z36ygn97hf1nl6m8wj4dncg39jf"; depends=[maxLik]; };
 shape = derive { name="shape"; version="1.4.2"; sha256="0yk3cmsa57svcvbnm21pyr0s0qbhnllka8nmsg4yb41frjlqph66"; depends=[]; };
+shapeR = derive { name="shapeR"; version="0.1-3"; sha256="12j6qawnhv7i1488wkh8shm3shzi7g58r8pk9p10lm0bwi59l2l8"; depends=[gplots jpeg pixmap wavethresh vegan MASS]; };
 shapefiles = derive { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; };
 shapes = derive { name="shapes"; version="1.1-10"; sha256="038xps6f8b6w9qa9csqk33ggmb311h5zxwsxr027bd95a3vmyijx"; depends=[scatterplot3d rgl MASS]; };
 sharpshootR = derive { name="sharpshootR"; version="0.7-2"; sha256="04plsgmyil6znmcqx2j78n2vjj4y4mprb3wqbhwagapdhvp9rcis"; depends=[aqp ape soilDB igraph cluster lattice latticeExtra vegan sp reshape2 Hmisc scales circular RColorBrewer plyr]; };
 sharx = derive { name="sharx"; version="1.0-4"; sha256="1flcflx6w93s8bk4lcwcscwx8vacdl8900ikwkz358jbgywskd5n"; depends=[Formula dcmle dclone]; };
 shiny = derive { name="shiny"; version="0.11.1"; sha256="1aplb2wvgsbg6hhjsyjjhd8qbj11yrzm10rr812lzpiavd9wjn3w"; depends=[httpuv mime RJSONIO xtable digest htmltools R6]; };
 shinyAce = derive { name="shinyAce"; version="0.1.0"; sha256="1031hzh647ys0d5hkw7cqxj0wgry3rxgq95fgs7slbm0rgx9g6f7"; depends=[shiny]; };
-shinyBS = derive { name="shinyBS"; version="0.20"; sha256="1l95g2rzv53vwx5zcaqiqz8jirncwh1yb14y62x9phg4n5jfk9f8"; depends=[shiny]; };
-shinyFiles = derive { name="shinyFiles"; version="0.5.0"; sha256="0ax8blsflzwzzp7ky7zs48dsf8a9dzm18hcmif9hjlq8dy5bh7sp"; depends=[shiny htmltools]; };
+shinyBS = derive { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[shiny htmltools]; };
+shinyFiles = derive { name="shinyFiles"; version="0.6.0"; sha256="08cvpvrsr1bh0yh17ap20bmwxa4bsan3h6bicrxzanl2dlwp8kvr"; depends=[shiny htmltools RJSONIO]; };
 shinyRGL = derive { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
 shinyTree = derive { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
 shinybootstrap2 = derive { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
@@ -5756,8 +5849,10 @@ sisVIVE = derive { name="sisVIVE"; version="1.0"; sha256="1y6zq8dp5k9mx83x6fryjh
 sisus = derive { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[MASS RColorBrewer coda gdata gtools moments polyapost rcdd]; };
 sitar = derive { name="sitar"; version="1.0.1"; sha256="1ji8742f518fzg8xz0dy5irwdz7a0nymajh69zd2l53yvcsnlwdp"; depends=[nlme]; };
 sitools = derive { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; };
+sivipm = derive { name="sivipm"; version="1.0-0"; sha256="1r548kfsi90rzisx37nw3w9vwj3gs4ck5zhwlskbdzgigb78spfp"; depends=[seqinr]; };
 sjPlot = derive { name="sjPlot"; version="1.7"; sha256="0kk9isz105y6m83vk6x6c7i55kch51w2a4l8nlc44ffbm8zwqqa1"; depends=[ggplot2 MASS car foreign psych scales dplyr tidyr]; };
 sjdbc = derive { name="sjdbc"; version="1.5.0-71"; sha256="0i9wdfadfcabayq78ilcn6x6y5csazbsgd60vssa2hdff0ncgvk1"; depends=[rJava]; };
+sjmisc = derive { name="sjmisc"; version="1.0.0"; sha256="1hzh39az30xhda3jvah8lldd42fm8ipc6kqyzh2pq2dhwkbnhns4"; depends=[MASS]; };
 skatMeta = derive { name="skatMeta"; version="1.4.3"; sha256="0bknv066ya4yl4hl4y02d9lglq2wkl9c2j1shzg3d64dg4sjvbak"; depends=[Matrix coxme survival CompQuadForm]; };
 skda = derive { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
 skewt = derive { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
@@ -5782,22 +5877,23 @@ smco = derive { name="smco"; version="0.1"; sha256="1sj3y1x6pc32cwzyhn9gaxs964xh
 smcure = derive { name="smcure"; version="2.0"; sha256="1j7fxnb0sx57a0l929c3haz4f1y829ymlq0cvdh0cia4qp6ydv60"; depends=[survival]; };
 smdata = derive { name="smdata"; version="1.1"; sha256="1hcr093xfkp88fn75imjkmfnp9cfsng5ndxpa8m2g0l29qhpxfvk"; depends=[]; };
 smdc = derive { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; };
+smds = derive { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; };
 sme = derive { name="sme"; version="0.8"; sha256="1djrs3z699p6q2y1hfywh27csqc9cp1cfm3lxkigmmvxqjhyshz6"; depends=[lattice]; };
 smfsb = derive { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
 smirnov = derive { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
 smnet = derive { name="smnet"; version="1.0"; sha256="185ihq44fp00qp03lp9hz821a1ddm1bd09k3j0ii715grc91nc49"; depends=[SSN spam dfoptim RSQLite igraph DBI]; };
 smoothHR = derive { name="smoothHR"; version="1.0.1"; sha256="02kjqkgnhjwhq1vmva9nmy36a7bc6zjj6g81dw9m4zd3y9nbb005"; depends=[survival]; };
 smoothSurv = derive { name="smoothSurv"; version="1.5"; sha256="145j415jr482s860c685sr815bwx7g63pkfhra1m6r2wawqb2gl5"; depends=[survival]; };
-smoother = derive { name="smoother"; version="1.0.0.0"; sha256="0i4g19xh20v4ig9fcy1gvbawi0a92jkg2qwdcxvgcflvppnvbv22"; depends=[]; };
+smoother = derive { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
 smoothie = derive { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
 smoothmest = derive { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
 smoothtail = derive { name="smoothtail"; version="2.0.3"; sha256="0yr3j5mq1h9pd72kyi9z6wzly9cqkscim814yi710y79l03gp0fd"; depends=[logcondens]; };
 sms = derive { name="sms"; version="2.3"; sha256="0grxyp590hj2rvw1fw3yidzkl8nqqp5a14bp9xfpdph2nyas61qq"; depends=[doParallel foreach]; };
 smss = derive { name="smss"; version="1.0-1"; sha256="17a0x92hxzn212yiz87n7ssyi3bdhnyawxk1kkmk46q1ss22a1pm"; depends=[]; };
-sn = derive { name="sn"; version="1.1-2"; sha256="0ik528c0nxcr7hc3x6xx4zpyjhpaaa55jrvz1141f9bggv6bwclh"; depends=[mnormt numDeriv]; };
+sn = derive { name="sn"; version="1.2-0"; sha256="05n1kns8p1l7v87k3rxzgcz1vphq38cah7w01xq2bgcnklx677n8"; depends=[mnormt numDeriv]; };
 sna = derive { name="sna"; version="2.3-2"; sha256="1dmdv1bi22gg4qdrjkdzdc51qsbb2bg4hn47b50lxnrywdj1b5jy"; depends=[]; };
 snapshot = derive { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
-snht = derive { name="snht"; version="1.0.1"; sha256="0fv2p12c72acimkasnb8d7yq7l4j5y7c9v64q54k8fy85rkjw9wl"; depends=[mgcv zoo plyr reshape]; };
+snht = derive { name="snht"; version="1.0.2"; sha256="1rs9q8fmvz3x21ymbmgmgkqr7hqf3ya3xb33zj31px799jlldpb9"; depends=[ggplot2 gridExtra mgcv zoo plyr reshape]; };
 snipEM = derive { name="snipEM"; version="1.0"; sha256="0f98c3ycl0g0l3sgjgk7xrjp6ss7n8zzlyzvpcb6agc60cnw3w03"; depends=[Rcpp mvtnorm MASS GSE Rcpp RcppArmadillo]; };
 snow = derive { name="snow"; version="0.3-13"; sha256="1habq43ncac9609xky3nqfkbq52cz36dg8jbdihag269z1kazdnf"; depends=[]; };
 snowFT = derive { name="snowFT"; version="1.3-0"; sha256="10hhhzzzyz1ph7c8k08s79h4pdwq4jk8bh47y37ww0yjq0fd6gik"; depends=[snow]; };
@@ -5810,11 +5906,11 @@ snpar = derive { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxga
 snplist = derive { name="snplist"; version="0.13"; sha256="1v9n3gdvygx4s6hlm0ijyw04szxwn9c1dqnhaqn61a8yfkmmnxn8"; depends=[RSQLite Rcpp R_utils DBI Rcpp]; };
 sns = derive { name="sns"; version="1.0.0"; sha256="0qr5gj095xg48mqj7maz1m1zizx1jdjca8qygygqvak1b7nl4ccs"; depends=[mvtnorm coda]; };
 soc_ca = derive { name="soc.ca"; version="0.7.1"; sha256="0lg1bpbd0crywa29xc79cn3kr614wq4hr09xpwk17nv7q8qw8cnh"; depends=[ggplot2 gridExtra ellipse scales]; };
-softImpute = derive { name="softImpute"; version="1.0"; sha256="0pkpr8pxvrrw4p95907bnhl3k54dxz5r2fk8zi56kilrarhzchqr"; depends=[Matrix]; };
+softImpute = derive { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; 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.5-2"; sha256="1xiiprshh40qkx23wxd20rd7bsbwgw03pa0hv8m6q64pri7v8xq0"; depends=[aqp plyr Hmisc RCurl XML sp]; };
-soilphysics = derive { name="soilphysics"; version="2.1"; sha256="0j2jqdzkm5clqsn0z01ldzx138yf37gvyrk79yqhmwiigvp5b728"; depends=[rpanel MASS]; };
+soilphysics = derive { name="soilphysics"; version="2.2"; sha256="02x0xn8126g8g86nsqkj3qwabd9lkayra30ac3pbg0yn38kipz4d"; 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]; };
 soilwater = derive { name="soilwater"; version="1.0.1"; sha256="08rz1i5dsgwfvfd4sl5x9j970v82v3kny0rqg1zbdnr53vp2xc7j"; depends=[]; };
@@ -5868,7 +5964,7 @@ sparseMVN = derive { name="sparseMVN"; version="0.2.0"; sha256="12g387bvpy4249kw
 sparseSEM = derive { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
 sparsediscrim = derive { name="sparsediscrim"; version="0.2"; sha256="0m8ccmqpg1np738njavf736qh917hd3blywyzc3vwa1xl59wqccl"; depends=[corpcor bdsmatrix mvtnorm]; };
 sparsenet = derive { name="sparsenet"; version="1.2"; sha256="106a2q4syrcnmicrx92gnbsf2i5ml7pidwghrpl6926glj59j248"; depends=[glmnet shape]; };
-spartan = derive { name="spartan"; version="2.1"; sha256="1zkb08ppsmbkvgw16y46nlhcsb2s7dh3rcm7f57ydchpda2gxixh"; depends=[]; };
+spartan = derive { name="spartan"; version="2.2.1"; sha256="1syrvx3gmgsi3f49j27zg59b3i29v20352qbsc5mrqnwh5lawi1y"; depends=[]; };
 spatcounts = derive { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
 spate = derive { name="spate"; version="1.4"; sha256="1cr63qm3hgz6viw6ynzjv7q5ckfsan7zhbp224gz4cgx5yjg0pn3"; depends=[mvtnorm truncnorm]; };
 spatgraphs = derive { name="spatgraphs"; version="2.62"; sha256="1h7sv6qc5zhaiaqlrzagrlc2mxlasdzilmi5q9nrd1vsdzsqxvb4"; depends=[]; };
@@ -5904,6 +6000,7 @@ sperich = derive { name="sperich"; version="1.5-5"; sha256="0xwzyfx3z06lapvhzdzr
 sperrorest = derive { name="sperrorest"; version="0.2-1"; sha256="17jq8r98pq3hsyiinxg30lddxwpwi696srsvm3lfxrzk11076j6v"; depends=[ROCR rpart]; };
 spfrontier = derive { name="spfrontier"; version="0.1.12"; sha256="1jy1604gppis7vbn55pv13bywy1aqwzshwj03bbfln0qxikzqzi0"; depends=[moments ezsim tmvtnorm mvtnorm maxLik spdep]; };
 spgrass6 = derive { name="spgrass6"; version="0.8-6"; sha256="0vpv2vycd6rdnwm1f73733x1nclhr2x4x1s5116szskni77b0pii"; depends=[sp XML]; };
+spgs = derive { name="spgs"; version="1.0"; sha256="1f75dvp6m5w5phg158ykvl4myvw6q4vysb2pc3bgm0f9fpcadfip"; depends=[]; };
 spgwr = derive { name="spgwr"; version="0.6-26"; sha256="02kwpg927r2d2zrnhb5cjp1p8j0pal344hzvzsl4d0hz0xcipp8f"; depends=[sp]; };
 sphereplot = derive { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
 sphet = derive { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[nlme spdep Matrix sp]; };
@@ -5942,12 +6039,13 @@ srd = derive { name="srd"; version="1.0"; sha256="04j2gj7fn7p2rm34haayswrfhn6w5l
 ss3sim = derive { name="ss3sim"; version="0.8.2"; sha256="1gj3kf4ccd5n2jr4sm50gny5x1zq4brkhqgw0nww41spnimascfr"; depends=[plyr r4ss gtools lubridate reshape2]; };
 ssanv = derive { name="ssanv"; version="1.0-2"; sha256="18ib0djqxjpp4xgvsffwqgxqljpwc24ysxj26phpr6p8kdl3hr2f"; depends=[]; };
 ssd = derive { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
-sse = derive { name="sse"; version="0.5-1"; sha256="0g0bwmgc585haqbb13366s3pv1vdh793hwwibz7im0avjs2ldsjq"; depends=[lattice]; };
+sse = derive { name="sse"; version="0.5-4"; sha256="126dc4gk0hynwfz887d3wdcs7xacmmjhpf82sbhmhvg73dc1r5jz"; 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=[]; };
+sspse = derive { name="sspse"; version="0.5"; sha256="1r2pfqpr5y6q0vjcf14020srxcpqd5jjab73i4m03aqqsryr8c6c"; depends=[coda]; };
 sss = derive { name="sss"; version="0.0-11"; sha256="0k7p1ws0w7wg9wyxcg1zpk8q6kr32l3jl6yd9r4qmzq04dwqrdgz"; depends=[plyr XML]; };
 ssvd = derive { name="ssvd"; version="1.0"; sha256="1fdpr38qi59ijrz16jixn6ii1hvmxfjirjqfcp7dxrqz9nx8x0sk"; depends=[]; };
 ssym = derive { name="ssym"; version="1.5.2"; sha256="0c3c4disiicavr8m2yvvi2k38gnw4akdqp0f1v6647i5zj160zkr"; depends=[GIGrvg numDeriv normalp Formula]; };
@@ -5966,9 +6064,10 @@ statar = derive { name="statar"; version="0.1.3"; sha256="1lkbp6ki4w0gm3l683xar4
 statcheck = derive { name="statcheck"; version="1.0.1"; sha256="01b40bjagkj6hfyq9ppdlaafwgykv8p9s8sm0abd3if82ivdpixj"; depends=[plyr]; };
 statebins = derive { name="statebins"; version="1.0"; sha256="1mqky4nb31xjhn922csvv8ps2fwgcgazxs56rcn3ka32c59a4mmg"; depends=[ggplot2 scales gridExtra RColorBrewer]; };
 statfi = derive { name="statfi"; version="0.9.8"; sha256="0kg9bj2mmd95ysg604rcg4szqx3whbqm14fwivnd110jgfy20gk2"; depends=[pxR]; };
-statmod = derive { name="statmod"; version="1.4.20"; sha256="11986yjry1lg28s09q6vv2671x51nnfin6j0mpscq2ygyi615jwz"; depends=[]; };
+statmod = derive { name="statmod"; version="1.4.21"; sha256="138lh9qa25w6vaksbq43iqisj4c8hvmkjc3q81fn7m8b7zlnz6da"; depends=[]; };
 statnet = derive { name="statnet"; version="2014.2.0"; sha256="0xp8xnqb32wzkxfm7f34z6mnsd9id8an5829n16czwldj9vv6s10"; depends=[network ergm sna networkDynamic tergm ergm_count latentnet statnet_common]; };
 statnet_common = derive { name="statnet.common"; version="3.2.2"; sha256="1xdkc1pyf6wfb86dwz6bkjli5qw6yz6dvlxwp5bpgkpg83aa9n7g"; depends=[]; };
+stcm = derive { name="stcm"; version="0.1.0"; sha256="0j2yhmg6m69igg3ilrf7rq3l37aqab7h4fx08k3gfgc8005w7ils"; depends=[QCA plyr ggplot2 XML randomForest caret dendextend magrittr]; };
 steepness = derive { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
 stellaR = derive { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
 stepPlr = derive { name="stepPlr"; version="0.92"; sha256="16j32sk7ri4jdgss7vw5zz7s42rxk7rs376iyxzzpy1zcc9b64rv"; depends=[]; };
@@ -6014,7 +6113,7 @@ suRtex = derive { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxig
 subgroup = derive { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; };
 subplex = derive { name="subplex"; version="1.1-4"; sha256="0c6y5ibyxh0mpn77f7kwrmkpb3mah10hbqhwqmz4i1lfv58mb4zk"; depends=[]; };
 subrank = derive { name="subrank"; version="0.9.1"; sha256="0ghfpvw7aflbnnisn3rq8vrpi134ghm6vnyb7md1gi730mqgxfxv"; depends=[]; };
-subselect = derive { name="subselect"; version="0.12-4"; sha256="0h56d68clsr4lmvn2a291di62xvjdypbwlpk2x1xjlyss10yhamh"; depends=[]; };
+subselect = derive { name="subselect"; version="0.12-5"; sha256="00wlkj6p0p2x057zwwk1xdvji25yakgagf98ggixmvfrk1m1saa4"; depends=[]; };
 subsemble = derive { name="subsemble"; version="0.0.9"; sha256="0vzjmxpdwagqb9p2r4f2xyghmrprx3nk58bd6zfskdgj0ymfgz5z"; depends=[SuperLearner]; };
 subtype = derive { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; };
 sudoku = derive { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; };
@@ -6033,7 +6132,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.5"; sha256="137k453v6jsl07s0qks0wf452lxx3klbqqic52jj9yzgr6ic3xig"; depends=[survival ggplot2 KMsurv combinat Hmisc zoo data_table km_ci gridExtra rpart gam]; };
+survMisc = derive { name="survMisc"; version="0.4.6"; sha256="1d16kkzg0clwvv5rgv4rlm79dxhxhhzv9bkx6420izmyx0wjcnhn"; depends=[survival KMsurv combinat Hmisc zoo km_ci ggplot2 data_table gridExtra rpart gam]; };
 survPresmooth = derive { name="survPresmooth"; version="1.1-8"; sha256="1qva7yx4vv99mgh3wqxdnbasa1gy0ixxyxpqrfbn6827whjzf91m"; depends=[]; };
 survRM2 = derive { name="survRM2"; version="1.0-1"; sha256="1qcjdx4a9b9dg8jkzak6rq4d4byf9377h43f1m3icdgf79vghlhr"; depends=[survival]; };
 survSNP = derive { name="survSNP"; version="0.23.2"; sha256="0vpk5qdvsagv5pnap7ja7smqvibvfp5v7smhikbbwl0h6l83jjw4"; depends=[survival Rcpp lattice foreach xtable Rcpp]; };
@@ -6045,7 +6144,7 @@ survival = derive { name="survival"; version="2.38-1"; sha256="0kq0a6h1bmphp4vi1
 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]; };
-survsim = derive { name="survsim"; version="1.1.2"; sha256="1pnzkw0hr0gpwh0v26k4fh7qjl0c6ps9y8gmfd46h8wz2fb25vqx"; depends=[eha statmod]; };
+survsim = derive { name="survsim"; version="1.1.3"; sha256="1xcmgwzbflm1v7hxj1niwl7386mnp9asgrngs77vrayv056l8nm0"; depends=[eha statmod]; };
 svDialogs = derive { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; };
 svDialogstcltk = derive { name="svDialogstcltk"; version="0.9-4"; sha256="16166f8i6nsg7palqmnlp5b9s91d6ja9n0zm6rcvd2fwnw2ljkr4"; depends=[svDialogs svGUI]; };
 svGUI = derive { name="svGUI"; version="0.9-55"; sha256="1fkkc12mhcbn3s2wzk0xdsp8jl2xmn48ys2an8jhxbww3gplk1rq"; depends=[]; };
@@ -6074,7 +6173,7 @@ sybil = derive { name="sybil"; version="1.2.6"; sha256="1d7q0dvpqxay86dy4zbllv78
 sybilDynFBA = derive { name="sybilDynFBA"; version="0.0.2"; sha256="1sqk6dwwfrwvgkwk6mra0i1dszhhvcwm58ax6m89sxk8n0nbmr4b"; depends=[sybil]; };
 sybilEFBA = derive { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[sybil Matrix]; };
 sybilSBML = derive { name="sybilSBML"; version="2.0.8"; sha256="1sxp0naws7d1ak0xna1sy87zzjrravwax0qvcd6vy4p0f39z06ci"; depends=[Matrix sybil]; };
-sybilccFBA = derive { name="sybilccFBA"; version="1.0.0"; sha256="1fmhgyqzipddcqx2srms9bgigjmijasxhsmivv6c45ln23qjvgf5"; depends=[sybil Matrix]; };
+sybilccFBA = derive { name="sybilccFBA"; version="2.0.0"; sha256="0x0is1a56jyahaba6dk9inj5v248m8n46f70ynqyqp1xpiax1fkr"; depends=[sybil Matrix]; };
 sybilcycleFreeFlux = derive { name="sybilcycleFreeFlux"; version="1.0.1"; sha256="0ffmgnr239xz8864vmrqlhwwc97fqzzib6kwrsm7bszdnw1kkv3r"; depends=[sybil Matrix MASS]; };
 symbolicDA = derive { name="symbolicDA"; version="0.4-2"; sha256="1vn7r7b7yyn2kp8j3ghw50z49yzvwhm0izc6wgc7a99300xrr77s"; depends=[clusterSim XML rgl shapes e1071 ade4 cluster]; };
 symbols = derive { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
@@ -6126,7 +6225,7 @@ texmex = derive { name="texmex"; version="2.1"; sha256="17x4xw2h4g9a10zk4mvi3jz3
 texmexseq = derive { name="texmexseq"; version="0.1"; sha256="18lpihiwpjkjkc1n7ka6rzasrwv8npn4939s1gl8g1jb27vnhzb5"; depends=[]; };
 texreg = derive { name="texreg"; version="1.34"; sha256="03w8fk5lkpgag22a63jnhf0cn3l5ryjh4pkfhxgqzrijvrr1v2cb"; depends=[]; };
 textcat = derive { name="textcat"; version="1.0-2"; sha256="0sjhahmqva9pwp75zwxxf8g1cw38awid3w6rx9xfx73cpj2blcz3"; depends=[tau slam]; };
-textir = derive { name="textir"; version="2.0-2"; sha256="19n14nqx7gcp5ypfqwmk80lxxwqc0dklm09z3f9czg68j6qv181i"; depends=[distrom gamlr Matrix]; };
+textir = derive { name="textir"; version="2.0-3"; sha256="039xl2h0igrp3fzr1qiyb0zr6j4bbajhj36apylqvwsczzaywhwb"; depends=[distrom gamlr Matrix]; };
 textometry = derive { name="textometry"; version="0.1.4"; sha256="17k3v9r5d5yqgp25bz69pj6sw2j55dxdchq63wljxqkhcwxyy9lh"; depends=[]; };
 textreg = derive { name="textreg"; version="0.1.2"; sha256="0qya0czbi78a29jp9pd3lbqh574d9k0i340hrgc6jmdhwzhimhk7"; depends=[tm NLP Rcpp Rcpp]; };
 tfer = derive { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
@@ -6139,6 +6238,7 @@ thermocouple = derive { name="thermocouple"; version="1.0.0"; sha256="1pawk7aq27
 thgenetics = derive { name="thgenetics"; version="0.3-4"; sha256="1316nx0s52y12j9499mvi050p3qvp6b8i01v82na01vidl54b9c2"; depends=[]; };
 threeboost = derive { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
 threg = derive { name="threg"; version="1.0.2"; sha256="0wb9waj0j83zrj763d3fdnp3lp52gfdyzv23yrvxvd6zmk5clgi2"; depends=[survival Formula]; };
+thsls = derive { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; };
 tibbrConnector = derive { name="tibbrConnector"; version="1.5.0-71"; sha256="0d8gy126hzzardcwr9ydagdb0dy9bdw30l8s2wwi7zaxx2lpii6q"; depends=[RCurl rjson]; };
 tictoc = derive { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
 tidyr = derive { name="tidyr"; version="0.2.0"; sha256="169i6xnr4bs5vqkv6dilj5j8v95giz0b7byhi06qk414gdlj2r8n"; depends=[reshape2 dplyr stringi lazyeval]; };
@@ -6149,14 +6249,14 @@ tightClust = derive { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v
 tikzDevice = derive { name="tikzDevice"; version="0.8.1"; sha256="0262szfzv4yrfal19giinrphra1kfcm2arfckql4rf2zsq13rw35"; depends=[filehash]; };
 tileHMM = derive { name="tileHMM"; version="1.0-6"; sha256="18vqj7fdh4knnjk9s7yk2bgn3qwqz92fmm5fdny21gi0wl4qgdsd"; depends=[]; };
 timeDate = derive { name="timeDate"; version="3012.100"; sha256="0cn4h23y2y2bbg62qgm79xx4cvfla5xbpmi9hbdvkvpmm5yfyqk2"; depends=[]; };
-timeROC = derive { name="timeROC"; version="0.2"; sha256="1ikd2wr5cja784hihqdyk7mwky18czz58sl0xrvmzhc67153a4jz"; depends=[pec mvtnorm timereg]; };
+timeROC = derive { name="timeROC"; version="0.3"; sha256="0xl6gpb5ayppzp08wwry4i051rm40lzfx43jw2yn3jy2p3nrcakb"; depends=[pec mvtnorm]; };
 timeSeries = derive { name="timeSeries"; version="3012.99"; sha256="06lz9xljzadfs94xwn8578h8mw56wp923k0xfppzq69hcpcrhsvf"; depends=[timeDate]; };
 timeit = derive { name="timeit"; version="0.2.1"; sha256="0fsa67jyk4yizyd079265jg6fvjsifkb60y3fkkxsqm7ffqi6568"; depends=[microbenchmark]; };
 timeline = derive { name="timeline"; version="0.9"; sha256="0zkanz3ac6cgsfl80sydgwnjrj9rm7pcfph7wzl3xkh4k0inyjq3"; depends=[ggplot2]; };
 timeordered = derive { name="timeordered"; version="0.9.8"; sha256="1j0x2v22ybyl3l9r3aaz5a3bxh0zq81rbga9gh63zads2xy5axmf"; depends=[igraph plyr]; };
 timereg = derive { name="timereg"; version="1.8.7"; sha256="1xarqsdgl1zcc8ilg23g3p2xl3zbsfiak7lagvs5sbsq84b0wpr7"; depends=[survival lava numDeriv]; };
 timesboot = derive { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; };
-timeseriesdb = derive { name="timeseriesdb"; version="0.1"; sha256="1zwvjnx4b020avyxjx2nwg9n8p8bdrn038mfcl53y9cnxj3w5wsq"; depends=[DBI]; };
+timeseriesdb = derive { name="timeseriesdb"; version="0.2.1"; sha256="0150zs8c8184jzry33aki21prmpnxp3rclp84q6igwxi4grdhlr0"; depends=[RPostgreSQL RJSONIO xts zoo reshape2 shiny DBI]; };
 timetools = derive { name="timetools"; version="1.6.5"; sha256="1ni1dqzkdrzmvr0sbnfdh7kcsd5sgfggfl6w7nqviidcff5dbc9g"; depends=[]; };
 timma = derive { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[Rcpp QCA reshape2 Rcpp RcppArmadillo]; };
 timsac = derive { name="timsac"; version="1.3.3"; sha256="0jg9mjzzfl94z4dqb2kz0aiccpclnbyf9p08x3a3cw1y6wqmzrmy"; depends=[]; };
@@ -6172,19 +6272,19 @@ tlnise = derive { name="tlnise"; version="2.0"; sha256="1vh998vqj359249n9zmw04rs
 tm = derive { name="tm"; version="0.6"; sha256="004hswgswz3gdrpa6j61hl4rls843bxnsp5qac5kyxvfmwalsgr8"; depends=[NLP slam]; };
 tm_plugin_alceste = derive { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; };
 tm_plugin_dc = derive { name="tm.plugin.dc"; version="0.2-7"; sha256="1ikkxp5jdr385yqvhknvkvs97039jw964pcm6dl1k66nbdv1q59i"; depends=[DSL tm NLP slam]; };
-tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.1"; sha256="1rjpnr3x9nngvbx3vlzqsha9zg7ikqfxmqsalb3gvgph0bamdbbp"; depends=[NLP tm XML]; };
+tm_plugin_europresse = derive { name="tm.plugin.europresse"; version="1.2"; sha256="1sgm9wnzlphl4qhc69nj5im4y1qs6b0vssmn5j98fbc3xlxiyzjx"; depends=[NLP tm XML]; };
 tm_plugin_factiva = derive { name="tm.plugin.factiva"; version="1.5"; sha256="06s75rwx9fzld1dw0nw6q5phc1h0zsdzhy1dcdcvmsf97d4s2qdr"; depends=[NLP tm XML]; };
 tm_plugin_lexisnexis = derive { name="tm.plugin.lexisnexis"; version="1.2"; sha256="0cjw705czzzhd8ybfxkrv0f9kvmv9pcswisc7n9hkx8lxi942h19"; depends=[NLP tm XML ISOcodes]; };
 tm_plugin_mail = derive { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
 tm_plugin_webmining = derive { name="tm.plugin.webmining"; version="1.2.2"; sha256="08nm2iwx897d5v144lh2gj5c3yprnky48s882p278b8blmdwnfn0"; depends=[NLP tm boilerpipeR RCurl XML RJSONIO]; };
-tmap = derive { name="tmap"; version="0.6"; sha256="10aw79k3vdi3f20i4clsbvdlfylg34z02ah36wz5yj7y68fm5ijh"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; };
+tmap = derive { name="tmap"; version="0.7"; sha256="0lnlnnllj2bypw2cf8pgpv40w5zy4876kmjgav07ls8j11lklgwz"; depends=[rgeos gridBase sp rgdal classInt RColorBrewer igraph fields vegan]; };
 tmg = derive { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp Rcpp RcppEigen]; };
 tmle = derive { name="tmle"; version="1.2.0-4"; sha256="11hjp2vak1zv73326yzzv99wg8a2xyvfgvbyvx3jfxkgk33mybbm"; depends=[SuperLearner]; };
 tmle_npvi = derive { name="tmle.npvi"; version="0.9.3"; sha256="0njrjwjjn853iahccg37dns7pm14qr05xbkqnd1rhzg4lcl34fyb"; depends=[R_utils R_methodsS3 R_oo MASS Matrix sgeostat geometry]; };
 tmvtnorm = derive { name="tmvtnorm"; version="1.4-9"; sha256="1dacdhqv6bb29a81bmxp8hxy4hragpg8mb5kql4cp59q08zmizyi"; depends=[mvtnorm Matrix gmm]; };
 tnet = derive { name="tnet"; version="3.0.11"; sha256="00hifb145w0a9f5qi3gx16lm1qg621jp523vswb8h86jqmxcczbc"; depends=[igraph survival]; };
 toOrdinal = derive { name="toOrdinal"; version="0.0-1"; sha256="1rr6liw0krzdarc9gd406mf242n3hl38bn52xphr1g0riq5y2m4q"; depends=[]; };
-tolerance = derive { name="tolerance"; version="1.0.0"; sha256="1anim3rq60fscylnz066fddihrxzy0j0d09ni262fqhbc2fla0xy"; depends=[rgl]; };
+tolerance = derive { name="tolerance"; version="1.1.0"; sha256="1mrgvrdlawrmbz8bhq9cxqgn4fxvn18f1gjf9f9s8fvfnc4nda96"; depends=[rgl]; };
 topicmodels = derive { name="topicmodels"; version="0.2-1"; sha256="1if1pdx4jnfx3xi37xs411qv3h449vkwxzzqd7krxaxbj3gqq7n9"; depends=[modeltools slam tm]; };
 topmodel = derive { name="topmodel"; version="0.7.2-2"; sha256="1nqa8fnpxcn373v6qcd9ma8qzcqwl2md347yql3c8bpqlm9ggz16"; depends=[]; };
 topologyGSA = derive { name="topologyGSA"; version="1.4.4"; sha256="092f57gpm8jlb2y4j74a6dx1lwqjdgcm3yrm1yzy4511j6vg0axh"; depends=[gRbase fields]; };
@@ -6195,7 +6295,7 @@ tourrGui = derive { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r
 toxtestD = derive { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
 tpe = derive { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; };
 tpr = derive { name="tpr"; version="0.3-1"; sha256="0nxl0m39zaii6rwm35hxcdk6iy2f729jjmhc2cpr8h0mgvgqf19d"; depends=[lgtdl]; };
-track = derive { name="track"; version="1.1.7"; sha256="1l3465h7dxyh6myf40jv05985w6z9yfpwkxalf51540gvz1jjm67"; depends=[]; };
+track = derive { name="track"; version="1.1.8"; sha256="0scrww0ba1lrv39fh416wcbzblxnd9f7lp2w24hyp0zbbf1nxs68"; depends=[]; };
 tractor_base = derive { name="tractor.base"; version="2.5.0"; sha256="17s4iyp67w7m8gslm87p3ic5r9iq7x1ifpxqrmnin3y5a3d04f5v"; depends=[reportr]; };
 traitr = derive { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest proto gWidgets]; };
 traj = derive { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster psych pastecs NbClust GPArotation]; };
@@ -6213,6 +6313,7 @@ treecm = derive { name="treecm"; version="1.2.1"; sha256="02al6iz25pay7y1qmbpy04
 treelet = derive { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
 treemap = derive { name="treemap"; version="2.2"; sha256="0h4wkjw12n9awqsvrs72nmsxq3d5as3zjy8kyhw7715h1cvry769"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
 treethresh = derive { name="treethresh"; version="0.1-8"; sha256="1xkbqlr9gkpw6axzl7v5aipackhvy873yrpwn2b9zqr35pj06pr6"; depends=[EbayesThresh wavethresh]; };
+trend = derive { name="trend"; version="0.0.1"; sha256="05awwsqp8vm2p00dq2hkb7dglwf45djw2xx2q2mq33blrlhn31sw"; depends=[]; };
 triangle = derive { name="triangle"; version="0.8"; sha256="0jdphz1rf4cx4y28syfffaz7fbl41g3rw3mrv9dywycdznhxdnrp"; depends=[]; };
 trifield = derive { name="trifield"; version="1.1"; sha256="0xk48fkd5xa3mfn3pwdya0ihpkwnh20sgj3rc7fmzjil47kqscvy"; depends=[]; };
 trimTrees = derive { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[randomForest mlbench]; };
@@ -6250,7 +6351,7 @@ tth = derive { name="tth"; version="4.3-2"; sha256="1gs8xjljklvs0pavvn9f59y09hw7
 ttutils = derive { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; };
 ttwa = derive { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; };
 tufterhandout = derive { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[rmarkdown knitr]; };
-tumblR = derive { name="tumblR"; version="1.0"; sha256="01y4vx72p8fvc4nx0y8j8i7gnb573zhvnb4ffl3kx6znzx6hz9ll"; depends=[httr RCurl ROAuth stringr RJSONIO]; };
+tumblR = derive { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl stringr RJSONIO]; };
 tuneR = derive { name="tuneR"; version="1.2.1"; sha256="1f6mdkfwfy6r62sbwq37sylvcji6f3mj9w13sgicxjn6swbszf57"; depends=[signal]; };
 tuple = derive { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
 turboEM = derive { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach numDeriv quantreg iterators]; };
@@ -6283,7 +6384,7 @@ urca = derive { name="urca"; version="1.2-8"; sha256="0gyjb99m6w6h701vmsav16jpfl
 urltools = derive { name="urltools"; version="0.6"; sha256="0psi93pj1n3bv0r9h6bl1pi8462mxhilq7npnqqj3kqp1f8z64an"; depends=[Rcpp Rcpp]; };
 usdm = derive { name="usdm"; version="1.1-12"; sha256="0padc9ppfisnjg1nzw5csv2zki6dby7487lis8pixf1hhbinsnci"; depends=[raster]; };
 useful = derive { name="useful"; version="1.1.8"; sha256="1lzl7rr9qxqa0ga6ml7qi7wi02fd4isgpfskvi3igy10iw1zv3hb"; depends=[ggplot2 plyr scales]; };
-userfriendlyscience = derive { name="userfriendlyscience"; version="0.2-0"; sha256="01r66pykmjarcw2644yvzqizffck9nj78iq9dgxz1743nqnjld61"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; };
+userfriendlyscience = derive { name="userfriendlyscience"; version="0.2-2"; sha256="0wqycrxbpsybhsn2i6jsaycyqmppfcvsdbgabmsky0qpf0hqdkv3"; depends=[ggplot2 plyr psych pwr fBasics ltm MBESS SuppDists GPArotation MASS mosaic foreign car knitr xtable GGally lavaan]; };
 uskewFactors = derive { name="uskewFactors"; version="1.0"; sha256="1ixcxqw8ai77ndn1cfkq53a090fgs95yzvas1qg2siwpfsm4yix6"; depends=[tmvtnorm mvtnorm MCMCpack MASS]; };
 usl = derive { name="usl"; version="1.4.1"; sha256="0z3dvxczp2vp4clnwds34w5rgv4la5hpadbcmdkfqcpdy1vjryv5"; depends=[nlmrt]; };
 ustyc = derive { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[XML plyr]; };
@@ -6301,7 +6402,7 @@ vartors = derive { name="vartors"; version="0.2.6"; sha256="04dynqs903clllk9nyyn
 vbdm = derive { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; };
 vbsr = derive { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
 vcd = derive { name="vcd"; version="1.3-2"; sha256="1ww69sgg178aqcs90mm599nlr6hnxn54d2wzyhddgx1z3qxhzwjd"; depends=[MASS colorspace]; };
-vcdExtra = derive { name="vcdExtra"; version="0.6-5"; sha256="0z2xyvmxka1awx0bnqvp6d16zj8gb6jhj0q4xil7r8ya4hqqmmac"; depends=[vcd gnm MASS]; };
+vcdExtra = derive { name="vcdExtra"; version="0.6-8"; sha256="00nxvq5fn5il3lmip8ag22cqc2sxlbl1rqw5zxp309wp4nrm5i2v"; depends=[vcd gnm MASS]; };
 vcrpart = derive { name="vcrpart"; version="0.3-3"; sha256="0rnf9cwynfwr956hwj4kxqiqq3cdw4wf5ia73s7adxixh5kpqxqa"; depends=[partykit nlme rpart numDeriv ucminf zoo sandwich strucchange]; };
 vdg = derive { name="vdg"; version="1.0.1"; sha256="1z9kgg9bsa80px94cwkna9hsjfa69kvhssmqlcidzb4h5hg7a3fd"; depends=[ggplot2 quantreg proxy]; };
 vdmR = derive { name="vdmR"; version="0.1.0"; sha256="0rv9c6bn711dn1fhgmr4ig0lr9s6yjk7r5ccvyiadgn6g5mr2bds"; depends=[ggplot2 plyr maptools gridSVG rjson GGally Rook dplyr]; };
@@ -6316,7 +6417,7 @@ vegetarian = derive { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsj
 venneuler = derive { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
 verification = derive { name="verification"; version="1.41"; sha256="1c8l0kqk02xijr4yhgpmhlqsflm3wizybkwpzmlnfanh8vzn49g2"; depends=[fields boot CircStats MASS dtw]; };
 vetools = derive { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[sp stringr tis lubridate maptools plyr xts scales]; };
-vines = derive { name="vines"; version="1.1.1"; sha256="1dxmrz2nh75h77f1rrkz8vyqkfxppqrs5v6bsxkbh10gsnga9hgl"; depends=[copula ADGofTest cubature TSP]; };
+vines = derive { name="vines"; version="1.1.3"; sha256="1m862kgcwfz2af00p3vqg959dfldw88bdmb7p4zr3jnqzb6l7rnk"; depends=[copula ADGofTest cubature TSP]; };
 violinmplot = derive { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; };
 vioplot = derive { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
 viopoints = derive { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
@@ -6335,6 +6436,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]; };
+waffle = derive { name="waffle"; version="0.3.1"; sha256="0z6snwf29n1p1i4zc3hx95yq388jgw8v3mcmjhsa2w95zsz9dxr0"; depends=[ggplot2 RColorBrewer gridExtra gtable]; };
 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]; };
@@ -6379,8 +6481,8 @@ wordnet = derive { name="wordnet"; version="0.1-10"; sha256="1k0ncxqsvv5vd5xm6nx
 wpp2008 = derive { name="wpp2008"; version="1.0-1"; sha256="0gd3vjw1fpzhp3qlf1jpc24f76i0pxsjs5pb1v3k2si6df7q4msd"; depends=[]; };
 wpp2010 = derive { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
 wpp2012 = derive { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
-wppExplorer = derive { name="wppExplorer"; version="1.5-0"; sha256="046dqbgaawy04cbk8ya5i0gwmr7d51k3017jjk66fy1x4176159m"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
-wq = derive { name="wq"; version="0.4-1"; sha256="0a46islpzpbkx6c7mbn6q787mh9mb6sy4k46lz8s63fh2h7p0szk"; depends=[zoo]; };
+wppExplorer = derive { name="wppExplorer"; version="1.6-1"; sha256="1pgfh9r98yfrk8228iw5hl5pdb4ki6pz49hpf796frd86d94hw0a"; depends=[shiny plyr reshape2 googleVis wpp2012 Hmisc ggplot2]; };
+wq = derive { name="wq"; version="0.4.3"; sha256="1lgxf5pfw3563dpyq0dgj4ps2mc5nqh56y1i77ypscj5lrcgjxrf"; depends=[zoo ggplot2 reshape2]; };
 wrassp = derive { name="wrassp"; version="0.1.3"; sha256="1xza4w5dgc6gda9ybmq386jnb1gkahdi6sds5dqay7pm5mjql6fl"; depends=[]; };
 write_snns = derive { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
 wrspathrow = derive { name="wrspathrow"; version="0.1"; sha256="1xkh12aal85qhk8d0pdj2qbi6pp4jnr6zbxkhdw2zwav57ly3f4i"; depends=[wrspathrowData sp raster rgeos rgdal]; };
@@ -6388,7 +6490,7 @@ wrspathrowData = derive { name="wrspathrowData"; version="1.0"; sha256="0a1aggcl
 wskm = derive { name="wskm"; version="1.4.19"; sha256="16smir0b4pxkaxgr2vclq8kprpwn0y3fb43ba79q94d6m5hm844y"; depends=[lattice latticeExtra clv]; };
 wsrf = derive { name="wsrf"; version="1.4.0"; sha256="1b9ifswv0civaavmpzi2r3fdbccxg4akzvklqri0hj49kr4cw5pa"; depends=[Rcpp Rcpp]; };
 wtcrsk = derive { name="wtcrsk"; version="1.3"; sha256="1viddyms2d9q2hb9z788fcs8vp7gp6vzlsszcnyxgganfjsd85zy"; depends=[]; };
-wux = derive { name="wux"; version="1.2-3"; sha256="1hpgjs7jl4zckm87hrsnmqyvxg93aqsnrf79wisvs2wajgh73zmi"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor]; };
+wux = derive { name="wux"; version="2.0-0"; sha256="04casnfx5cam5a1iqm2x6lldicv11zqxgxjb61qcivga781g5sxg"; depends=[sp ncdf reshape abind fields rgdal rgeos class stringr Hmisc gdata corpcor rworldmap]; };
 x_ent = derive { name="x.ent"; version="1.1.2"; sha256="1wq1gf656jpd6aw08b0g9319gb087zqgn7bzw4amq4k8vk9vjkjm"; depends=[opencpu rJava stringr xtable jsonlite venneuler ggplot2 statmod]; };
 x12 = derive { name="x12"; version="1.6.0"; sha256="0bl50nva4ai8p24f9hr622m0fc5nmbjakn3rsvl79g050gjsd4i3"; depends=[stringr]; };
 x12GUI = derive { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[x12 Hmisc RGtk2 cairoDevice lattice stringr]; };
@@ -6418,8 +6520,9 @@ 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.2"; sha256="15rki5w21r7q0af9w5pyzq9x55gwmgs35pqgdqxmjnpsp8v135k7"; depends=[rjags coda matrixcalc Formula]; };
+zoib = derive { name="zoib"; version="1.2.1"; sha256="1x4x1912zjkfamifym20d2abaax81k6hnvqy5w8w4vnsx81zjrli"; depends=[rjags coda matrixcalc Formula]; };
 zoo = derive { name="zoo"; version="1.7-12"; sha256="1n64pdmk2vrmiprwkncaaf936c97nlc1l78bvmzp991rijr9vqg5"; depends=[lattice]; };
+zooaRch = derive { name="zooaRch"; version="1.0"; sha256="1krzwrk2cknlsmd3hn8c2lly10pd8k8jj2x12mbjhr2wws0i5fj4"; depends=[ggplot2]; };
 zooimage = derive { name="zooimage"; version="3.0-5"; sha256="1r3slmyw0dyqfa40dr5xga814z09ibhmmby8p1cii5lh61xm4c39"; depends=[svMisc svDialogs mlearning filehash jpeg png]; };
 zoom = derive { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; };
 ztable = derive { name="ztable"; version="0.1.5"; sha256="1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"; depends=[]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index c3572bfd0a0..ccdfdccd036 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -713,7 +713,6 @@ let
     "ecospat" # requires spatstat
     "edgeRun" # requires edgeR
     "EMA" # requires siggenes, affy, multtest, gcrma, biomaRt, and AnnotationDbi
-    "EMDomics" # requires BiocParallel
     "empiricalFDR_DESeq2" # requires DESeq2, and GenomicRanges
     "epoc" # requires graph, and Rgraphviz
     "erpR" # requires rpanel
@@ -885,7 +884,6 @@ let
     "RSeed" # requires RBGL, and graph
     "rsig" # requires survcomp
     "RSNPset" # requires qvalue
-    "rsprng" # requres sprng
     "Rsymphony" # FIXME: requires SYMPHONY
     "RVideoPoker" # requires Rpanel
     "rysgran" # requires soiltexture
@@ -940,6 +938,13 @@ let
     "WideLM" # depends on proprietary cudatoolkit
     "x_ent" # requires opencpu
     "zoib" # tarball is invalid on server
+    "DiffCorr" # misses undeclared dependencies 'pcaMethods', 'multtest'
+    "TROM" # misses undeclared dependencies topGO', 'AnnotationDbi', 'GO.db'
+    "lfe" # fails to compile
+    "mongolite" # doesn't find OpenSSL
+    "quanteda" # fails to build
+    "statar" # depends on broken lfe
+    "hsdar" # fails to build
   ];
 
   otherOverrides = old: new: {
diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index e21ae8e9273..f1295060d3c 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "spin-${version}";
-  version = "6.4.1";
+  version = "6.4.3";
   url-version = stdenv.lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
     url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
     curlOpts = "--user-agent 'Mozilla/5.0'";
-    sha256 = "02r2jazb2hnhcqcjnmlj6sjd9dvyfalgi99bzncwfadixf3hmpvn";
+    sha256 = "0cldhxvfw6llh4spcx0x0535pffx89pvvxpdi0bpqy9a6da85ln1";
   };
 
   buildInputs = [ yacc ];
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index a58ad0f39b2..3c59bf45eff 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
       + "/valgrind-3.9.0-glibc-2.21.patch?h=packages/valgrind&id=41e87313b69";
     sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19";
-  })];
+  }) ./linux-4.0.patch];
 
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
diff --git a/pkgs/development/tools/analysis/valgrind/linux-4.0.patch b/pkgs/development/tools/analysis/valgrind/linux-4.0.patch
new file mode 100644
index 00000000000..1a2c2d86207
--- /dev/null
+++ b/pkgs/development/tools/analysis/valgrind/linux-4.0.patch
@@ -0,0 +1,12 @@
+diff -Naur valgrind-3.10.1/configure valgrind-3.10.1-patch/configure
+--- valgrind-3.10.1/configure	2014-11-25 11:42:25.000000000 -0800
++++ valgrind-3.10.1-patch/configure	2015-04-21 09:45:37.656113841 -0700
+@@ -5553,7 +5553,7 @@
+         kernel=`uname -r`
+ 
+         case "${kernel}" in
+-             2.6.*|3.*)
++             2.6.*|3.*|4.*)
+         	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5
+ $as_echo "2.6.x/3.x family (${kernel})" >&6; }
+ 
diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix
index ccc7e326fd7..6ae4da408c0 100644
--- a/pkgs/development/tools/build-managers/boot/default.nix
+++ b/pkgs/development/tools/build-managers/boot/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jdk }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.0-rc8";
+  version = "2.0.0-rc14";
   name = "boot-${version}";
 
   src = fetchurl {
     url = "https://github.com/boot-clj/boot/releases/download/${version}/boot.sh";
-    sha256 = "1jqj04f33prb6nqsv7mffwdnz47ppi3szsbdzphjx8xzz394nl7j";
+    sha256 = "12c24aqvwq8kj6iiac18rp0n8vlzacl7dd95m983yz24w885chc0";
   };
 
   inherit jdk;
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index f20f6d94f6f..64aeb0736c1 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-02-26";
+let snapshotDate = "2015-04-02";
 in
 
 with ((import ./common.nix) { inherit stdenv; version = "snapshot-${snapshotDate}"; });
 
 let snapshotHash = if stdenv.system == "i686-linux"
-      then "2a28b604d09b4a76a54a05d91f7f158692427b3a"
+      then "ba6c162680d5509d89ba2363d7cae2047f40c034"
       else if stdenv.system == "x86_64-linux"
-      then "7367f4aca86d38e209ef7236b00175df036c03e2"
+      then "94f715c9a52809a639f2ce6f8b1d5215a0c272b5"
       else if stdenv.system == "i686-darwin"
-      then "e5cabb0a4a2b4e47f7b1ae9b802e2b5d0b14eac5"
+      then "cf333f16f89bfd50e8ce461c6f81ca30d33f7f73"
       else if stdenv.system == "x86_64-darwin"
-      then "3026c60ddd46d2bcf1cb178fc801095dbfba5286"
+      then "1f7008a6ec860e2bc7580e71bdf320ac518ddeb8"
       else throw "no snapshot for platform ${stdenv.system}";
     snapshotName = "cargo-nightly-${platform}.tar.gz";
 in
@@ -35,6 +35,10 @@ stdenv.mkDerivation {
   installPhase = ''
     mkdir -p "$out"
     ./install.sh "--prefix=$out"
+    rm "$out/lib/rustlib/components" \
+       "$out/lib/rustlib/install.log" \
+       "$out/lib/rustlib/rust-installer-version" \
+       "$out/lib/rustlib/uninstall.sh"
   '' + (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/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index dd0b07912c8..d92cca88d5f 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurl, curl, dmd, gcc, unzip}:
+{stdenv, fetchurl, curl, dmd, gcc, unzip }:
 
 stdenv.mkDerivation {
-  name = "dub-0.9.22";
+  name = "dub-0.9.23";
 
   src = fetchurl {
-    url = "https://github.com/rejectedsoftware/dub/archive/v0.9.22.tar.gz";
-    sha256 = "0vhn96ybbsfflldlbyc17rmwb7bz21slbm189k5glyfr9nnp4cir";
+    url = "https://github.com/D-Programming-Language/dub/archive/v0.9.23.tar.gz";
+    sha256 = "7ecbce89c0e48b43705d7c48003394f383556f33562c4b5d884a786cd85814d1";
   };
 
   buildInputs = [ unzip curl ];
diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix
index 8352c71a686..f8e759b83ee 100644
--- a/pkgs/development/tools/chefdk/default.nix
+++ b/pkgs/development/tools/chefdk/default.nix
@@ -11,7 +11,7 @@ bundlerEnv {
   buildInputs = [ perl ];
 
   meta = with lib; {
-    description = "A streamlined development and deployment workflow for Chef platform.";
+    description = "A streamlined development and deployment workflow for Chef platform";
     homepage    = https://downloads.chef.io/chef-dk/;
     license     = with licenses; asl20;
     maintainers = with maintainers; [ offline ];
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 9a0afdc8e1d..7c4aefee639 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Oracle's Oracle DB GUI client.";
+    description = "Oracle's Oracle DB GUI client";
     longDescription = ''
       Oracle SQL Developer is a free integrated development environment that
       simplifies the development and management of Oracle Database in both
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 5d11e72e2ea..1f91f58ee1c 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -1,25 +1,42 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, deepseq, doctest, filepath, hackageDb, mtl
-, regexPosix, transformers
+{ mkDerivation, fetchgit, aeson, base, bytestring, Cabal, containers
+, deepseq, deepseq-generics, directory, doctest, filepath, gitMinimal
+, hackage-db, hspec, lens, monad-par, monad-par-extras, mtl, pretty
+, process, QuickCheck, regex-posix, SHA, split, stdenv, transformers
+, utf8-string, cartel, nix-prefetch-scripts, makeWrapper
 }:
 
-cabal.mkDerivation (self: {
+mkDerivation rec {
   pname = "cabal2nix";
-  version = "1.73";
-  sha256 = "1nskcr8k5a8wm9q5is0b1kww574q2nq45f16agya8z44hgk97xiv";
-  isLibrary = false;
+  version = "20150423";
+  src = fetchgit {
+    url = "http://github.com/NixOS/cabal2nix.git";
+    rev = "8cfe61c222bd2750ef29f991a2a3ee353444e458";
+    sha256 = "07n5am1ca00291qaarvwgzbkhwqc4f4wwhffycwwxaq46by34l7b";
+    deepClone = true;
+  };
   isExecutable = true;
+  enableSharedLibraries = false;
+  enableSharedExecutables = false;
   buildDepends = [
-    Cabal deepseq filepath hackageDb mtl regexPosix transformers
+    aeson base bytestring Cabal containers deepseq-generics directory
+    filepath hackage-db lens monad-par monad-par-extras mtl pretty
+    process regex-posix SHA split transformers utf8-string cartel
   ];
-  testDepends = [ doctest ];
-  doCheck = self.stdenv.lib.versionOlder "7.8" self.ghc.version;
-  meta = {
-    homepage = "http://github.com/NixOS/cabal2nix";
-    description = "Convert Cabal files into Nix build instructions";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
+  testDepends = [
+    aeson base bytestring Cabal containers deepseq deepseq-generics
+    directory doctest filepath hackage-db hspec lens monad-par
+    monad-par-extras mtl pretty process QuickCheck regex-posix SHA
+    split transformers utf8-string
+  ];
+  buildTools = [ gitMinimal makeWrapper ];
+  preConfigure = "runhaskell $setupCompileFlags generate-cabal-file --release >cabal2nix.cabal";
+  postInstall = ''
+    exe=$out/libexec/${pname}-${version}/cabal2nix
+    install -D $out/bin/cabal2nix $exe
+    rm -rf $out/{bin,lib,share}
+    makeWrapper $exe $out/bin/cabal2nix --prefix PATH ":" "${nix-prefetch-scripts}/bin"
+  '';
+  homepage = "http://github.com/NixOS/cabal2nix/";
+  description = "Convert Cabal files into Nix build instructions";
+  license = stdenv.lib.licenses.bsd3;
+}
diff --git a/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix b/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix
deleted file mode 100644
index 4ce78c31fe2..00000000000
--- a/pkgs/development/tools/haskell/ihaskell/ng-wrapper.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, buildEnv, ghcWithPackages, makeWrapper, ihaskell, ipython, packages }:
-let
-  ihaskellEnv = ghcWithPackages (self: [
-    self.ihaskell
-    self.ihaskell-blaze
-    self.ihaskell-diagrams
-    self.ihaskell-display
-  ] ++ packages self);
-  profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";
-  drv = buildEnv {
-    name = "ihaskell-with-packages";
-    paths = [ ihaskellEnv ipython ];
-    postBuild = ''
-    tar xf ${ihaskell.src} ${profile}
-    mkdir -p $out/share/`dirname ${profile}`
-    mkdir profile
-    cd profile
-    tar xf ../${profile}
-    for cfg in ipython_*config.py;do
-      sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg
-    done
-    tar cf $out/share/${profile} .
-    wrapProgram "$out/bin/IHaskell" \
-      --prefix PATH : "${ihaskellEnv}/bin:${ipython}/bin" \
-      --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \
-      --set PROFILE_TAR "$out/share/${profile}" \
-      --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \
-          && mkdir -p \$PROFILE_DIR \
-          && tar xf \$PROFILE_TAR -C \$PROFILE_DIR \
-          ; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \
-            sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done )" \
-      --set GHC_PACKAGE_PATH "\$(echo $out/lib/*/package.conf.d| tr ' ' ':'):" \
-    '';
-  };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
\ No newline at end of file
diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index b20f8fa4f50..035ad738a82 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -1,36 +1,23 @@
-{ stdenv, makeWrapper, ihaskell, ipython, ghc }:
-
-stdenv.mkDerivation rec {
-
-  inherit (ihaskell) name pname src version meta;
-
-  buildInputs = [ makeWrapper ];
-
-  preferLocalBuild = true;
-
-  buildCommand = let profile = "${pname}-${version}/profile/profile.tar"; in ''
-    tar xf $src ${profile}
-    mkdir -p $out/share/`dirname ${profile}`
-    mkdir profile
-    cd profile
-    tar xf ../${profile}
-    for cfg in ipython_*config.py;do
-      sed -i -e "1iexe = '${ihaskell}/bin/IHaskell'" $cfg
-    done
-    tar cf $out/share/${profile} .
-    makeWrapper "${ihaskell}/bin/IHaskell" "$out/bin/ihaskell" \
-      --prefix PATH : "${ghc}/bin:${ihaskell}/bin:${ipython}/bin" \
-      --prefix LD_LIBRARY_PATH : "${ihaskell}/lib/ghc-${ghc.version}/${name}/" \
-      --add-flags "--ipython=${ipython}/bin/ipython" \
-      --set PROFILE_DIR "\$HOME/.ipython/profile_haskell" \
-      --set PROFILE_TAR "$out/share/${profile}" \
-      --set PROFILE_INIT "\$([ ! -d \$PROFILE_DIR ] \
-          && mkdir -p \$PROFILE_DIR \
-          && tar xf \$PROFILE_TAR -C \$PROFILE_DIR \
-          ; [ -d \$PROFILE_DIR ] && for cfg in \$PROFILE_DIR/ipython_*config.py;do \
-            sed -i -e '/.*exe.*IHaskell.*/d' \$cfg; sed -i -e \"1iexe = '${ihaskell}/bin/IHaskell'\" \$cfg;done ) \
-        " \
-      --prefix GHC_PACKAGE_PATH : "\$(${ghc.GHCGetPackages} ${ghc.version}|sed -e 's, -package-db ,:,g'|cut -b 2-):${ihaskell}/lib/ghc-${ghc.version}/package.conf.d/${pname}-${version}.installedconf" \
-      --set GHC_PACKAGE_PATH "\$GHC_PACKAGE_PATH:" # always end with : to include base packages
+{ stdenv, writeScriptBin, buildEnv, ghcWithPackages, ihaskell, ipython, packages }:
+let
+  ihaskellEnv = ghcWithPackages (self: [
+    self.ihaskell
+    self.ihaskell-blaze
+    self.ihaskell-diagrams
+    self.ihaskell-display
+  ] ++ packages self);
+  ihaskellSh = writeScriptBin "ihaskell-notebook" ''
+    #!/bin/sh
+    export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
+    export PATH="${ihaskell}/bin:${ihaskellEnv}/bin:${ipython}/bin"
+    ${ihaskell}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${ipython}/bin/ipython notebook --kernel=haskell
+  '';
+  profile = "${ihaskell.pname}-${ihaskell.version}/profile/profile.tar";
+in
+buildEnv {
+  name = "ihaskell-with-packages";
+  paths = [ ihaskellEnv ipython ];
+  postBuild = ''
+    ln -s ${ihaskellSh}/bin/ihaskell-notebook $out/bin/.
   '';
 }
diff --git a/pkgs/development/tools/haskell/lambdabot/default.nix b/pkgs/development/tools/haskell/lambdabot/default.nix
new file mode 100644
index 00000000000..f2462ed54e1
--- /dev/null
+++ b/pkgs/development/tools/haskell/lambdabot/default.nix
@@ -0,0 +1,52 @@
+{ lib, makeWrapper, haskellngPackages
+, mueval
+, withDjinn ? true
+, aspell ? null
+, packages ? (pkgs: [])
+, modules ? ''
+    haskellPlugins
+    ++ ["irc", "localtime", "topic"]
+    ++ ["dummy", "fresh", "todo"]
+    ++ ["bf", "dice", "elite", "filter", "quote", "slap", "unlambda", "vixen"]
+    ++ referencePlugins
+    ++ socialPlugins
+''
+, configuration ? "[]"
+}:
+
+# FIXME: fix hoogle search
+
+let allPkgs = pkgs: mueval.defaultPkgs pkgs ++ [ pkgs.lambdabot-trusted ] ++ packages pkgs;
+    mueval' = mueval.override {
+      inherit haskellngPackages;
+      packages = allPkgs;
+    };
+    bins = lib.makeSearchPath "bin" ([ mueval'
+                                       (haskellngPackages.ghcWithPackages allPkgs)
+                                       haskellngPackages.unlambda
+                                       haskellngPackages.brainfuck
+                                     ]
+                                     ++ lib.optional withDjinn haskellngPackages.djinn
+                                     ++ lib.optional (aspell != null) aspell
+                                    );
+    modulesStr = lib.replaceChars ["\n"] [" "] ("corePlugins ++ " + modules);
+    configStr = lib.replaceChars ["\n"] [" "] configuration;
+
+in lib.overrideDerivation haskellngPackages.lambdabot (self: {
+  postPatch = (self.postPatch or "") + ''
+    sed -i 's/\(\$(modules \$ \).*/\1@modules@)/; /@modules@/q' src/Modules.hs
+    # not via sed to avoid escaping issues
+    substituteInPlace src/Modules.hs \
+      --replace '@modules@' '${modulesStr}'
+    sed -i 's/\[dataDir :=> dir\]/@config@ ++ \0/' src/Main.hs
+    substituteInPlace src/Main.hs \
+      --replace '@config@' '${configStr}'
+  '';
+
+  buildInputs = self.buildInputs ++ [ makeWrapper ];
+
+  postInstall = (self.postInstall or "") + lib.optionalString (bins != "") ''
+    wrapProgram $out/bin/lambdabot \
+      --prefix PATH ":" '${bins}'
+  '';
+})
diff --git a/pkgs/development/tools/haskell/leksah/default.nix b/pkgs/development/tools/haskell/leksah/default.nix
new file mode 100644
index 00000000000..fb91015e10c
--- /dev/null
+++ b/pkgs/development/tools/haskell/leksah/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, ghcWithPackages, gtk3, makeWrapper }:
+
+let
+leksahEnv = ghcWithPackages (self: [ self.leksah-server self.leksah self.cabal-install ]);
+in stdenv.mkDerivation {
+  name = "leksah";
+
+  buildInputs = [ gtk3 ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    makeWrapper ${leksahEnv}/bin/leksah $out/bin/leksah \
+      --prefix PATH : "${leksahEnv}/bin" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+}
diff --git a/pkgs/development/tools/haskell/mueval/default.nix b/pkgs/development/tools/haskell/mueval/default.nix
new file mode 100644
index 00000000000..aa445238f22
--- /dev/null
+++ b/pkgs/development/tools/haskell/mueval/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, makeWrapper, haskellngPackages, packages ? (pkgs: [])
+}:
+
+let defaultPkgs = pkgs: [ pkgs.show
+                          pkgs.simple-reflect
+                          pkgs.QuickCheck
+                          pkgs.mtl
+                        ];
+    env = haskellngPackages.ghcWithPackages
+           (pkgs: defaultPkgs pkgs ++ packages pkgs);
+    libDir = "${env}/lib/ghc-${env.version}";
+
+in stdenv.mkDerivation {
+  name = "mueval-env";
+
+  inherit (haskellngPackages) mueval;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+
+    makeWrapper $mueval/bin/mueval $out/bin/mueval \
+      --prefix PATH ":" "$out/bin"
+
+    makeWrapper $mueval/bin/mueval-core $out/bin/mueval \
+      --set "NIX_GHC_LIBDIR" "${libDir}"
+
+  '';
+
+  passthru = { inherit defaultPkgs; };
+}
diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix
index 64de64dea06..309d20d675b 100644
--- a/pkgs/development/tools/misc/arcanist/default.nix
+++ b/pkgs/development/tools/misc/arcanist/default.nix
@@ -3,18 +3,18 @@
 let
   libphutil = fetchgit {
     url    = "git://github.com/phacility/libphutil.git";
-    rev    = "ce3959b4046f5dcc4f3413a59328bda2a42e76b0";
-    sha256 = "3c206b428fa5e0391868f7782db4af4d1cf2f338899831a36771cef74db14a76";
+    rev    = "efc338d50f17dec594a66337034797c90c8b10c1";
+    sha256 = "9a9df8667d9bf31667facd1cd873adef292c63893adc15d32bd819c47256027c";
   };
   arcanist = fetchgit {
     url    = "git://github.com/phacility/arcanist.git";
-    rev    = "b961869edac9469be93f2c3ac7a24562d3186860";
-    sha256 = "2ae1272c76a1e2bdedd87d453ddb75f6110f9224063e7ee39e88fcb8b3b4c884";
+    rev    = "e101496508e279e1b9ee15d7d549735a0352f8ab";
+    sha256 = "4f2ae195173d859f9920378c42e257d70e5720b7f54c02d9af2c398f936f20b9";
   };
 in
 stdenv.mkDerivation rec {
   name    = "arcanist-${version}";
-  version = "20150318";
+  version = "20150412";
 
   src = [ arcanist libphutil ];
   buildInputs = [ php makeWrapper flex ];
diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix
index 0e6ca01c625..c5c965ac58e 100644
--- a/pkgs/development/tools/misc/autoconf-archive/default.nix
+++ b/pkgs/development/tools/misc/autoconf-archive/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ xz ];
 
   meta = with stdenv.lib; {
-    description = "Archive of autoconf m4 macros.";
+    description = "Archive of autoconf m4 macros";
     homepage = http://www.gnu.org/software/autoconf-archive/;
     license = licenses.gpl3;
   };
diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 259224aac5d..9c48227c9a8 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://sourceforge.net/projects/checkbaskisms/;
-    description = "Performs basic checks on shell scripts for the presence of non portable syntax.";
+    description = "Performs basic checks on shell scripts for the presence of non portable syntax";
     license = stdenv.lib.licenses.gpl2;
   };
 
diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 685fde4226d..193e5eab627 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, expect, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dejagnu-1.5.2";
+  name = "dejagnu-1.5.3";
 
   src = fetchurl {
     url = "mirror://gnu/dejagnu/${name}.tar.gz";
-    sha256 = "18ikblg4x4y5fkw8sg0c2zmqgxdqqycswmws17sxx8m4sz6g7dch";
+    sha256 = "069z3qrdv35cm2sbnfr5yjzplrqj9f61cchxis7j9mm19hv8x6q9";
   };
 
   patches = [ ./wrapped-runtest-program-name.patch ];
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index b24b46aec3d..16ab1f8e5dc 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -8,7 +8,7 @@
 
 let
 
-  basename = "gdb-7.8.2";
+  basename = "gdb-7.9";
 
   # Whether (cross-)building for GNU/Hurd.  This is an approximation since
   # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and
@@ -27,10 +27,10 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}.tar.xz";
-    sha256 = "11a4fj1vpsny71kz7xqqbqk3kgzbs5cfjj3z9gm0hpvxfkam8nb0";
+    sha256 = "14l3hhsy7fmpn2dk7ivc67gnbjdhkxlq90kxijpzfa35l58mcccv";
   };
 
-  patches = [ ./edit-signals.patch ];
+  # patches = [ ./edit-signals.patch ];
 
   # I think python is not a native input, but I leave it
   # here while I will not need it cross building
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     '' # Remove Info files already provided by Binutils and other packages.
-       rm -v $out/share/info/{standards,configure,bfd}.info
+       rm -v $out/share/info/bfd.info
     '';
 
   # TODO: Investigate & fix the test failures.
diff --git a/pkgs/development/tools/misc/gdb/edit-signals.patch b/pkgs/development/tools/misc/gdb/edit-signals.patch
deleted file mode 100644
index e9da8035ef5..00000000000
--- a/pkgs/development/tools/misc/gdb/edit-signals.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch adapted from
-https://www.sourceware.org/ml/gdb-patches/2012-08/msg00439.html
-
-Without it, spawning a terminal 'vim' from gdb 'edit' cmd, makes
-all gdb grazy.
-
-diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
-index 7ea0fec..be5455c 100644
---- a/gdb/tui/tui-win.c
-+++ b/gdb/tui/tui-win.c
-@@ -831,11 +831,12 @@ void
- tui_initialize_win (void)
- {
- #ifdef SIGWINCH
--#ifdef HAVE_SIGACTION
-+#if defined (HAVE_SIGACTION) && defined (SA_RESTART)
-   struct sigaction old_winch;
- 
--  memset (&old_winch, 0, sizeof (old_winch));
-+  sigemptyset (&old_winch.sa_mask);
-   old_winch.sa_handler = &tui_sigwinch_handler;
-+  old_winch.sa_flags = SA_RESTART;
-   sigaction (SIGWINCH, &old_winch, NULL);
- #else
-   signal (SIGWINCH, &tui_sigwinch_handler);
diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix
index 762e6f2c4db..a97dc3a249a 100644
--- a/pkgs/development/tools/misc/nixbang/default.nix
+++ b/pkgs/development/tools/misc/nixbang/default.nix
@@ -1,14 +1,15 @@
-{ lib, pythonPackages, fetchgit }:
+{ lib, pythonPackages, fetchFromGitHub }:
 
-let version = "0.1.1"; in
+let version = "0.1.2"; in
 pythonPackages.buildPythonPackage {
   name = "nixbang-${version}";
   namePrefix = "";
 
-  src = fetchgit {
-    url = "git://github.com/madjar/nixbang.git";
-    rev = "refs/tags/${version}";
-    sha256 = "1n8jq32r2lzk3g0d95ksfq7vdqciz34jabribrr4hcnz4nlijshf";
+  src = fetchFromGitHub {
+    owner = "madjar";
+    repo = "nixbang";
+    rev = version;
+    sha256 = "1kzk53ry60i814wa6n9y2ni0bcxhbi9p8gdv10b974gf23mhi8vc";
   };
 
   meta = {
diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix
index 13796453eba..e52795bf5cd 100644
--- a/pkgs/development/tools/misc/stlink/default.nix
+++ b/pkgs/development/tools/misc/stlink/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, libusb1 }:
+{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, libusb1 }:
 
 # IMPORTANT: You need permissions to access the stlink usb devices. Here are
 # example udev rules for stlink v1 and v2 so you don't need to have root
@@ -7,13 +7,15 @@
 # SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3744", MODE:="0666", SYMLINK+="stlinkv1_%n"
 # SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE:="0666", SYMLINK+="stlinkv2_%n"
 
+let
+  version = "1.1.0";
+in
 stdenv.mkDerivation {
-  name = "stlink-20130306";
+  name = "stlink-${version}";
 
-  src = fetchgit {
-    url = git://github.com/texane/stlink.git;
-    rev = "5be889e3feb75fc7f594012c4855b4dc16940050";
-    sha256 = "1xbfr1kz4k6hhl0xpqn1vi83fdynjxx3ymn9gb7b0pb7h6ncjcyr";
+  src = fetchurl {
+    url = "https://github.com/texane/stlink/archive/${version}.tar.gz";
+    sha256 = "0b38a32ids9dpnz5h892l279fz8y1zzqk1qsnyhl1nm03p7xzi1s";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig libusb1 ];
diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix
index e4c2b474d46..ffc8200db78 100644
--- a/pkgs/development/tools/misc/sysbench/default.nix
+++ b/pkgs/development/tools/misc/sysbench/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchurl, mysql, libxslt, zlib, autoreconfHook }:
+{ stdenv, fetchgit, libmysql, libxslt, zlib, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "sysbench-0.4.12";
+  name = "sysbench-2015-04-22";
 
-  buildInputs = [ autoreconfHook mysql.lib libxslt zlib ];
+  buildInputs = [ autoreconfHook libmysql libxslt zlib ];
 
-  src = fetchurl {
-    url = mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz;
-    sha256 = "17pa4cw7wxvlb4mba943lfs3b3jdi64mlnaf4n8jq09y35j79yl3";
+  src = fetchgit {
+    url = git://github.com/akopytov/sysbench.git;
+    rev = "2b3042883090c9cf8cb9be2b24d3590cdcee112f";
+    sha256 = "0di6jc9ybnqk3pqg45lks2c9003l74xz4g619haw36fvbi28aql6";
   };
 
   preAutoreconf = ''
diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix
index fa11671db0b..4b35ba0cce2 100644
--- a/pkgs/development/tools/parsing/jshon/default.nix
+++ b/pkgs/development/tools/parsing/jshon/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = http://kmkeen.com/jshon;
-    description = "JSON parser designed for maximum convenience within the shell.";
+    description = "JSON parser designed for maximum convenience within the shell";
     license = licenses.free;
     platforms = platforms.all;
     maintainers = with maintainers; [ rushmorem ];
diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix
index 75c09987761..4ef9cc6d285 100644
--- a/pkgs/development/tools/rust/racer/default.nix
+++ b/pkgs/development/tools/rust/racer/default.nix
@@ -2,17 +2,17 @@
 
 stdenv.mkDerivation rec {
   #TODO add emacs support
-  name = "racer-git-2015-02-28";
+  name = "racer-git-2015-04-12";
   src = fetchgit {
     url = https://github.com/phildawes/racer;
-    rev = "2e1d718fae21431de4493c238196466e9d4996bc";
-    sha256 = "0lvp494kg2hlbbdrwxmmxkyhjw53y9wjdml9z817pwj3fwmrjsx0";
+    rev = "5437e2074d87dfaab75a0f1bd2597bed61c0bbf1";
+    sha256 = "0a768gvjry86l0xa5q0122iyq7zn2h9adfniglsgrbs4fan49xyn";
   };
 
   buildInputs = [ rustc cargo makeWrapper ];
 
   buildPhase = ''
-    cargo build --release
+    CARGO_HOME="$NIX_BUILD_TOP/.cargo" cargo build --release
   '';
 
   installPhase = ''
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A utility intended to provide Rust code completion for editors and IDEs.";
+    description = "A utility intended to provide Rust code completion for editors and IDEs";
     homepage = https://github.com/phildawes/racer;
     license = stdenv.lib.licenses.mit;
     maintainers = [ maintainers.jagajaga ];
diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix
new file mode 100644
index 00000000000..b9b89742165
--- /dev/null
+++ b/pkgs/development/tools/sassc/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, libsass }:
+
+stdenv.mkDerivation rec {
+  name = "sassc";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "sass";
+    repo = "sassc";
+    rev = version;
+    sha256 = "0lpilmsir9b9292a4b8kq3zzg5cfh031p0krgam5rmsn39i6ivs4";
+  };
+
+  preConfigure = ''
+    export SASSC_VERSION="3.1.0"
+    autoreconf --force --install
+  '';
+
+  buildInputs = [ autoconf automake libtool libsass ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp sassc $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A front-end for libsass";
+    license = licenses.mit;
+    homepage = https://github.com/sass/sassc/;
+    maintainers = with maintainers; [ pjones ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix
index e34e479e938..6604bc5648d 100644
--- a/pkgs/development/tools/selenium/selendroid/default.nix
+++ b/pkgs/development/tools/selenium/selendroid/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://code.google.com/p/selenium;
-    description = "Test automation for native or hybrid Android apps and the mobile web.";
+    description = "Test automation for native or hybrid Android apps and the mobile web";
     maintainers = with maintainers; [ offline ];
     platforms = platforms.all;
     license = licenses.asl20;
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 44cb5fef90e..84bfcce541a 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 let
-  version = "1.6.5";
+  version = "1.7.2";
   rake = buildRubyGem {
     inherit ruby;
     name = "rake-10.3.2";
@@ -19,19 +19,19 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb";
-        sha256 = "12m2mnpnfzqv2s4j58cnzg4h4i5nkk5nb4irsvmm3i9a0dnsziz2";
+        sha256 = "0s1rwzpcp0nc7v04fvbd5vsqfm79q2v23sr9ahniw09lf5c1qzwx";
       }
     else
       fetchurl {
         url    = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb";
-        sha256 = "1d4w0ni6mkb378v6rd7b188fw38vi8qql7pkwzsykr6389krbkbq";
+        sha256 = "1yj8iyhsgj6j3r7p3ppmsz01j6vnxqb18rjhsbp2sz45kbfs1wxz";
       };
 
   meta = with stdenv.lib; {
     description = "A tool for building complete development environments";
     homepage    = http://vagrantup.com;
     license     = licenses.mit;
-    maintainers = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 globin ];
     platforms   = platforms.linux;
   };
 
@@ -93,12 +93,12 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     # 'hide' the template file from shebang-patching
-    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
-    chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh
+    chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+    chmod -x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 
   postFixup = ''
-    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.6.6/lib/bundler/templates/Executable
-    chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-1.6.5/plugins/provisioners/salt/bootstrap-salt.sh
+    chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.7.11/lib/bundler/templates/Executable
+    chmod +x $out/opt/vagrant/embedded/gems/gems/vagrant-${version}/plugins/provisioners/salt/bootstrap-salt.sh
   '';
 }
diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix
index 45586c1e9bd..fa9b680f281 100644
--- a/pkgs/development/web/iojs/default.nix
+++ b/pkgs/development/web/iojs/default.nix
@@ -1,18 +1,14 @@
-{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv, nightly ? false }:
+{ stdenv, fetchurl, python, utillinux, openssl, http-parser, zlib, libuv }:
 
 let
-  version = if nightly then "1.6.5-nightly20150409ff74931107" else "1.6.4";
+  version = "1.6.4";
   inherit (stdenv.lib) optional maintainers licenses platforms;
 in stdenv.mkDerivation {
   name = "iojs-${version}";
 
   src = fetchurl {
-    url = if nightly
-          then "https://iojs.org/download/nightly/v${version}/iojs-v${version}.tar.gz"
-          else "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
-    sha256 = if nightly
-             then "04f7r4iv8p0jfylw4sxg3vsv14rbsi6n9hbqnwvdh6554yrm6d35"
-             else "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7";
+    url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz";
+    sha256 = "1qzvf7g457dppzxn23wppjcm09vh1n6bhsvz5szhwgjvl0iv2pc7";
   };
 
   prePatch = ''
diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs
index 4e01ecfd63e..837238f27c6 100755
--- a/pkgs/development/web/iojs/update-iojs
+++ b/pkgs/development/web/iojs/update-iojs
@@ -18,7 +18,7 @@ latest() {
 latest_log() {
     echo "Getting latest $1 version from $2" >&2
     version=$(latest "$2")
-    echo " -> $version" >&2
+    echo "version -> $version" >&2
     echo "$version"
 }
 
@@ -35,20 +35,16 @@ hash() {
 hash_log() {
     echo "Finding hash for $1" >&2
     value=$(hash "$1")
-    echo " -> $value" >&2
+    echo "hash -> $value" >&2
     echo "$value"
 }
 
-stable=$(latest_log stable 'https://iojs.org/dist/')
-nightly=$(latest_log nightly 'https://iojs.org/download/nightly/')
+stableVersion=$(latest_log stable 'https://iojs.org/dist/')
+stableHash=$(hash_log "$(url iojs.src)")
 
 sed -i \
-    "/version = if nightly/s/then.*/then \"$nightly\" else \"$stable\";/" \
+    "/version = /s/\"[^\"]*\"/\"$stableVersion\"/" \
     "$HERE/default.nix"
-
-stableHash=$(hash_log "$(url iojs.src)")
-nightlyHash=$(hash_log "$(url iojs-nightly.src)")
-
 sed -i \
-    "/sha256 = if nightly/{N;s/\"[^\"]*\"/\"$nightlyHash\"/;N;s/\"[^\"]*\";/\"$stableHash\";/}" \
+    "/sha256 = /s/\"[^\"]*\"/\"$stableHash\"/" \
     "$HERE/default.nix"
diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix
index 042e29f2970..679716d33c7 100644
--- a/pkgs/development/web/nodejs/build-node-package.nix
+++ b/pkgs/development/web/nodejs/build-node-package.nix
@@ -64,7 +64,7 @@ let
             stdenv.lib.platforms.${removePrefix "!" entry} or [];
         in
           # Ignore unknown platforms
-          if filterPlatforms == [] then platforms
+          if filterPlatforms == [] then (if platforms == [] then nodejs.meta.platforms else platforms)
           else
             if hasPrefix "!" entry then
               subtractLists (intersectLists filterPlatforms nodejs.meta.platforms) platforms
diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index df8321cfca8..9d714be1cdd 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -54,6 +54,8 @@ in stdenv.mkDerivation {
     ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
   setupHook = ./setup-hook.sh;
 
+  passthru.interpreterName = "nodejs-0.10";
+
   meta = {
     description = "Event-driven I/O framework for the V8 JavaScript engine";
     homepage = http://nodejs.org;
diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix
new file mode 100644
index 00000000000..a729a5b014f
--- /dev/null
+++ b/pkgs/games/bastet/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, ncurses, boost }:
+
+stdenv.mkDerivation rec {
+  name = "bastet-${version}";
+  version = "0.43.1";
+  buildInputs = [ ncurses boost ];
+
+  src = fetchFromGitHub {
+    owner = "fph";
+    repo = "bastet";
+    rev = version;
+    sha256 = "14ymdarx30zqxyixvb17h4hs57y6zfx0lrdvc200crllz8zzdx5z";
+  };
+
+  installPhase = ''
+    mkdir -p "$out"/bin
+    cp bastet "$out"/bin/
+    mkdir -p "$out"/share/man/man6
+    cp bastet.6 "$out"/share/man/man6
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tetris clone with 'bastard' block-choosing AI";
+    homepage = http://fph.altervista.org/prog/bastet.html;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.dezgeg ];
+  };
+}
diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix
index 00ae4e28860..83560c21f5d 100644
--- a/pkgs/games/gnubg/default.nix
+++ b/pkgs/games/gnubg/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   configureFlags = [ "--with-gtk" "--with--board3d" ];
 
   meta = with stdenv.lib;
-    { description = "World class backgammon application.";
+    { description = "World class backgammon application";
       homepage = http://www.gnubg.org/;
       license = licenses.gpl3;
       maintainers = [ maintainers.emery ];
diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix
index 34094b637fc..2048dffb54b 100644
--- a/pkgs/games/mars/default.nix
+++ b/pkgs/games/mars/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl, cmake, mesa, sfml_git, fribidi, taglib }:
+{ stdenv, fetchgit, cmake, mesa, sfml, fribidi, taglib }:
 stdenv.mkDerivation rec {
-  name = "mars-${version}";
-  version = "0.7.2";
-  src = fetchurl {
-    url = "mirror://sourceforge/mars-game/mars_source_${version}.tar.gz";
-    sha256 = "092y0y1dghkvs0syjg9cv8iq0w29hkin8bznqc8sqm21v0swk451";
+  name = "mars-${version}-${rev}";
+  version = "0.7.5";
+  rev = "c855d04409";
+  src = fetchgit {
+    url = "https://github.com/thelaui/M.A.R.S..git";
+    inherit rev;
+    sha256 = "70fc4b5823f2efb03e0bcd3fe82dee88ee93ddfd81d53de0d7eb3fe02793d65e";
   };
-  buildInputs = [ cmake mesa sfml_git fribidi taglib ];
+  buildInputs = [ cmake mesa sfml fribidi taglib ];
+  patches = [ ./unbind_fix.patch ];
   installPhase = ''
     cd ..
     find -name '*.svn' -exec rm -rf {} \;
diff --git a/pkgs/games/mars/unbind_fix.patch b/pkgs/games/mars/unbind_fix.patch
new file mode 100644
index 00000000000..2aef6eb5cf6
--- /dev/null
+++ b/pkgs/games/mars/unbind_fix.patch
@@ -0,0 +1,19 @@
+diff --git a/src/System/window.cpp b/src/System/window.cpp
+index e9a099a..e3f6de9 100644
+--- a/src/System/window.cpp
++++ b/src/System/window.cpp
+@@ -308,12 +308,12 @@ namespace window {
+         glEnable(GL_TEXTURE_2D);
+ 
+         if (shader)
+-            shader->bind();
++            sf::Shader::bind(shader);
+ 
+         window_.draw(toBeDrawn, states);
+ 
+         if (shader)
+-            shader->unbind();
++            sf::Shader::bind(NULL);
+ 
+         window_.popGLStates();
+         glPopMatrix();
diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix
index 171a6d6fe83..376d1e33473 100644
--- a/pkgs/games/scrolls/default.nix
+++ b/pkgs/games/scrolls/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "scrolls-2014-03-08";
 
   meta = {
-    description = "Scrolls is a strategy collectible card game.";
+    description = "A strategy collectible card game";
     homepage = "https://scrolls.com/";
     # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/
 
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 0a444cf61b4..b8e5c646758 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -73,5 +73,5 @@ buildFHSUserEnv {
     export LD_PRELOAD=/lib32/libpulse.so:/lib64/libpulse.so:/lib32/libasound.so:/lib64/libasound.so
   '';
 
-  runScript = "exec steam";
+  runScript = "steam";
 }
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 2379ac9ecd4..82cffc8dec6 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -1,26 +1,35 @@
-{ stdenv, fetchhg, zlib, bzip2, pkgconfig, alsaLib, pulseaudio, libmad, libtheora,
-  libvorbis, libpng, libjpeg, mesa, gtk, ffmpeg, automake, autoconf, glew }:
+{ fetchFromGitHub, stdenv, pkgconfig, autoconf, automake, yasm, zlib, bzip2, alsaLib
+, pulseaudio, libmad, libtheora, libvorbis, libpng, libjpeg, gtk
+, mesa, glew }:
 
 stdenv.mkDerivation rec {
-  name = "stepmania-5";
+  name = "stepmania-${version}";
+  version = "5.0.7";
 
-  src = fetchhg {
-    url = "https://code.google.com/p/sm-ssc/";
-    # revision = "5fdf515a180e";
-    sha256 = "05v19giq7d956islr2r8350zfwc4h8sq89xlj93ccii8rp94cvvf";
+  src = fetchFromGitHub {
+    owner = "stepmania";
+    repo  = "stepmania";
+    rev   = "v${version}";
+    sha256 = "1lagnk8x72v5jazcbb39237fi33kp5zgg22fxw7zmvr4qwqiqbz9";
   };
 
-  buildInputs = [ zlib bzip2 pkgconfig alsaLib pulseaudio libmad libtheora
-                  libvorbis libpng libjpeg mesa gtk ffmpeg automake autoconf glew ];
+  buildInputs = [
+    pkgconfig autoconf automake yasm zlib bzip2 alsaLib pulseaudio libmad libtheora
+    libvorbis libpng libjpeg gtk mesa glew
+  ];
+
+  preConfigure = ''
+    substituteInPlace autoconf/m4/video.m4 \
+      --replace './configure $FFMPEG_CONFFLAGS' './configure --prefix='$out' $FFMPEG_CONFFLAGS'
+
+    ./autogen.sh
+  '';
 
-  preConfigure = "./autogen.sh";
   postInstall = ''
-    mv "$out/stepmania 5/"* $out/
-    rmdir "$out/stepmania 5"
     mkdir -p $out/bin
-    echo "#\!/bin/sh" > $out/bin/stepmania
-    echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib' >> $out/bin/stepmania
-    echo "exec $out/stepmania" >> $out/bin/stepmania
+    echo "#!/bin/sh" > $out/bin/stepmania
+    echo "export LD_LIBRARY_PATH=$out/stepmania-5.0:${alsaLib}/lib:\$LD_LIBRARY_PATH" >> $out/bin/stepmania
+    echo "exec $out/stepmania-5.0/stepmania" >> $out/bin/stepmania
     chmod +x $out/bin/stepmania
   '';
 
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 3aa23ffd0e8..21e6a28cf85 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.76";
+  name = "tibia-10.77";
 
   src = fetchurl {
-    url = http://static.tibia.com/download/tibia1076.tgz;
-    sha256 = "1kzsbrravk8lmpirghhsynnygmcig8jkbw6qfzk1fkabi1d02yrv";
+    url = http://static.tibia.com/download/tibia1077.tgz;
+    sha256 = "1qz2a25irzhdwh4swwcfz4g37f1j3cxhm9c43yl763bvc718ikly";
   };
 
   shell = stdenv.shell;
diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix
index a5ae8ec8b6d..ad65b54ddcd 100644
--- a/pkgs/games/trigger/default.nix
+++ b/pkgs/games/trigger/default.nix
@@ -1,22 +1,22 @@
 { fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, jam }:
 
 stdenv.mkDerivation rec {
-  name = "trigger-rally-0.6.0";
+  name = "trigger-rally-0.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/trigger-rally/${name}-src.tar.bz2";
-    sha256 = "0qm6anlcqx19iaiz0zh0bf74g9nc6gr8cy0lbsxahwgzkwsqz0fw";
+    sha256 = "1fvb6dl5bwclmx0y8ygyrfn8jczc5kxawxlyv6mp592smb5x5hjs";
   };
 
   srcData = fetchurl {
-    url = "mirror://sourceforge/trigger-rally/trigger-rally-0.6.0-data.tar.bz2";
-    sha256 = "161mfgv68my2231d8ps4zs1axisrj0lkcc4yqsr0x28w0mr19j4y";
+    url = "mirror://sourceforge/trigger-rally/${name}-data.tar.bz2";
+    sha256 = "04f9d74gz5xvfx6pnmbfxqhp0kd1p16j5lrgcq12wxvla6py4qaw";
   };
 
   buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa jam ];
 
   preConfigure = ''
-    configureFlags="$configureFlags --datadir=$out/share/trigger-rally-0.6.0-data"
+    configureFlags="$configureFlags --datadir=$out/share/${name}-data"
   '';
 
   # It has some problems installing the README file, so... out.
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 9db82d722d2..ba8245bb700 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -8,11 +8,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xonotic-0.7.0";
+  name = "xonotic-0.8.0";
 
   src = fetchurl {
     url = "http://dl.xonotic.org/${name}.zip";
-    sha256 = "21a5fb5493c269cd3843789cb8598f952d4196e8bc71804b9bd5808b646542c6";
+    sha256 = "0w336750sq8nwqljlcj3znk4iaj3nvn6id144d7j72vsh84ci1qa";
   };
 
   buildInputs = [
diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix
index 0d55f1cd13e..9975aa1b15b 100644
--- a/pkgs/games/zod/default.nix
+++ b/pkgs/games/zod/default.nix
@@ -1,5 +1,5 @@
-{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer,
-  mysql, makeWrapper }:
+{ fetchurl, stdenv, unrar, unzip, SDL, SDL_image, SDL_ttf, SDL_mixer
+, libmysql, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "zod-engine-2011-03-18";
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
     sourceRoot=`pwd`/src
   '';
 
-  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer mysql.lib
+  buildInputs = [ unrar unzip SDL SDL_image SDL_ttf SDL_mixer libmysql
     makeWrapper ];
 
-  NIX_LDFLAGS="-L${mysql.lib}/lib/mysql";
+  NIX_LDFLAGS="-L${libmysql}/lib/mysql";
 
   installPhase = ''
     mkdir -p $out/bin $out/share/zod
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 269f0df1090..8043cbb1506 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
-, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }:
+, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }:
 
 stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
@@ -26,14 +26,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl
-    ijs qpdf dbus
+    ijs qpdf dbus avahi
   ];
 
-  preBuild = ''
-    substituteInPlace Makefile --replace "/etc/rc.d" "$out/etc/rc.d"
-  '';
-
-  configureFlags = "--with-pdftops=pdftops --enable-imagefilters";
+  configureFlags = "--with-pdftops=pdftops --enable-imagefilters --with-rcdir=no";
 
   makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups";
 
diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix
index 1a76ddd1c90..89baadb6208 100644
--- a/pkgs/misc/emulators/atari++/default.nix
+++ b/pkgs/misc/emulators/atari++/default.nix
@@ -1,15 +1,28 @@
-{stdenv, fetchurl, x11, SDL}:
+{ stdenv, fetchurl
+, libX11, SDL }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+  name = "atari++-${version}";
+  version = "1.73";
 
-stdenv.mkDerivation {
-  name = "atari++-1.46";
-#  builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.math.tu-berlin.de/~thor/atari++/download/atari++.tgz;
-    md5 = "0619ec6b63852233111aa0bd263c8ea2";
+    url = "http://www.xl-project.com/download/atari++_${version}.tar.gz";
+    sha256 = "1y5kwh08717jsa5agxrvxnggnwxq36irrid9rzfhca1nnvp9a45l";
   };
-#  rom = fetchurl {
-#    url = mirror://sourceforge/atari800/xf25.zip;
-#    md5 = "4dc3b6b4313e9596c4d474785a37b94d";
-#  };
-  buildInputs = [x11 SDL];
+
+  buildInputs = [ libX11 SDL ];
+  meta = {
+    homepage = http://www.xl-project.com/;
+    description = "An enhanced, cycle-accurated Atari emulator";
+    longDescription = ''
+      The Atari++ Emulator is a Unix based emulator of the Atari eight
+      bit computers, namely the Atari 400 and 800, the Atari 400XL,
+      800XL and 130XE, and the Atari 5200 game console. The emulator
+      is auto-configurable and will compile on a variety of systems
+      (Linux, Solaris, Irix).
+    '';
+    maintainers = [ maintainers.AndersonTorres ];
+    license = licenses.gpl2Plus;    
+  };    
 }
diff --git a/pkgs/misc/emulators/atari800/builder.sh b/pkgs/misc/emulators/atari800/builder.sh
deleted file mode 100644
index afb9404657a..00000000000
--- a/pkgs/misc/emulators/atari800/builder.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-source $stdenv/setup
-
-preConfigure() {
-    cd src
-}
-
-postInstall() {
-    romsDir=$out/share/atari800/roms
-    mkdir -p $romsDir
-    unzip $rom -d $romsDir
-}
-
-genericBuild
diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index c2a4c7d3d8b..af8d64982a0 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -1,16 +1,32 @@
-{stdenv, fetchurl, unzip, zlib, SDL}:
+{ stdenv, fetchurl
+, unzip, zlib, SDL, readline, mesa, libX11 }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+  name = "atari800-${version}";
+  version = "3.1.0";
 
-stdenv.mkDerivation {
-  name = "atari800-2.2.1";
-  builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://sourceforge/atari800/atari800-2.2.1.tar.gz;
-    sha256 = "0gkhlb3jc0rd7fcqjm41877fsqr7als3a0n552qmnjzrlcczf5yz";
-  };
-  rom = fetchurl {
-    url = mirror://sourceforge/atari800/xf25.zip;
-    sha256 = "12jbawxs04i0wm3910n7f3phsybdp8nndxc0xlsnzp8k0k8hmblq";
+    url = "mirror://sourceforge/atari800/atari800/${version}/${name}.tar.gz";
+    sha256 = "030yz5l1wyq9l0dmiimiiwpzrjr43whycd409xhhpnrdx76046wh";
   };
-  buildInputs = [unzip zlib SDL];
-  configureFlags = "--target=sdl";
+
+  buildInputs = [ unzip zlib SDL readline mesa libX11 ];
+
+  configureFlags = "--target=default --with-video=sdl --with-sound=sdl --with-readline --with-opengl --with-x --enable-riodevice";
+
+  preConfigure = "cd src";
+
+  meta = {
+    homepage = "http://atari800.sourceforge.net/";
+    description = "An Atari 8-bit emulator";
+    longDescription = ''
+      Atari800 is the emulator of Atari 8-bit computer systems and
+      5200 game console for Unix, Linux, Amiga, MS-DOS, Atari
+      TT/Falcon, MS-Windows, MS WinCE, Sega Dreamcast, Android and
+      other systems supported by the SDL library.
+    '';
+    maintainers = [ maintainers.AndersonTorres ];
+    license = licenses.gpl2Plus;    
+  };    
 }
diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix
index b2b641e3f7a..58727f10ef1 100644
--- a/pkgs/misc/emulators/cdemu/base.nix
+++ b/pkgs/misc/emulators/cdemu/base.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation ({
     cmake ../${name} -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_RPATH=ON
   '';
   meta = {
-    description = "CDemu is a software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system.";
+    description = "A Software suite designed to emulate an optical drive and disc (including CD-ROMs and DVD-ROMs) on the Linux operating system";
     longDescription = ''
       CDEmu consists of:
 
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 640d8f4fe6c..cbff76610f1 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,14 +1,14 @@
 { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , gettext, git, libpthreadstubs, libXrandr, libXext, readline
-, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit
+, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb
 , pulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20150403";
+  name = "dolphin-emu-20150421";
   src = fetchgit {
     url = git://github.com/dolphin-emu/dolphin.git;
-    rev = "38236fb8e8370f9f1ca1482ffa94b08c4595f2aa";
-    sha256 = "14v86c042jz5adqk6ngqbzl5xna7m69i39y7q23s7h6ra75461yf";
+    rev = "4340927b7f17fa43c5f6c0f204c4bfc2b17a47d5";
+    sha256 = "0pc18n88yckmvli27p09xj5kyv4k8bqv92ric8xvi7cqznmmiv9d";
     fetchSubmodules = false;
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
-                  git libXdmcp portaudio SDL wxGTK30 pulseaudio ];
+                  git libXdmcp portaudio SDL wxGTK30 libusb pulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;
diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix
index 8538932339c..1e4827942b9 100644
--- a/pkgs/misc/gxemul/default.nix
+++ b/pkgs/misc/emulators/gxemul/default.nix
@@ -1,12 +1,24 @@
 { stdenv, composableDerivation, fetchurl }:
 
 let edf = composableDerivation.edf;
-    name = "gxemul-0.4.6";
+    version = "0.6.0.1";
+    name = "gxemul-${version}";
 in
 
 composableDerivation.composableDerivation {} {
   inherit name;
-  
+
+  src = fetchurl {
+    url = "http://gavare.se/gxemul/src/${name}.tar.gz";
+    sha256 = "1afd9l0igyv7qgc0pn3rkdgrl5d0ywlyib0qhg4li23zilyq5407";
+  };
+
+  configurePhase = "./configure";
+
+  installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;";
+
+  mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; };
+
   flags = {
     doc   = { installPhase = "mkdir -p \$out/share/${name}; cp -r doc \$out/share/${name};"; implies = "man"; };
     demos = { installPhase = "mkdir -p \$out/share/${name}; cp -r demos \$out/share/${name};"; };
@@ -19,20 +31,19 @@ composableDerivation.composableDerivation {} {
     manSupport = true;
   };
 
-  installPhase = "mkdir -p \$out/bin; cp gxemul \$out/bin;";
-
-  src = fetchurl {
-    url = http://gavare.se/gxemul/src/gxemul-0.4.6.tar.gz;
-    sha256 = "0hf3gi6hfd2qr5090zimfiddcjgank2q6m7dfsr81wwpxfbhb2z3";
-  };
-
-  configurePhase = "./configure";
-
   meta = {
     license = stdenv.lib.licenses.bsd3;
-    description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types";
+    description = "Gavare's experimental emulator";
+    longDescription = ''
+      GXemul is a framework for full-system computer architecture
+      emulation. Several real machines have been implemented within the
+      framework, consisting of processors (ARM, MIPS, Motorola 88K,
+      PowerPC, and SuperH) and surrounding hardware components such as
+      framebuffers, interrupt controllers, busses, disk controllers,
+      and serial controllers. The emulation is working well enough to
+      allow several unmodified "guest" operating systems to run.
+    '';
     homepage = http://gxemul.sourceforge.net/;
   };
 
-  mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; };
 }
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
new file mode 100644
index 00000000000..2aa588592ac
--- /dev/null
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, wine, perl, autoconf, utillinux
+, pulseaudio, libtxc_dxtn }:
+
+let version = "1.7.40";
+    patch = fetchFromGitHub {
+      owner = "wine-compholio";
+      repo = "wine-staging";
+      rev = "v${version}";
+      sha256 = "0l14yy6wbvbs2xrnn9z3a35lbnpl8ibkmc0vh983fimf9nxckpan";
+    };
+
+in assert (builtins.parseDrvName wine.name).version == version;
+
+stdenv.lib.overrideDerivation wine (self: {
+  nativeBuildInputs = [ pulseaudio libtxc_dxtn ] ++ self.nativeBuildInputs;
+  buildInputs = [ perl utillinux autoconf ] ++ self.buildInputs;
+
+  name = "${self.name}-staging";
+
+  postPatch = self.postPatch or "" + ''
+    patchShebangs tools
+    cp -r ${patch}/patches .
+    chmod +w patches
+    cd patches
+    patchShebangs gitapply.sh
+    ./patchinstall.sh DESTDIR=.. --all
+    cd ..
+  '';
+})
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index 9152e8a7202..fde43ffd79b 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,45 +1,78 @@
-{ stdenv, fetchurl, alsaLib, dbus, expat, libsamplerate
-, libsndfile, makeWrapper, pkgconfig, python, pythonDBus
-, firewireSupport ? false, ffado ? null, bash }:
+{ stdenv, fetchFromGitHub, pkgconfig, python, makeWrapper
+, bash, libsamplerate, readline
 
-assert firewireSupport -> ffado != null;
+# Optional Dependencies
+, dbus ? null, pythonDBus ? null, libffado ? null, alsaLib ? null
+, libopus ? null
 
+# Extra options
+, prefix ? ""
+}:
+
+with stdenv.lib;
+let
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  libOnly = prefix == "lib";
+
+  optDbus = shouldUsePkg dbus;
+  optPythonDBus = if libOnly then null else shouldUsePkg pythonDBus;
+  optLibffado = if libOnly then null else shouldUsePkg libffado;
+  optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
+  optLibopus = shouldUsePkg libopus;
+in
 stdenv.mkDerivation rec {
-  name = "jack2-${version}";
+  name = "${prefix}jack2-${version}";
   version = "1.9.10";
 
-  src = fetchurl {
-    urls = [
-      https://github.com/jackaudio/jack2/archive/v1.9.10.tar.gz
-    ];
-    sha256 = "03b0iiyk3ng3vh5s8gaqwn565vik7910p56mlbk512bw3dhbdwc8";
+  src = fetchFromGitHub {
+    owner = "jackaudio";
+    repo = "jack2";
+    rev = "v${version}";
+    sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr";
   };
 
-  buildInputs =
-    [ alsaLib dbus expat libsamplerate libsndfile makeWrapper
-      pkgconfig python pythonDBus
-    ] ++ (stdenv.lib.optional firewireSupport ffado);
+  nativeBuildInputs = [ pkgconfig python makeWrapper ];
+  buildInputs = [
+    python
+
+    libsamplerate readline
+
+    optDbus optPythonDBus optLibffado optAlsaLib optLibopus
+  ];
 
   patchPhase = ''
     substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
   '';
 
   configurePhase = ''
-    python waf configure --prefix=$out --dbus --alsa ${if firewireSupport then "--firewire" else ""}
+    python waf configure --prefix=$out \
+      ${optionalString (optDbus != null) "--dbus"} \
+      --classic \
+      --profile \
+      ${optionalString (optLibffado != null) "--firewire"} \
+      ${optionalString (optAlsaLib != null) "--alsa"} \
+      --autostart=${if (optDbus != null) then "dbus" else "classic"} \
   '';
 
-  buildPhase = "python waf build";
+  buildPhase = ''
+    python waf build
+  '';
 
   installPhase = ''
     python waf install
+  '' + (if libOnly then ''
+    rm -rf $out/{bin,share}
+    rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
+  '' else ''
     wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
-  '';
+  '');
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "JACK audio connection kit, version 2 with jackdbus";
     homepage = "http://jackaudio.org";
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ goibhniu wkennington ];
   };
 }
diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix
index d424452ecd5..1c5c78548f5 100644
--- a/pkgs/misc/jackaudio/jack1.nix
+++ b/pkgs/misc/jackaudio/jack1.nix
@@ -1,8 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, alsaLib, db, libuuid
-, firewireSupport ? false, ffado ? null }:
+{ stdenv, fetchurl, pkgconfig
 
-assert firewireSupport -> ffado != null;
+# Optional Dependencies
+, alsaLib ? null, db ? null, libuuid ? null, libffado ? null, celt ? null
+}:
 
+let
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  optAlsaLib = shouldUsePkg alsaLib;
+  optDb = shouldUsePkg db;
+  optLibuuid = shouldUsePkg libuuid;
+  optLibffado = shouldUsePkg libffado;
+  optCelt = shouldUsePkg celt;
+in
 stdenv.mkDerivation rec {
   name = "jack1-${version}";
   version = "0.124.1";
@@ -12,19 +22,18 @@ stdenv.mkDerivation rec {
     sha256 = "1mk1wnx33anp6haxfjjkfhwbaknfblsvj35nxvz0hvspcmhdyhpb";
   };
   
-  preBuild = "echo ok";
-
   configureFlags = ''
-    ${if firewireSupport then "--enable-firewire" else ""}
+    ${if (optLibffado != null) then "--enable-firewire" else ""}
   '';
 
-  buildInputs = 
-    [ pkgconfig alsaLib db libuuid
-    ] ++ (stdenv.lib.optional firewireSupport ffado);
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ optAlsaLib optDb optLibuuid optLibffado optCelt ];
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "JACK audio connection kit";
     homepage = "http://jackaudio.org";
     license = "GPL";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 56dd79f2837..226f9375fd4 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -439,6 +439,20 @@ rec {
     };
   };
 
+  vim-jinja = buildVimPlugin {
+    name = "vim-jinja-git-2014-06-11";
+    src = fetchFromGitHub {
+      owner = "lepture";
+      repo = "vim-jinja";
+      rev = "4412484b41";
+      sha256="1z5ya953nn7233jjjs0ay61x5hfrfddx9xz31grq52cfd0ipy335";
+    };
+   meta = {
+    homepage = "https://github.com/lepture/vim-jinja";
+    maintainers = [ stdenv.lib.maintainers.hbunke ];
+    };
+  };
+
   vimproc = buildVimPlugin {
     name = "vimproc-git-2015-02-23";
     src = fetchgit {
diff --git a/pkgs/os-specific/darwin/command-line-tools/default.nix b/pkgs/os-specific/darwin/command-line-tools/default.nix
index c437c76cfd6..9bbf5882e5d 100644
--- a/pkgs/os-specific/darwin/command-line-tools/default.nix
+++ b/pkgs/os-specific/darwin/command-line-tools/default.nix
@@ -5,7 +5,9 @@ let
     inherit name;
 
     src = fetchurl {
-      url = "http://swcdn.apple.com/content/downloads/00/14/031-07556/i7hoqm3awowxdy48l34uel4qvwhdq8lgam/${name}.pkg";
+      # Magic url found in:
+      # https://swscan.apple.com/content/catalogs/others/index-10.9-1.sucatalog
+      url = "http://swcdn.apple.com/content/downloads/27/02/031-06182/yiervn212jfs091cp9hwmb7gjq7ky91crs/${name}.pkg";
       inherit sha256;
     };
 
@@ -32,12 +34,12 @@ let
   };
 in rec {
   tools = pkg {
-    name   = "CLTools_Executables";
-    sha256 = "1rqrgip9pwr9d6p1hkd027lzxpymr1qm54jjnkldjjb8m4nps7bp";
+    name   = "CLTools_Executables_OSX109";
+    sha256 = "1cjdnnjny6h0dc1cc994pgrkmsa5cvk7pi5dpkxyslyicwf260fx";
   };
 
   sdk = pkg {
     name   = "DevSDK_OSX109";
-    sha256 = "0x6r61h78r5cxk9dbw6fnjpn6ydi4kcajvllpczx3mi52crlkm4x";
+    sha256 = "16b7aplha5573yl1d44nl2yxzp0w2hafihbyh7930wrcvba69iy4";
   };
 }
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index 41abf488673..ed72e701166 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-lib-1.0.28";
+  name = "alsa-lib-1.0.29";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
      "http://alsa.cybermirror.org/lib/${name}.tar.bz2"
     ];
-    sha256 = "0vaafg5q1q1mqcsgin5v7xlmngl3cnbmg5a9xxw0xcz1vn2ln1rw";
+    sha256 = "1l5xzhq7xjy8xap087zbbyi14gr1bhil18pn987vwdlnxcskq13k";
   };
 
   patches = [
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index 0bb96c343df..0450a44dae7 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,21 +1,21 @@
-{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, pulseaudio ? null, jack2 ? null }:
+{ stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-plugins-1.0.28";
+  name = "alsa-plugins-1.0.29";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
       "http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
     ];
-    sha256 = "081is33afhykb4ysll8s6gh0d6nm1cglslj9ck0disbyl3qqlvs2";
+    sha256 = "0ck5xa0vnjhn5w23gf87y30h7bcb6hzsx4817sw35xl5qb58ap9j";
   };
 
   # ToDo: a52, etc.?
   buildInputs =
     [ pkgconfig alsaLib libogg ]
-    ++ lib.optional (pulseaudio != null) pulseaudio
-    ++ lib.optional (jack2 != null) jack2;
+    ++ lib.optional (libpulseaudio != null) libpulseaudio
+    ++ lib.optional (libjack2 != null) libjack2;
 
   meta = with lib; {
     description = "Various plugins for ALSA";
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 7ab4a919786..9f6fc98b5cf 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-utils-1.0.28";
+  name = "alsa-utils-${version}";
+  version = "1.0.29";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
       "http://alsa.cybermirror.org/utils/${name}.tar.bz2"
     ];
-    sha256 = "1k1ach1jv0bf71klj9sqaijnw9wjrjad0g5in6bpfnhjn24lrzzk";
+    sha256 = "16ryhgbapp4pxyvsjc258mcj14wk7x3xs6g9bpnkqj0l7s7haq2i";
   };
 
-  buildInputs = [ alsaLib ncurses libsamplerate ];
-  nativeBuildInputs = [ gettext ];
+  buildInputs = [ gettext alsaLib ncurses libsamplerate ];
 
   configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";
 
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.AndersonTorres ];
   };
 }
diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix
index 0243c2aa456..1b1d9a3d1ca 100644
--- a/pkgs/os-specific/linux/apparmor/2.9/default.nix
+++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix
@@ -4,7 +4,7 @@
 
 let
   apparmor-series = "2.9";
-  apparmor-patchver = "1";
+  apparmor-patchver = "2";
   apparmor-version = "${apparmor-series}.${apparmor-patchver}";
 
   apparmor-meta = component: with stdenv.lib; {
@@ -17,7 +17,7 @@ let
 
   apparmor-sources = fetchurl {
     url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz";
-    sha256 = "08ha7aigl40vm80f742rljcckdpfpw1s8g4yii1ysabcqcj8ffx6";
+    sha256 = "1mayly7d7w959fya7z8q6kab2x3jcwhqhkpx36jsvpjhxkhmc4fh";
   };
 
   prePatchCommon = ''
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 61d3667f165..6e8fbdacf84 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -5,11 +5,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "bluez-5.29";
+  name = "bluez-5.30";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "1r7h8qr52n372r73fdyk804r92hqg9g6pvflwmak64y6brnnl8fz";
+    sha256 = "0b1qbnq1xzcdw5rajg9yyg31bf21jnff0n6gnf1snz89bbdllfhy";
   };
 
   pythonPath = with pythonPackages;
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index 4701d774dfd..b423dc3a086 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, file, findutils, elfutils, glibc }:
+{ stdenv, fetchurl, file, findutils, binutils, glibc, procps, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "checksec-${version}";
@@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find
     substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $"
     substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file"
-    substituteInPlace $out/bin/checksec --replace " readelf -" " ${elfutils}/bin/readelf -"
-    substituteInPlace $out/bin/checksec --replace "(readelf -" "(${elfutils}/bin/readelf -"
-    substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${elfutils}/bin/readelf"
+    substituteInPlace $out/bin/checksec --replace " readelf -" " ${binutils}/bin/readelf -"
+    substituteInPlace $out/bin/checksec --replace "(readelf -" "(${binutils}/bin/readelf -"
+    substituteInPlace $out/bin/checksec --replace "command_exists readelf" "command_exists ${binutils}/bin/readelf"
+    substituteInPlace $out/bin/checksec --replace "/sbin/sysctl -" "${procps}/sbin/sysctl -"
+    substituteInPlace $out/bin/checksec --replace "/usr/bin/id -" "${coreutils}/bin/id -"
   '';
 
   phases = "unpackPhase patchPhase installPhase";
diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 068e49d0190..4c945a7fbac 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://oss.linbit.com/drbd/8.4/${name}.tar.gz";
-    sha256 = "0hm1cnd7vsccyc22sg85f9aj48nijl2f1kgbvl5crv414ihv5giq";
+    sha256 = "1w4889h1ak7gy9w33kd4fgjlfpgmp6hzfya16p1pkc13bjf22mm0";
   };
 
   patches = [ ./pass-force.patch ];
diff --git a/pkgs/os-specific/linux/ffado/build-fix.patch b/pkgs/os-specific/linux/ffado/build-fix.patch
new file mode 100644
index 00000000000..b63fd65184a
--- /dev/null
+++ b/pkgs/os-specific/linux/ffado/build-fix.patch
@@ -0,0 +1,61 @@
+diff --git a/SConstruct b/SConstruct
+index ca5d5cf..76738e3 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -354,7 +354,7 @@ if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and co
+     env['PYUIC4'] = True
+     build_mixer = True
+ 
+-if conf.CheckForApp( 'xdg-desktop-menu --help' ):
++if conf.CheckForApp( 'which xdg-desktop-menu' ):
+     env['XDG_TOOLS'] = True
+ else:
+     print """
+diff --git a/support/dbus/SConscript b/support/dbus/SConscript
+index 2b0f0c6..23069d8 100644
+--- a/support/dbus/SConscript
++++ b/support/dbus/SConscript
+@@ -44,6 +44,7 @@ if not env.GetOption( "clean" ):
+         env.MergeFlags( env['LIBXML26_FLAGS'] )
+     else:
+         env.PrependUnique( LIBS=["expat"] )
++        env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
+ 
+ env.Xml2Cpp_Proxy('controlclient-glue.h', 'control-interface.xml')
+ env.Xml2Cpp_Adaptor('controlserver-glue.h', 'control-interface.xml')
+diff --git a/support/firmware/SConscript b/support/firmware/SConscript
+index 2939cb0..307b295 100644
+--- a/support/firmware/SConscript
++++ b/support/firmware/SConscript
+@@ -36,6 +36,7 @@ if not env.GetOption( "clean" ):
+         env.MergeFlags( env['LIBXML26_FLAGS'] )
+     else:
+         env.PrependUnique( LIBS=["expat"] )
++        env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
+ 
+ static_env = env.Clone()
+ 
+diff --git a/support/tools/SConscript b/support/tools/SConscript
+index 651621d..01b11f4 100644
+--- a/support/tools/SConscript
++++ b/support/tools/SConscript
+@@ -36,6 +36,7 @@ if not e.GetOption( "clean" ):
+                 e.MergeFlags( env['LIBXML26_FLAGS'] )
+         else:
+                 e.PrependUnique( LIBS=["expat"] )
++                e.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
+ 
+ #
+ # For the the ffado-diag tools
+diff --git a/tests/SConscript b/tests/SConscript
+index 307341f..4800b93 100644
+--- a/tests/SConscript
++++ b/tests/SConscript
+@@ -35,6 +35,7 @@ if not env.GetOption( "clean" ):
+ 		env.MergeFlags( env['LIBXML26_FLAGS'] )
+ 	else:
+ 		env.PrependUnique( LIBS=["expat"] )
++        env.MergeFlags( "-DSERIALIZE_USE_EXPAT" )
+ 
+ static_env = env.Clone()
+ 
diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix
index 70c13be9ab4..dcbf0e567ad 100644
--- a/pkgs/os-specific/linux/ffado/default.nix
+++ b/pkgs/os-specific/linux/ffado/default.nix
@@ -1,60 +1,93 @@
-{ stdenv, fetchurl, dbus, dbus_cplusplus, expat, glibmm, libconfig
-, libavc1394, libiec61883, libraw1394, libxmlxx, makeWrapper, pkgconfig
-, pyqt4, python, pythonDBus, qt4, scons }:
+{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python
+, expat, libraw1394, libconfig, libavc1394, libiec61883
 
+# Optional dependencies
+, libjack2 ? null, dbus ? null, dbus_cplusplus ? null, alsaLib ? null
+, pyqt4 ? null, xdg_utils ? null
+
+, glibmm
+, pythonDBus, qt4
+
+# Other Flags
+, prefix ? ""
+}:
+
+let
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  libOnly = prefix == "lib";
+
+  optLibjack2 = shouldUsePkg libjack2;
+  optDbus = shouldUsePkg dbus;
+  optDbus_cplusplus = shouldUsePkg dbus_cplusplus;
+  optAlsaLib = shouldUsePkg alsaLib;
+  optPyqt4 = shouldUsePkg pyqt4;
+  optXdg_utils = shouldUsePkg xdg_utils;
+in
 stdenv.mkDerivation rec {
-  name = "libffado-${version}";
+  name = "${prefix}ffado-${version}";
   version = "2.2.1";
 
   src = fetchurl {
-    url = "http://www.ffado.org/files/${name}.tgz";
+    url = "http://www.ffado.org/files/libffado-${version}.tgz";
     sha256 = "1ximic90l0av91njb123ra2zp6mg23yg5iz8xa5371cqrn79nacz";
   };
 
-  buildInputs =
-    [ dbus dbus_cplusplus expat glibmm libavc1394 libconfig
-      libiec61883 libraw1394 libxmlxx makeWrapper pkgconfig pyqt4
-      python pythonDBus qt4 scons
-    ];
+  nativeBuildInputs = [ scons pkgconfig which makeWrapper python ];
 
-  patches = [ ./enable-mixer-and-dbus.patch ];
+  buildInputs = [
+    expat libraw1394 libconfig libavc1394 libiec61883
+  ] ++ stdenv.lib.optionals (!libOnly) [
+    optLibjack2 optDbus optDbus_cplusplus optAlsaLib optPyqt4
+    optXdg_utils
+    # dbus dbus_cplusplus glibmm
+    # pyqt4
+    # python pythonDBus qt4
+  ];
 
-  # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
-  # Let's just skip this and tell it which to build
-  postPatch = if stdenv.isi686 then ''
-    sed '/def is_userspace_32bit(cpuinfo):/a\
-        return True' -i SConstruct
-  ''
-  else ''
+  patches = [ ./build-fix.patch ];
+
+  postPatch = ''
+    # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch
+    # Let's just skip this and tell it which to build
     sed '/def is_userspace_32bit(cpuinfo):/a\
-        return False' -i SConstruct
+        return ${if stdenv.is64bit then "False" else "True"}' -i SConstruct
+
+    # Lots of code is missing random headers to exist
+    sed -i '1i #include <memory>' \
+      src/ffadodevice.h src/bebob/bebob_dl_mgr.cpp tests/scan-devreg.cpp
+    sed -i -e '1i #include <stdlib.h>' \
+      -e '1i #include "version.h"' \
+      src/libutil/serialize_expat.cpp
   '';
 
   # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR
   buildPhase = ''
-    export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages
-    scons PYPKGDIR=$out/$PYLIBSUFFIX DEBUG=False
-    sed -e "s#/usr/local#$out#" -i support/mixer-qt4/ffado/config.py
-    '';
+    export PYDIR=$out/lib/${python.libPrefix}/site-packages
 
-  installPhase = ''
-    scons PREFIX=$out LIBDIR=$out/lib SHAREDIR=$out/share/libffado \
-      PYPKGDIR=$out/$PYLIBSUFFIX UDEVDIR=$out/lib/udev/rules.d install
+    scons PYPKGDIR=$PYDIR DEBUG=False \
+      ENABLE_ALL=True \
+      SERIALIZE_USE_EXPAT=True \
+  '';
 
-    sed -e "s#/usr/local#$out#g" -i $out/bin/ffado-diag
+  installPhase = if libOnly then ''
+    scons PREFIX=$TMPDIR UDEVDIR=$TMPDIR \
+      LIBDIR=$out/lib INCLUDEDIR=$out/include install
+  '' else ''
+    scons PREFIX=$out PYPKGDIR=$PYDIR UDEVDIR=$out/lib/udev/rules.d install
 
-    PYDIR=$out/$PYLIBSUFFIX
     wrapProgram $out/bin/ffado-mixer --prefix PYTHONPATH : \
       $PYTHONPATH:$PYDIR:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
     wrapProgram $out/bin/ffado-diag --prefix PYTHONPATH : \
       $PYTHONPATH:$PYDIR:$out/share/libffado/python:${pyqt4}/$LIBSUFFIX:${pythonDBus}/$LIBSUFFIX:
-    '';
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.ffado.org;
     description = "FireWire audio drivers";
     license = licenses.gpl3;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu wkennington ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch b/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
deleted file mode 100644
index 480e0f45a92..00000000000
--- a/pkgs/os-specific/linux/ffado/enable-mixer-and-dbus.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- libffado-2.1.0/SConstruct	1970-01-01 01:00:01.000000000 +0100
-+++ libffado-2.1.0/SConstruct	2012-09-30 16:50:23.603283095 +0000
-@@ -349,11 +349,9 @@
- # Optional checks follow:
- #
- 
--# PyQT checks
--build_mixer = False
--if conf.CheckForApp( 'which pyuic4' ) and conf.CheckForPyModule( 'dbus' ) and conf.CheckForPyModule( 'PyQt4' ) and conf.CheckForPyModule( 'dbus.mainloop.qt' ):
--    env['PYUIC4'] = True
--    build_mixer = True
-+env['PYUIC4'] = True
-+build_mixer = True
-+
- 
- if conf.CheckForApp( 'xdg-desktop-menu --help' ):
-     env['XDG_TOOLS'] = True
-@@ -384,7 +382,7 @@
-     name2 = pkg.replace("+","").replace(".","").replace("-","").upper()
-     env['%s_FLAGS' % name2] = conf.GetPKGFlags( pkg, pkgs[pkg] )
- 
--if not env['DBUS1_FLAGS'] or not env['DBUSC1_FLAGS'] or not conf.CheckForApp('which dbusxx-xml2cpp'):
-+if False:
-     env['DBUS1_FLAGS'] = ""
-     env['DBUSC1_FLAGS'] = ""
-     print """
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
new file mode 100644
index 00000000000..7afd464620d
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, b43FirmwareCutter }:
+
+let version = "6.30.163.46"; in
+
+stdenv.mkDerivation {
+  name = "b43-firmware-${version}";
+
+  src = fetchurl {
+    url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2";
+    sha256 = "0baw6gcnrhxbb447msv34xg6rmlcj0gm3ahxwvdwfcvq4xmknz50";
+  };
+
+  buildInputs = [ b43FirmwareCutter ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    mkdir $out
+    b43-fwcutter -w $out *.wl_apsta.o
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Firmware for cards supported by the b43 kernel module";
+    homepage = http://wireless.kernel.org/en/users/Drivers/b43;
+    downloadPage = http://www.lwfinger.com/b43-firmware;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/os-specific/linux/fusionio/srcs.nix b/pkgs/os-specific/linux/fusionio/srcs.nix
new file mode 100644
index 00000000000..fb632a6e9fb
--- /dev/null
+++ b/pkgs/os-specific/linux/fusionio/srcs.nix
@@ -0,0 +1,22 @@
+{ fetchurl }:
+rec {
+  version = "3.2.10";
+
+  libvsl = fetchurl {
+    name = "fusionio-libvsl-${version}.deb";
+    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2Wc01uNk1nVURMVFk";
+    sha256 = "1i8ii9dlyskj2dvad7nfvlm1wz2s4gy5llbl29hfa13w6nhcl5wk";
+  };
+
+  util = fetchurl {
+    name = "fusionio-util-${version}.deb";
+    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbDVuQkwzWjZONGs";
+    sha256 = "0aw64kk5cwchjhqh5n1lpqrrh5gn4qdalnmasd25z7sijy2flxgq";
+  };
+
+  vsl = fetchurl {
+    name = "fusionio-iomemory-vsl-${version}.tar.gz";
+    url = "https://drive.google.com/uc?export=download&id=0B7U0_ZBLoB2WbXFMbExEMUFCcWM";
+    sha256 = "1zm20aa1jmmqcqkb4p9r4jsgbg371zr1abdz32rw02i9687fsgcc";
+  };
+}
diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix
new file mode 100644
index 00000000000..16f1ef73dba
--- /dev/null
+++ b/pkgs/os-specific/linux/fusionio/util.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, dpkg, glibc, gcc, libuuid }:
+
+let
+  srcs = import ./srcs.nix { inherit fetchurl; };
+in
+stdenv.mkDerivation {
+  name = "fusionio-util-${srcs.version}";
+
+  nativeBuildInputs = [ dpkg ];
+
+  buildCommand = ''
+    dpkg-deb -R ${srcs.libvsl} $TMPDIR
+    dpkg-deb -R ${srcs.util} $TMPDIR
+
+    rm $TMPDIR/usr/bin/fio-{bugreport,sanitize}
+
+    mkdir -p $out
+    cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out
+    for BIN in $(find $out/bin -type f); do
+      echo Patching $BIN
+      patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN
+
+      # Test our binary to see if it was correctly patched
+      set +e
+      $BIN --help >/dev/null 2>&1
+      ST="$?"
+      set -e
+      if [ "$ST" -ge "10" ]; then
+        echo "Failed testing $BIN"
+        exit 1;
+      fi
+    done
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://fusionio.com;
+    description = "Fusionio command line utilities.";
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    broken = stdenv.system != "x86_64-linux";
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch b/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch
new file mode 100644
index 00000000000..25887ceee0f
--- /dev/null
+++ b/pkgs/os-specific/linux/fusionio/vsl-fix-file-inode.patch
@@ -0,0 +1,13 @@
+diff --git a/kfile.c b/kfile.c
+index 5014e77..a65d921 100644
+--- a/kfile.c
++++ b/kfile.c
+@@ -51,7 +51,7 @@ fusion_inode * noinline kfio_fs_inode(fusion_file *fp)
+ #if KFIOC_STRUCT_FILE_HAS_PATH
+     return (fusion_inode *) ((struct file *)fp)->f_path.dentry->d_inode;
+ #else
+-    return (fusion_inode *) ((struct file *)fp)->f_dentry->d_inode;
++    return (fusion_inode *) file_inode((struct file *)fp);
+ #endif
+ }
+ 
diff --git a/pkgs/os-specific/linux/fusionio/vsl.nix b/pkgs/os-specific/linux/fusionio/vsl.nix
new file mode 100644
index 00000000000..f3909950cb9
--- /dev/null
+++ b/pkgs/os-specific/linux/fusionio/vsl.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, kernel }:
+
+let
+  srcs = import ./srcs.nix { inherit fetchurl; };
+in
+stdenv.mkDerivation rec {
+  name = "fusionio-iomemory-vsl-${srcs.version}";
+
+  src = srcs.vsl;
+
+  prePatch = ''
+    cd root/usr/src/iomemory-vsl-*
+  '';
+
+  patches = stdenv.lib.optional (stdenv.lib.versionAtLeast kernel.version "3.19") ./vsl-fix-file-inode.patch;
+
+  preBuild = ''
+    sed -i Makefile kfio_config.sh \
+      -e "s,\(KERNELDIR=\"\|KERNEL_SRC =\)[^\"]*,\1${kernel.dev}/lib/modules/${kernel.modDirVersion}/build,g"
+    export DKMS_KERNEL_VERSION=${kernel.modDirVersion}
+    export TARGET="x86_64_cc48"
+  '';
+
+  installPhase = ''
+    export INSTALL_ROOT=$out
+    make modules_install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://fusionio.com;
+    description = "kernel driver for accessing fusion-io cards";
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+    broken = stdenv.system != "x86_64-linux";
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix
new file mode 100644
index 00000000000..1ac67f19917
--- /dev/null
+++ b/pkgs/os-specific/linux/hal-flash/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, autoconf, automake, dbus, glib, libtool, pkgconfig, udisks2 }:
+
+stdenv.mkDerivation {
+  name = "hal-flash-0.3.0";
+
+  src = fetchurl {
+    url = "https://github.com/cshorler/hal-flash/archive/v0.3.0.tar.gz";
+    sha256 = "163pqy39cca8cnf8rm8zr63ndsnr7rki9pf9j7dl9gyxmi7sx88s";
+  };
+
+  buildInputs = [ autoconf automake dbus glib libtool pkgconfig udisks2 ];
+
+  preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/cshorler/hal-flash;
+    description = "libhal stub library to satisfy the Flash Player DRM requirements.";
+    longDescription =
+      ''
+        Stub library based loosely upon libhal.[ch] from the hal-0.5.14
+        package.  Provides the minimum necessary functionality to enable
+        libflashplayer.so/libadobecp.so to play back DRM content.
+      '';
+    license = "afl21 gpl2";
+    maintainers = with maintainers; [ malyn ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 84535e8d25e..39982859712 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, libnl, openssl, pkgconfig }:
+{ stdenv, fetchurl, pkgconfig, libnl, openssl, sqlite ? null }:
 
+with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "hostapd-${version}";
   version = "2.4";
@@ -9,25 +10,57 @@ stdenv.mkDerivation rec {
     sha256 = "0zv5pnfrp6z7jjbskzgdb2rlmlbvdxmmis7ca94x5jy9s5mypq3g";
   };
 
-  buildInputs = [ libnl openssl pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libnl openssl sqlite ];
+
+  extraConfig = ''
+    CONFIG_DRIVER_WIRED=y
+    CONFIG_LIBNL32=y
+    CONFIG_EAP_SIM=y
+    CONFIG_EAP_AKA=y
+    CONFIG_EAP_AKA_PRIME=y
+    CONFIG_EAP_PAX=y
+    CONFIG_EAP_PWD=y
+    CONFIG_EAP_SAKE=y
+    CONFIG_EAP_GPSK=y
+    CONFIG_EAP_GPSK_SHA256=y
+    CONFIG_EAP_FAST=y
+    CONFIG_EAP_IKEV2=y
+    CONFIG_EAP_TNC=y
+    CONFIG_EAP_EKE=y
+    CONFIG_RADIUS_SERVER=y
+    CONFIG_IEEE80211R=y
+    CONFIG_IEEE80211N=y
+    CONFIG_IEEE80211AC=y
+    CONFIG_FULL_DYNAMIC_VLAN=y
+    CONFIG_VLAN_NETLINK=y
+    CONFIG_TLS=openssl
+    CONFIG_TLSV11=y
+    CONFIG_TLSV12=y
+    CONFIG_INTERNETWORKING=y
+    CONFIG_HS20=y
+    CONFIG_ACS=y
+  '' + optionalString (sqlite != null) ''
+    CONFIG_SQLITE=y
+  '';
 
   configurePhase = ''
     cd hostapd
-    substituteInPlace Makefile --replace "/usr/local/bin" "$out/bin"
-    mv defconfig .config
-    echo CONFIG_LIBNL32=y | tee -a .config
-    echo CONFIG_IEEE80211N=y | tee -a .config
+    cp -v defconfig .config
+    echo "$extraConfig" >> .config
+    cat -n .config
+    substituteInPlace Makefile --replace /usr/local $out
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags libnl-3.0)"
   '';
 
   preInstall = "mkdir -p $out/bin";
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = http://hostap.epitest.fi;
     repositories.git = git://w1.fi/hostap.git;
     description = "A user space daemon for access point and authentication servers";
     license = licenses.gpl2;
-    maintainers = [ maintainers.phreedom ];
+    maintainers = with maintainers; [ phreedom wkennington ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index b497784861f..7672318392f 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -1,40 +1,44 @@
-{ stdenv, fetchFromGitHub, freetype, imlib2, jbig2dec, libjpeg, libX11, mujs
-, mupdf, ncurses, openjpeg, openssl }:
+# FIXME: remove gcc49 when the default gcc supports C++1y
+{ stdenv, fetchFromGitHub, freetype, gcc49, imlib2, jbig2dec, libjpeg, libX11
+, mujs, mupdf, ncurses, openjpeg, openssl }:
 
+let
+  version = "0.5.1";
+  binaries = [ "jfbpdf" "jfbview" "jpdfcat" "jpdfgrep" ];
+in
 stdenv.mkDerivation rec {
-  version = "0.4.2"; # TODO: update to 0.5 or later when nixpkgs has caught up
   name = "jfbview-${version}";
 
   src = fetchFromGitHub {
+    sha256 = "113bkf49q04k9rjps5l28ychmzsfjajp9cjhr433s9ld0972z01m";
+    rev = version;
     repo = "JFBView";
     owner = "jichu4n";
-    rev = version;
-    sha256 = "1hhlzvs0jhygd3mqpzg5zymrbay9c8ilc4wjnwg00lvxhv3rwswr";
   };
 
-  buildInputs = [ freetype imlib2 jbig2dec libjpeg libX11 mujs mupdf ncurses
-    openjpeg openssl ];
+  buildInputs = [ freetype gcc49 imlib2 jbig2dec libjpeg libX11 mujs mupdf
+    ncurses openjpeg openssl ];
 
+  buildFlags = binaries;
   enableParallelBuilding = true;
 
-  makeFlags = "jfbpdf jfbview";
-
   installPhase = ''
     mkdir -p $out/bin
-    install jfbpdf jfbview $out/bin
+    install ${toString binaries} $out/bin
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "PDF and image viewer for the Linux framebuffer";
     longDescription = ''
-      PDF and image viewer for the Linux framebuffer. Very fast with a number
-      of advanced and unique features including:
-      - Reads PDFs (MuPDF) and common image formats (Imlib2).
-      - Supports arbitrary zoom (10% - 1000%) and rotation.
-      - Table of Contents (TOC) viewer for PDF documents.
-      - Multi-threaded rendering on multi-core machines.
-      - Asynchronous background rendering of the next page.
-      - Customizable multi-threaded caching.
+      A very fast PDF and image viewer for the Linux framebuffer with some
+      advanced and unique features, including:
+      - Reads PDFs (MuPDF) and common image formats (Imlib2)
+      - Supports arbitrary zoom (10% - 1000%) and rotation
+      - Table of Contents (TOC) viewer for PDF documents
+      - Multi-threaded rendering on multi-core machines
+      - Asynchronous background rendering of the next page
+      - Customizable multi-threaded caching
     '';
     homepage = http://seasonofcode.com/pages/jfbview.html;
     license = with licenses; asl20;
diff --git a/pkgs/os-specific/linux/kernel/grsec-path.patch b/pkgs/os-specific/linux/kernel/grsec-path.patch
index aaf7d80dc91..6f477c22b5e 100644
--- a/pkgs/os-specific/linux/kernel/grsec-path.patch
+++ b/pkgs/os-specific/linux/kernel/grsec-path.patch
@@ -1,18 +1,17 @@
 diff --git a/kernel/kmod.c b/kernel/kmod.c
-index a26e825..29baec1 100644
+index a689506..30747b4 100644
 --- a/kernel/kmod.c
 +++ b/kernel/kmod.c
-@@ -294,10 +294,9 @@ static int ____call_usermodehelper(void *data)
+@@ -294,10 +294,8 @@ static int ____call_usermodehelper(void *data)
  	   out the path to be used prior to this point and are now operating
  	   on that copy
  	*/
 -	if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
 -	     strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
--	     strncmp(sub_info->path, "/usr/libexec/", 13) &&
+-	     strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
 -	     strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
-+        if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) &&
-+             strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) ||
-+             strstr(sub_info->path, "..")) {
- 		printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of /sbin and system library paths\n", sub_info->path);
++	if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/nix/store/", 11) &&
++	     strncmp(sub_info->path, "/run/current-system/systemd/lib/", 32)) || strstr(sub_info->path, "..")) {
+ 		printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
  		retval = -EPERM;
  		goto out;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 853b784a335..ff9f2f38243 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.73";
+  version = "3.10.75";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0xy8738sdbw7lbqwkmbhr2zghva5nyfqq163r6jmjr6cfw116kin";
+    sha256 = "00wqcmya2ky9f1djlq99mcq8fyvpabnjnp5cn61japlgk8p7r60q";
   };
 
   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 951b55c2f35..bd8c7d99daa 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.39";
+  version = "3.12.40";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0svd2rnkrzpmnrv5qd5vfz4wkff6973s68zg5a1blmjs4p5asvl6";
+    sha256 = "1cdivv1n0r057y2wq38ci00im8z24jrnvyz5vwhmnzv0l4qzbhw5";
   };
 
   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 8289235cd6e..188eb6f699c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,22 +1,15 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.37";
+  version = "3.14.39";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1pq4i97vys38rl8ylx4s08qgh9yz3cl840j1f70yzakmc2017byc";
+    sha256 = "0zgfiqlvmprbn55k9ijf6db027mxlcww76y47g4g7vcj5qrpq6rd";
   };
 
-  # FIXME: remove with the next point release.
-  kernelPatches = args.kernelPatches ++
-    [ { name = "btrfs-fix-deadlock";
-        patch = ./btrfs-fix-deadlock.patch;
-      }
-    ];
-
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 8f1d9bd2765..aabeee6302f 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.11";
+  version = "3.18.12";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "19di7k38adnwimxddd1v6flgdsvxhgf8iswjwfyqi2p2bdcb0p5d";
+    sha256 = "06wfgg00vc5a2vvmg158ipbmigx803hdp3lhf4kv25p4sdmvbsl2";
   };
 
   # FIXME: remove with the next point release.
diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix
index e42775f0356..79302819d7c 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix
@@ -1,22 +1,15 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.19.3";
+  version = "3.19.5";
   # Remember to update grsecurity!
   extraMeta.branch = "3.19";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0nis1r9fg562ysirzlyvfxvirpcfhxhhpfv3s13ccz20qiqiy46f";
+    sha256 = "0s2yiyk1ks0z2fj8a8g56hkp6mfyvh9c34m1jpixhg9zck9xjdix";
   };
 
-  # FIXME: remove with the next point release.
-  kernelPatches = args.kernelPatches ++
-    [ { name = "btrfs-fix-deadlock";
-        patch = ./btrfs-fix-deadlock.patch;
-      }
-    ];
-
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix
index 2d053023721..eaf5bfad6d8 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.4.106";
+  version = "3.4.107";
   extraMeta.branch = "3.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1l1k2kmlz0j12ly63w3mhvdzp5fpc22ajda4kw66fyjx96npm8sc";
+    sha256 = "1y3mxisdcnz3kj416bpnnn9cn3wqqjqvcjadhylc1wypqkpcvphq";
   };
 
   kernelPatches = args.kernelPatches ++
diff --git a/pkgs/os-specific/linux/kernel/linux-4.0.nix b/pkgs/os-specific/linux/kernel/linux-4.0.nix
new file mode 100644
index 00000000000..b63aa7e9932
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.0.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "4.0";
+  modDirVersion = "4.0.0";
+  extraMeta.branch = "4.0";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "14argl6ywkggdvgiycfx4jl2d7290f631ly59wfggj4vjx27sbqg";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index ea29c7f9e0c..620df6dd6cf 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -116,7 +116,9 @@ let
       ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware";
 
       # Some image types need special install targets (e.g. uImage is installed with make uinstall)
-      installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else "install") ];
+      installTargets = [ (if platform.kernelTarget == "uImage" then "uinstall" else
+                          if platform.kernelTarget == "zImage" then "zinstall" else
+                          "install") ];
 
       postInstall = (optionalString installsFirmware ''
         mkdir -p $out/lib/firmware
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 0b17c44be98..998717b1f5d 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.37";
-      revision  = "201504051405";
+    { kversion  = "3.14.39";
+      revision  = "201504190814";
       branch    = "stable";
-      sha256    = "0w1rz5g4wwd22ivii7m7qjgakdynzjwpqxiydx51kiw5j0avkzs3";
+      sha256    = "0pjq0ggifh6hp5y62dl0ydskpmsmzj1cxxjaaqs6fpwn5ndsdji7";
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "3.19.3";
-      revision  = "201504021826";
+    { kversion  = "3.19.5";
+      revision  = "201504190814";
       branch    = "test";
-      sha256    = "0r3gsha4x9bkzg9n4rcwzi9f3hkbqrf8yga1dd83kyd10fns4lzm";
+      sha256    = "0wj9bximhs41b11hh113mishmc1ya8bncc0v91cbrivx5y5hjpz0";
     };
 
   grsec_fix_path =
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 09594a5c59e..f26c72bd6e5 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "kexec-tools-2.0.4";
+  name = "kexec-tools-2.0.9";
 
   src = fetchurl {
     url = "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz";
-    sha256 = "1ikqm4w125h060dsvg9brri6ma51qn76mjjff6s1bss6sw0apxg5";
+    sha256 = "0wag8pxn13i0j91x2bszpmi5i88xnndcmqz1w5a0jdbnxff4mqwa";
   };
 
   buildInputs = [ zlib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
index 686f63720fc..c750006fcd2 100644
--- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
+++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "kmod-blacklist-${version}";
 
   src = fetchurl {
-    url = "http://archive.ubuntu.com/ubuntu/pool/main/k/kmod/kmod_9-${version}.debian.tar.gz";
+    url = "https://launchpad.net/ubuntu/+archive/primary/+files/kmod_9-${version}.debian.tar.gz";
     sha256 = "0h6h0zw2490iqj9xa2sz4309jyfmcc50jdvkhxa1nw90npxglp67";
   };
 
diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix
index 6323d8c4f23..b51211e9aaf 100644
--- a/pkgs/os-specific/linux/libcgroup/default.nix
+++ b/pkgs/os-specific/linux/libcgroup/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, pam, yacc, flex }:
 
 stdenv.mkDerivation rec {
-  name = "libcgroup-0.38";
+  name    = "libcgroup-${version}";
+  version = "0.41";
 
   src = fetchurl {
     url = "mirror://sourceforge/libcg/${name}.tar.bz2";
-    sha256 = "0zw6144jlvzx0hasl4b07vjfa4lm12jaax6zzkljzxlmifjd2djx";
+    sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";
   };
 
-  buildInputs = [ pam ];
-
-  nativeBuildInputs = [ yacc flex ];
+  buildInputs = [ pam yacc flex ];
 
   meta = {
-    description = "Library and tools to manage Linux's cgroup resource management system";
-    homepage = http://libcg.sourceforge.net/;
-    license = "LGPL";
-    platforms = stdenv.lib.platforms.linux;
+    description = "Library and tools to manage Linux cgroups";
+    homepage    = "http://libcg.sourceforge.net/";
+    license     = stdenv.lib.licenses.lgpl2;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 463722d2c96..342e29a6d2e 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,37 +1,30 @@
-{ stdenv, fetchgit }:
-
-# Shows the machine check exceptions logged by the kernel.
-# E.g. a log is generated when intel processors cpu-throttle.
-
-# The releases of this package are no longer on kernel.org
-# hence we fetch them from github. Apparently, these
-# are also more recent.
-
-let
-
-  rev = "7fa99818367a6d17014b36d6f918ad848cbe7ce2";
-  version = "1.0pre-${stdenv.lib.strings.substring 0 7 rev}"; 
-  sha256 = "15eea3acd76190c7922c71028b31963221a2eefd8afa713879e191a26bc22ae7";
-
-in stdenv.mkDerivation {
+{ stdenv, fetchFromGitHub }:
 
+let version = "116"; in
+stdenv.mkDerivation {
   name = "mcelog-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/andikleen/mcelog";
-    inherit sha256;
-    inherit rev;
+  src = fetchFromGitHub {
+    sha256 = "0nr3b924ardz9c1skna8finrjq22ac2vihp3zck9jixc9d5mvrmf";
+    rev = "v${version}";
+    repo = "mcelog";
+    owner = "andikleen";
   };
 
-  makeFlags = "prefix=$(out) etcprefix=$(out) DOCDIR=$(out)/share/doc";
-
-  preInstall = ''
-    mkdir -p $out/share/doc
+  postPatch = ''
+    for i in mcelog.conf paths.h; do
+      substituteInPlace $i --replace /etc $out/etc
+    done
+    touch mcelog.conf.5 # avoid regeneration requiring Python
   '';
 
-  meta = {
-    description = "Tool to display logged machine check exceptions";
+  installFlags = "DESTDIR=$(out) prefix= DOCDIR=/share/doc";
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Log machine checks (memory, IO, and CPU hardware errors)";
     homepage = http://mcelog.org/;
-    license = stdenv.lib.licenses.gpl2;
+    license = with licenses; gpl2;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix
index b9240805865..d895a960010 100644
--- a/pkgs/os-specific/linux/numactl/default.nix
+++ b/pkgs/os-specific/linux/numactl/default.nix
@@ -1,26 +1,20 @@
-{ fetchurl, stdenv }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "numactl-1.0.2";
+  name = "numactl-2.0.10";
+
   src = fetchurl {
     url = "ftp://oss.sgi.com/www/projects/libnuma/download/${name}.tar.gz";
-    sha256 = "0hbrrh7a8cradj1xdl3wvyp9afx1hzsk90g2lkwd5pn6bniai31j";
+    sha256 = "0qfv2ks6d3gm0mw5sj4cbhsd7cbsb7qm58xvchl2wfzifkzcinnv";
   };
 
-  patchPhase = ''
-    sed -i "Makefile" -es"|^ *prefix *:=.*$|prefix := $out|g"
-  '';
-
-  preInstall = ''
-    # The `install' rule expects this directory to be available.
-    mkdir -p "$out/share/man/man5"
-  '';
+  nativeBuildInputs = [ autoreconfHook ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Library and tools for non-uniform memory access (NUMA) machines";
-    license = [ "LGPLv2.1" # library
-                "GPLv2"    # command-line tools
-	      ];
     homepage = http://oss.sgi.com/projects/libnuma/;
+    license = licenses.gpl2;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix
new file mode 100644
index 00000000000..b2d85376c6a
--- /dev/null
+++ b/pkgs/os-specific/linux/schedtool/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "schedtool-1.3.0";
+
+  src = fetchurl {
+    url = "http://freequaos.host.sk/schedtool/${name}.tar.bz2";
+    sha256 = "1ky8q3jg4lsxbnlmm51q3jkxh160zy0l6a4xkdy2yncxc4m2l02f";
+  };
+
+  makeFlags = [ "DESTDIR=$(out)" "DESTPREFIX=" ];
+
+  meta = with stdenv.lib; {
+    description = "Query or alter a process' scheduling policy under Linux";
+    homepage = "http://freequaos.host.sk/schedtool/";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 4b322be0a7e..baa76d96937 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
-, glib, kbd, libxslt, coreutils, libgcrypt, sysvtools
+, glib, kbd, libxslt, coreutils, libgcrypt
 , kexectools, libmicrohttpd, linuxHeaders
 , pythonPackages ? null, pythonSupport ? false
 }:
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
           --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
           --replace /bin/echo ${coreutils}/bin/echo \
           --replace /bin/cat ${coreutils}/bin/cat \
-          --replace /sbin/sulogin ${sysvtools}/sbin/sulogin \
+          --replace /sbin/sulogin ${utillinux}/sbin/sulogin \
           --replace /sbin/kexec ${kexectools}/sbin/kexec
       done
 
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
new file mode 100644
index 00000000000..1a22d094867
--- /dev/null
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, asciidoc, docbook_xsl, libxslt }:
+
+stdenv.mkDerivation rec {
+  name    = "trace-cmd-${version}";
+  version = "2.5.3";
+
+  src = fetchgit {
+    url    = "git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git";
+    rev    = "refs/tags/trace-cmd-v${version}";
+    sha256 = "32db3df07d0371c2b072029c6c86c4204be8cbbcb53840fa8c42dbf2e35c047b";
+  };
+
+  buildInputs = [ asciidoc libxslt ];
+
+  configurePhase = "true";
+  buildPhase     = "make prefix=$out MANPAGE_DOCBOOK_XSL=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl all doc";
+  installPhase   = "make prefix=$out install install_doc";
+
+  meta = {
+    description = "user-space tools for the Linux kernel ftrace subsystem";
+    license     = stdenv.lib.licenses.gpl2;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+  };
+}
diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix
new file mode 100644
index 00000000000..9b7e2a6876a
--- /dev/null
+++ b/pkgs/os-specific/linux/trinity/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "trinity-${version}";
+  version = "1.5";
+
+  src = fetchFromGitHub {
+    owner = "kernelslacker";
+    repo = "trinity";
+    rev = "v${version}";
+    sha256 = "0diwkda6n7yw8plfanivncwangk2kv1acxv0kyk3ly5jhlajwc0s";
+  };
+
+  patchPhase = ''
+    patchShebangs ./configure.sh
+    patchShebangs ./scripts/
+    substituteInPlace Makefile --replace '/usr/bin/wc' 'wc'
+  '';
+
+  configurePhase = "./configure.sh";
+
+  installPhase = "make DESTDIR=$out install";
+
+  meta = with stdenv.lib; {
+    description = "A Linux System call fuzz tester";
+    homepage = http://codemonkey.org.uk/projects/trinity/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix
index f7e0c5ca5e2..0ef992a4b44 100644
--- a/pkgs/os-specific/linux/v86d/default.nix
+++ b/pkgs/os-specific/linux/v86d/default.nix
@@ -1,32 +1,38 @@
-{stdenv, fetchurl, klibc, kernel, withKlibc ? true}:
+{ stdenv, fetchurl
+, kernel, klibc
+}:
 
 stdenv.mkDerivation rec {
   name = "v86d-${version}-${kernel.version}";
   version = "0.1.10";
 
   src = fetchurl {
-    url = "mirror://gentoo/distfiles//v86d-${version}.tar.bz2";
-    sha256 = "0p3kwqjis941pns9948dxfnjnl5lwd8f2b6x794whs7g32p68jb3";
+    url = "https://github.com/mjanusz/v86d/archive/v86d-${version}.tar.gz";
+    sha256 = "1flnpp8rc945cxr6jr9dlm8mi8gr181zrp2say4269602s1a4ymg";
   };
 
-  buildInputs = stdenv.lib.optional withKlibc klibc;
-
-  configurePhase = ''
-    bash ./configure $configureFlags
+  patchPhase = ''
+    patchShebangs configure
   '';
 
-  configureFlags = if withKlibc then [ "--with-klibc" ] else [ "--default" ];
+  configureFlags = [ "--with-klibc" "--with-x86emu" ];
 
   makeFlags = [
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
     "DESTDIR=$(out)"
   ];
 
-  meta = {
-    description = "A userspace helper that runs x86 code in an emulated environment";
-    homepage = http://dev.gentoo.org/~spock/projects/uvesafb/;
-    license = stdenv.lib.licenses.gpl2;
+  configurePhase = ''
+    ./configure $configureFlags
+  '';
+
+  buildInputs = [ klibc ];
+
+  meta = with stdenv.lib; {
+    description = "A daemon to run x86 code in an emulated environment";
+    homepage = https://github.com/mjanusz/v86d;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ codyopel ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
-
diff --git a/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
new file mode 100644
index 00000000000..de1964ca769
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
@@ -0,0 +1,42 @@
+From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
+From: Jouni Malinen <jouni@qca.qualcomm.com>
+Date: Tue, 7 Apr 2015 11:32:11 +0300
+Subject: [PATCH] P2P: Validate SSID element length before copying it
+ (CVE-2015-1863)
+
+This fixes a possible memcpy overflow for P2P dev->oper_ssid in
+p2p_add_device(). The length provided by the peer device (0..255 bytes)
+was used without proper bounds checking and that could have resulted in
+arbitrary data of up to 223 bytes being written beyond the end of the
+dev->oper_ssid[] array (of which about 150 bytes would be beyond the
+heap allocation) when processing a corrupted management frame for P2P
+peer discovery purposes.
+
+This could result in corrupted state in heap, unexpected program
+behavior due to corrupted P2P peer device information, denial of service
+due to process crash, exposure of memory contents during GO Negotiation,
+and potentially arbitrary code execution.
+
+Thanks to Google security team for reporting this issue and smart
+hardware research group of Alibaba security team for discovering it.
+
+Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
+---
+ src/p2p/p2p.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
+index f584fae..a45fe73 100644
+--- a/src/p2p/p2p.c
++++ b/src/p2p/p2p.c
+@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
+ 	if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
+ 		os_memcpy(dev->interface_addr, addr, ETH_ALEN);
+ 	if (msg.ssid &&
++	    msg.ssid[1] <= sizeof(dev->oper_ssid) &&
+ 	    (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
+ 	     os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
+ 	     != 0)) {
+-- 
+1.9.1
+
diff --git a/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch b/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch
new file mode 100644
index 00000000000..a186cdad969
--- /dev/null
+++ b/pkgs/os-specific/linux/wpa_supplicant/build-fix.patch
@@ -0,0 +1,12 @@
+diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
+index 0f82af9..70564ff 100644
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -1558,6 +1558,7 @@ OBJS += $(CONFIG_MAIN).o
+ ifdef CONFIG_PRIVSEP
+ OBJS_priv += $(OBJS_d) ../src/drivers/drivers.o
+ OBJS_priv += $(OBJS_l2)
++OBJS_priv += ../src/crypto/crypto_openssl.o
+ OBJS_priv += ../src/utils/os_$(CONFIG_OS).o
+ OBJS_priv += ../src/utils/$(CONFIG_ELOOP).o
+ OBJS_priv += ../src/utils/common.o
diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix
index 988242e3c42..f6142bd630f 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix
@@ -1,47 +1,91 @@
-{ stdenv, fetchurl, lib, openssl, dbus_libs, pkgconfig, libnl
-, readlineSupport ? true, readline
+{ stdenv, fetchurl, lib, openssl, pkgconfig, libnl
+, dbus_libs ? null, readline ? null, pcsclite ? null
 }:
 
-assert readlineSupport -> readline != null;
-
+with stdenv.lib;
 stdenv.mkDerivation rec {
-  version = "2.3";
+  version = "2.4";
 
   name = "wpa_supplicant-${version}";
 
   src = fetchurl {
     url = "http://hostap.epitest.fi/releases/${name}.tar.gz";
-    sha256 = "0skvkl6c10ls4s48b2wmf47h9j1y40nlzxnzn8hyaw2j0prmpapa";
+    sha256 = "08li21q1wjn5chrv289w666il9ah1w419y3dkq2rl4wnq0rci385";
   };
 
-  extraConfig =
-    ''
-      CONFIG_DEBUG_SYSLOG=y
-      CONFIG_CTRL_IFACE_DBUS=y
-      CONFIG_CTRL_IFACE_DBUS_NEW=y
-      CONFIG_CTRL_IFACE_DBUS_INTRO=y
-      CONFIG_DRIVER_NL80211=y
-      CONFIG_LIBNL32=y
-      ${stdenv.lib.optionalString readlineSupport "CONFIG_READLINE=y"}
-    '';
+  # TODO: Patch epoll so that the dbus actually responds
+  # TODO: Figure out how to get privsep working, currently getting SIGBUS
+  extraConfig = ''
+    CONFIG_LIBNL32=y
+    CONFIG_EAP_FAST=y
+    CONFIG_EAP_PWD=y
+    CONFIG_EAP_PAX=y
+    CONFIG_EAP_SAKE=y
+    CONFIG_EAP_GPSK=y
+    CONFIG_EAP_GPSK_SHA256=y
+    CONFIG_WPS=y
+    CONFIG_WPS_ER=y
+    CONFIG_WPS_NFS=y
+    CONFIG_EAP_IKEV2=y
+    CONFIG_EAP_EKE=y
+    CONFIG_HT_OVERRIDES=y
+    CONFIG_VHT_OVERRIDES=y
+    CONFIG_ELOOP=eloop
+    #CONFIG_ELOOP_EPOLL=y
+    CONFIG_L2_PACKET=linux
+    CONFIG_IEEE80211W=y
+    CONFIG_TLS=openssl
+    CONFIG_TLSV11=y
+    CONFIG_TLSV12=y
+    CONFIG_IEEE80211R=y
+    CONFIG_DEBUG_SYSLOG=y
+    #CONFIG_PRIVSEP=y
+    CONFIG_IEEE80211N=y
+    CONFIG_IEEE80211AC=y
+    CONFIG_INTERNETWORKING=y
+    CONFIG_HS20=y
+    CONFIG_P2P=y
+    CONFIG_TDLS=y
+  '' + optionalString (pcsclite != null) ''
+    CONFIG_EAP_SIM=y
+    CONFIG_EAP_AKA=y
+    CONFIG_EAP_AKA_PRIME=y
+    CONFIG_PCSC=y
+  '' + optionalString (dbus_libs != null) ''
+    CONFIG_CTRL_IFACE_DBUS=y
+    CONFIG_CTRL_IFACE_DBUS_NEW=y
+    CONFIG_CTRL_IFACE_DBUS_INTRO=y
+  '' + (if readline != null then ''
+    CONFIG_READLINE=y
+  '' else ''
+    CONFIG_WPA_CLI_EDIT=y
+  '');
 
   preBuild = ''
     cd wpa_supplicant
     cp -v defconfig .config
     echo "$extraConfig" >> .config
-    cat .config
+    cat -n .config
     substituteInPlace Makefile --replace /usr/local $out
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo "${libnl}"/include/libnl*/)"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE \
+      -I$(echo "${libnl}"/include/libnl*/) \
+      -I${pcsclite}/include/PCSC/"
   '';
 
-  buildInputs = [ openssl dbus_libs libnl ]
-    ++ lib.optional readlineSupport readline;
+  buildInputs = [ openssl libnl dbus_libs readline pcsclite ];
 
   nativeBuildInputs = [ pkgconfig ];
 
-  patches = [];
+  patches = [
+    ./0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
+    ./build-fix.patch
+  ];
 
   postInstall = ''
+    # Copy the wpa_priv binary which is not installed
+    mkdir -p $out/bin
+    cp -v wpa_priv $out/bin
+
     mkdir -p $out/share/man/man5 $out/share/man/man8
     cp -v "doc/docbook/"*.5 $out/share/man/man5/
     cp -v "doc/docbook/"*.8 $out/share/man/man8/
@@ -52,10 +96,11 @@ stdenv.mkDerivation rec {
     cp -v "systemd/"*.service $out/etc/systemd/system
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://hostap.epitest.fi/wpa_supplicant/;
     description = "A tool for connecting to WPA and WPA2-protected wireless networks";
-    maintainers = with stdenv.lib.maintainers; [marcweber urkud];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ marcweber urkud wkennington ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
index 5242aabe507..a3d5aeeb40f 100644
--- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix
@@ -3,11 +3,11 @@
 , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }:
 
 stdenv.mkDerivation rec {
-  name = "xf86-input-wacom-0.28.0";
+  name = "xf86-input-wacom-0.29.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2";
-    sha256 = "0fr4ssdam8nxkahznqril8q2pbakb4r9ghhg61yl7997yy7006bw";
+    sha256 = "15lbzjkaf690i69qy0n0ibwczbclqq1nx0418c6a567by5v7wl48";
   };
 
   buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index ba3884a5e9b..9a97bef22bb 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -77,6 +77,9 @@ stdenv.mkDerivation rec {
     for i in $out/etc/systemd/system/*; do
       substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"
     done
+
+    # Fix pkgconfig
+    ln -s ../share/pkgconfig $out/lib/pkgconfig
   '';
 
   meta = {
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index f3d0a43c4cf..06f8c513063 100755
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     # allow us the specify logging directory using env
     substituteInPlace $out/bin/kafka-run-class.sh \
-      --replace 'LOG_DIR=$base_dir/logs' 'LOG_DIR=$KAFKA_LOG_DIR'
+      --replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"'
 
     for p in $out/bin\/*.sh; do
       wrapProgram $p \
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
new file mode 100644
index 00000000000..c37292d385f
--- /dev/null
+++ b/pkgs/servers/asterisk/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, fetchgit, jansson, libxml2, libxslt, ncurses, openssl, sqlite, utillinux }:
+
+stdenv.mkDerivation rec {
+  name = "asterisk-${version}";
+  version = "13.3.2";
+
+  src = fetchurl {
+    url = "http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-${version}.tar.gz";
+    sha256 = "19dafvy6ch4v8949bjim64fff456k78156m30dy2yvhm94m5k1zz";
+  };
+
+  # Note that these sounds are included with the release tarball. They are
+  # provided here verbatim for the convenience of anyone wanting to build
+  # Asterisk from other sources.
+  coreSounds = fetchurl {
+    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.4.26.tar.gz;
+    sha256 = "2300e3ed1d2ded6808a30a6ba71191e7784710613a5431afebbd0162eb4d5d73";
+  };
+  mohSounds = fetchurl {
+    url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz;
+    sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538";
+  };
+  # TODO: Sounds for other languages could be added here
+
+  buildInputs = [ jansson libxml2 libxslt ncurses openssl sqlite utillinux ];
+
+  patches = [
+    # Disable downloading of sound files (we will fetch them
+    # ourselves if needed).
+    ./disable-download.patch
+
+    # We want the Makefile to install the default /var skeleton
+    # under ${out}/var but we also want to use /var at runtime.
+    # This patch changes the runtime behavior to look for state
+    # directories in /var rather than ${out}/var.
+    ./runtime-vardirs.patch
+  ];
+
+  # Use the following preConfigure section when building Asterisk from sources
+  # other than the release tarball.
+#   preConfigure = ''
+#     ln -s ${coreSounds} sounds/asterisk-core-sounds-en-gsm-1.4.26.tar.gz
+#     ln -s ${mohSounds} sounds/asterisk-moh-opsound-wav-2.03.tar.gz
+#   '';
+
+  # The default libdir is $PREFIX/usr/lib, which causes problems when paths
+  # compiled into Asterisk expect ${out}/usr/lib rather than ${out}/lib.
+  configureFlags = "--libdir=\${out}/lib";
+
+  postInstall = ''
+    # Install sample configuration files for this version of Asterisk
+    make samples
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Software implementation of a telephone private branch exchange (PBX)";
+    homepage = http://www.asterisk.org/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ auntie ];
+  };
+}
diff --git a/pkgs/servers/asterisk/disable-download.patch b/pkgs/servers/asterisk/disable-download.patch
new file mode 100644
index 00000000000..8b15ecdfaaa
--- /dev/null
+++ b/pkgs/servers/asterisk/disable-download.patch
@@ -0,0 +1,12 @@
+diff -ruN asterisk-13.2.0/sounds/Makefile asterisk-13.2.0-patched/sounds/Makefile
+--- asterisk-13.2.0/sounds/Makefile	2014-09-09 14:01:11.000000000 -0600
++++ asterisk-13.2.0-patched/sounds/Makefile	2015-03-31 16:12:00.549133670 -0600
+@@ -89,7 +89,7 @@
+ 	  ) && touch "$(1)$(if $(3),/$(3),)/$$@"; \
+ 	fi
+ 
+-asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz: have_download
++asterisk-$(2)$(if $(3),-$(3),)-%.tar.gz:
+ ifneq ($(SOUNDS_CACHE_DIR),)
+ 	$(CMD_PREFIX) \
+ 	if test ! -f "$(1)$(if $(3),/$(3),)/.$$(subst .tar.gz,,$$@)"; then \
diff --git a/pkgs/servers/asterisk/runtime-vardirs.patch b/pkgs/servers/asterisk/runtime-vardirs.patch
new file mode 100644
index 00000000000..dfc00186d13
--- /dev/null
+++ b/pkgs/servers/asterisk/runtime-vardirs.patch
@@ -0,0 +1,50 @@
+diff -rupN asterisk-13.3.2/build_tools/make_defaults_h asterisk-13.3.2-patched/build_tools/make_defaults_h
+--- asterisk-13.3.2/build_tools/make_defaults_h	2012-01-30 14:21:16.000000000 -0700
++++ asterisk-13.3.2-patched/build_tools/make_defaults_h	2015-04-15 19:07:46.760351155 -0600
+@@ -1,4 +1,13 @@
+ #!/bin/sh
++
++ASTLOGDIR=/var/log/asterisk
++ASTVARRUNDIR=/var/run/asterisk
++ASTVARLIBDIR=/var/lib/asterisk
++ASTDBDIR=${ASTVARLIBDIR}
++ASTDATADIR=${ASTVARLIBDIR}
++AGI_DIR=${ASTDATADIR}/agi-bin
++ASTSPOOLDIR=/var/spool/asterisk
++
+ cat << END
+ /*
+  * defaults.h 
+@@ -9,21 +18,21 @@ cat << END
+ 
+ #define DEFAULT_CONFIG_DIR "${INSTALL_PATH}${ASTETCDIR}"
+ #define DEFAULT_MODULE_DIR "${INSTALL_PATH}${ASTMODDIR}"
+-#define DEFAULT_AGI_DIR    "${INSTALL_PATH}${AGI_DIR}"
+-#define DEFAULT_LOG_DIR    "${INSTALL_PATH}${ASTLOGDIR}"
++#define DEFAULT_AGI_DIR    "${AGI_DIR}"
++#define DEFAULT_LOG_DIR    "${ASTLOGDIR}"
+ 
+-#define DEFAULT_RUN_DIR    "${INSTALL_PATH}${ASTVARRUNDIR}"
+-#define DEFAULT_SOCKET     "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.ctl"
+-#define DEFAULT_PID        "${INSTALL_PATH}${ASTVARRUNDIR}/asterisk.pid"
++#define DEFAULT_RUN_DIR    "${ASTVARRUNDIR}"
++#define DEFAULT_SOCKET     "${ASTVARRUNDIR}/asterisk.ctl"
++#define DEFAULT_PID        "${ASTVARRUNDIR}/asterisk.pid"
+ 
+-#define DEFAULT_VAR_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}"
+-#define DEFAULT_DB         "${INSTALL_PATH}${ASTDBDIR}/astdb"
++#define DEFAULT_VAR_DIR    "${ASTVARLIBDIR}"
++#define DEFAULT_DB         "${ASTDBDIR}/astdb"
+ 
+-#define DEFAULT_DATA_DIR   "${INSTALL_PATH}${ASTDATADIR}"
+-#define DEFAULT_KEY_DIR    "${INSTALL_PATH}${ASTDATADIR}/keys"
++#define DEFAULT_DATA_DIR   "${ASTDATADIR}"
++#define DEFAULT_KEY_DIR    "${ASTDATADIR}/keys"
+ 
+-#define DEFAULT_SPOOL_DIR  "${INSTALL_PATH}${ASTSPOOLDIR}"
+-#define DEFAULT_TMP_DIR    "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
++#define DEFAULT_SPOOL_DIR  "${ASTSPOOLDIR}"
++#define DEFAULT_TMP_DIR    "${ASTSPOOLDIR}/tmp"
+ 
+ #define DEFAULT_SBIN_DIR   "${INSTALL_PATH}${ASTSBINDIR}"
+ END
diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix
new file mode 100644
index 00000000000..6536ad972b7
--- /dev/null
+++ b/pkgs/servers/dns/skydns/default.nix
@@ -0,0 +1,30 @@
+{ lib, goPackages, fetchFromGitHub, etcd }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "skydns-${version}";
+  version = "2.1.0a";
+
+  goPackagePath = "github.com/skynetservices/skydns";
+
+  src = fetchFromGitHub {
+    owner = "skynetservices";
+    repo = "skydns";
+    rev = "f5141ee69309fb4c542d5a0b50fc7616370c5c06";
+    sha256 = "1bnc9r22kwvmn1bgz7zaidkjqm7pmw99bn5n87r76vcrd7n2a9pd";
+  };
+
+  buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb-go go-systemd go-log dns stathat osext etcd ];
+  dontInstallSrc = true;
+
+  subPackages = [ "." ];
+
+  meta = with lib; {
+    description = "DNS service discovery for etcd";
+    homepage = https://github.com/skynetservices/skydns;
+    license = licenses.mit;
+    maintainers = with maintainers; [ offline ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index abec19663ff..89ea70d46c5 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -15,8 +15,6 @@ buildGoPackage rec {
 
   subPackages = [ "./" ];
 
-  dontInstallSrc = true;
-
   meta = with lib; {
     description = "A highly-available key value store for shared configuration and service discovery";
     homepage = http://coreos.com/using-coreos/etcd/;
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 456580cc199..fe500bf3462 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -7,22 +7,23 @@
 , echo ? false
 , ngx_lua ? false
 , set_misc ? false
+, fluent ? false
 }:
 
 with stdenv.lib;
 
 let
-  version = "1.6.3";
+  version = "1.8.0";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "0mz7nx1ffw4f024yb4w9kpjd33z1f16zmq9iyd160kbf6rdyk60a";
+    sha256 = "1mgkkmmwkhmpn68sdvbd73ssv6lpqhh864fsyvc1ij4hk4is3k13";
   };
 
   rtmp-ext = fetchFromGitHub {
     owner = "arut";
     repo = "nginx-rtmp-module";
-    rev = "v1.1.5";
-    sha256 = "1d9ws4prxz22yq3nhh5h18jrs331zivrdh784l6wznc1chg3gphn";
+    rev = "v1.1.7";
+    sha256 = "0i0fa1znkj7cipy5nlkw4k40klhp9jzk28wxy2vrvd2jvh91x3ma";
   };
 
   dav-ext = fetchFromGitHub {
@@ -42,38 +43,46 @@ let
   moreheaders-ext = fetchFromGitHub {
     owner = "openresty";
     repo = "headers-more-nginx-module";
-    rev = "v0.25";
-    sha256 = "1d71y1i0smi4gkzz731fhn58gr03b3s6jz6ipnfzxxaizmgxm3rb";
+    rev = "v0.26";
+    sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn";
   };
 
   echo-ext = fetchFromGitHub {
     owner = "openresty";
     repo = "echo-nginx-module";
-    rev = "v0.56";
-    sha256 = "03vaf1ffhkj2s089f90h45n079h3zw47h6y5zpk752f4ydiagpgd";
-  };
-
-  develkit-ext = fetchFromGitHub {
-    owner = "simpl";
-    repo = "ngx_devel_kit";
-    rev = "v0.2.19";
-    sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
+    rev = "v0.57";
+    sha256 = "1q0f0zprcn0ypl2qh964cq186l3f40p0z7n7x22m8cxj367vf000";
   };
 
   lua-ext = fetchFromGitHub {
     owner = "openresty";
     repo = "lua-nginx-module";
-    rev = "v0.9.12";
-    sha256 = "0r07q1n3nvi7m3l8zk7nfk0z9kjhqknav61ys9lshh2ylsmz1lf4";
+    rev = "v0.9.15";
+    sha256 = "0kicfs0gyfb5fhjmrwr6p09c5x6g0jwsh0wg5bsp3p209rnbq94q";
   };
 
   set-misc-ext = fetchFromGitHub {
     owner = "openresty";
     repo = "set-misc-nginx-module";
-    rev = "v0.27";
-    sha256 = "1bd1isacsiay73nc2jlp0wky32l42a3sjskvfa1082l12g0p1x39";
+    rev = "v0.28";
+    sha256 = "1vixj60q0liri7k5ax85grj7q9vvgybkx421bwphbhai5xrjip96";
   };
 
+  fluentd = fetchFromGitHub {
+    owner = "fluent";
+    repo = "nginx-fluentd-module";
+    rev = "8af234043059c857be27879bc547c141eafd5c13";
+    sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm";
+  };
+
+  develkit-ext = fetchFromGitHub {
+    owner = "simpl";
+    repo = "ngx_devel_kit";
+    rev = "v0.2.19";
+    sha256 = "1cqcasp4lc6yq5pihfcdw4vp4wicngvdc3nqg3bg52r63c1qrz76";
+  };
+
+
 in
 
 stdenv.mkDerivation rec {
@@ -91,6 +100,11 @@ stdenv.mkDerivation rec {
   patches = if syslog then [ "${syslog-ext}/syslog-1.5.6.patch" ] else [];
 
   configureFlags = [
+    "--with-select_module"
+    "--with-poll_module"
+    "--with-aio_module"
+    "--with-threads"
+    "--with-file-aio"
     "--with-http_ssl_module"
     "--with-http_spdy_module"
     "--with-http_realip_module"
@@ -119,7 +133,8 @@ stdenv.mkDerivation rec {
     ++ optional echo "--add-module=${echo-ext}"
     ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}"
     ++ optional set_misc "--add-module=${set-misc-ext}"
-    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio";
+    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
+    ++ optional fluent "--add-module=${fluentd}";
 
 
   additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
@@ -128,10 +143,6 @@ stdenv.mkDerivation rec {
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
   '';
 
-  postInstall = ''
-    mv $out/sbin $out/bin
-  '';
-
   meta = {
     description = "A reverse proxy and lightweight webserver";
     homepage    = http://nginx.org;
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 65c81c455b9..8444d49b91e 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -7,11 +7,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openresty-${version}";
-  version = "1.7.7.1";
+  version = "1.7.10.1";
 
   src = fetchurl {
     url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz";
-    sha256 = "1m541k2lys3155f0r94abgcmm2hgvv56q0i4fk58w6fa8n4h62z0";
+    sha256 = "0yg6pkagkkga6ly6fgmfcf557r2b4m75gyn6a7p9qcamb4zdgl2g";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ];
@@ -40,13 +40,9 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = ''
-    mv $out/nginx/sbin $out/bin
-    mv $out/bin/sbin $out/sbin
-
+    mv $out/nginx/sbin/nginx $out/bin
     mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty
-    ln -s $out/sbin/nginx $out/sbin/openresty
-    ln -s $out/sbin/nginx $out/bin/openresty
-    ln -s $out/sbin/nginx $out/bin/nginx
+    ln -s $out/bin/nginx $out/bin/openresty
   '';
 
   preConfigure = ''
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index f2ed57b4eb7..685d365ed18 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -2,14 +2,14 @@
 , svrcore, icu, net_snmp, kerberos, pcre, perlPackages
 }:
 let
-  version = "1.3.3.5";
+  version = "1.3.3.9";
 in
 stdenv.mkDerivation rec {
   name = "389-ds-base-${version}";
 
   src = fetchurl {
     url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2";
-    sha256 = "09w81salyr56njsvq9p96ijrrs0vwsczd43jf6384ylzj1jrxxl5";
+    sha256 = "1qqwv5j60f38hz4xpbzn4pixhkj07yjzbp7kz7cvfkgvdwy9jqxx";
   };
 
   buildInputs = [
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   # TODO: Fix bin/ds-logpipe.py, bin/logconv, bin/cl-dump
 
-  patches = [ ./no-etc.patch ./perl-path.patch ];
+  patches = [ ./perl-path.patch ];
 
   preConfigure = ''
     # Create perl paths for library imports in perl scripts
@@ -44,6 +44,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/lib/dirsrv
   '';
 
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
+  ];
+
   passthru.version = version;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/ldap/389/no-etc.patch b/pkgs/servers/ldap/389/no-etc.patch
deleted file mode 100644
index a894ffd4005..00000000000
--- a/pkgs/servers/ldap/389/no-etc.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bcdd781b01beba59b9f6993355732070b9487603 Mon Sep 17 00:00:00 2001
-From: "William A. Kennington III" <william@wkennington.com>
-Date: Fri, 9 Jan 2015 14:51:46 -0800
-Subject: [PATCH 1/2] Makefile: Don't install files to /etc or /var
-
----
- Makefile.in | 17 ++++++++---------
- 1 file changed, 8 insertions(+), 9 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 24a9ddf..c97d1e1 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -169,15 +169,14 @@ am__uninstall_files_from_dir = { \
- am__installdirs = "$(DESTDIR)$(serverdir)" \
- 	"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
- 	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
--	"$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" \
-+	"$(DESTDIR)$(sbindir)" \
- 	"$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" \
- 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" \
--	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" \
--	"$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" \
-+	"$(DESTDIR)$(infdir)" \
-+	"$(DESTDIR)$(mibdir)" \
- 	"$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" \
- 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" \
- 	"$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" \
--	"$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" \
- 	"$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"
- LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
- am__DEPENDENCIES_1 =
-@@ -10207,7 +10206,7 @@ check: $(BUILT_SOURCES)
- all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
- 		$(MANS) $(DATA) $(HEADERS) config.h
- installdirs:
--	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(initconfigdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
-+	for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(mibdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(updatedir)" "$(DESTDIR)$(serverincdir)"; do \
- 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
-@@ -10363,13 +10362,13 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-configDATA install-infDATA \
--	install-initSCRIPTS install-initconfigDATA install-man \
-+install-data-am: install-infDATA \
-+	install-man \
- 	install-mibDATA install-nodist_propertyDATA install-perlDATA \
- 	install-pkgconfigDATA install-propertyDATA install-pythonDATA \
--	install-sampledataDATA install-schemaDATA \
-+	install-sampledataDATA \
- 	install-serverLTLIBRARIES install-serverincHEADERS \
--	install-serverpluginLTLIBRARIES install-systemdsystemunitDATA \
-+	install-serverpluginLTLIBRARIES \
- 	install-taskSCRIPTS install-updateDATA install-updateSCRIPTS
- 
- install-dvi: install-dvi-am
--- 
-2.1.4
-
diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index ae4e1d6f245..3dd0463b604 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://exim.org/";
-    description = "Exim is a mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems.";
+    description = "A mail transfer agent (MTA) for hosts that are running Unix or Unix-like operating systems";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.tv ];
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index d2c19a2a00b..b796e12e9f4 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, libasr, libevent, zlib, openssl, db, bison, pam }:
+{ stdenv, fetchurl, autoconf, automake, libtool, bison
+, libasr, libevent, zlib, openssl, db, pam
+}:
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "5.4.4p1";
+  version = "5.4.5p1";
 
-  buildInputs = [ libasr libevent zlib openssl db bison pam ];
+  nativeBuildInputs = [ autoconf automake libtool bison ];
+  buildInputs = [ libasr libevent zlib openssl db pam ];
 
   src = fetchurl {
     url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "1gcfdmpkk892wnnhwc2nb559bwl3k892w7saj4q8m6jfll53660i";
+    sha256 = "15sicrpqsgg72igdckkwpmbgrapcjbfjsdrvm0zl8z13kgp6r4ks";
   };
 
   configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
     "--with-mantype=doc"
     "--with-pam"
     "--without-bsd-auth"
@@ -21,6 +26,11 @@ stdenv.mkDerivation rec {
     "--with-ca-file=/etc/ssl/certs/ca-bundle.crt"
   ];
 
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
+  ];
+
   meta = {
     homepage = https://www.opensmtpd.org/;
     description = ''
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index d37a4ff5b70..4ab9148118c 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -3,14 +3,14 @@
 with goPackages;
 
 buildGoPackage rec {
-  rev = "20150311224711";
+  rev = "20150409220449";
   name = "bosun-${rev}";
   goPackagePath = "bosun.org";
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "1nzzmlbiah7lpkm5n7yzxv1wmcxg8pszlzzsdvb7ccy0agpihxjg";
+    sha256 = "02bvq9hx2h4pgjclv09nm0al8ybvq0syhyhn5cvw0wgnn9bwn5mb";
   };
   subPackages = [ "cmd/bosun" ];
 
diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix
index ba6b0f369b9..9f432f7f8c1 100644
--- a/pkgs/servers/monitoring/bosun/scollector.nix
+++ b/pkgs/servers/monitoring/bosun/scollector.nix
@@ -3,14 +3,14 @@
 with goPackages;
 
 buildGoPackage rec {
-  rev = "20150311224711";
+  rev = "20150409220449";
   name = "bosun-${rev}";
   goPackagePath = "bosun.org";
   src = fetchFromGitHub {
     inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
-    sha256 = "1nzzmlbiah7lpkm5n7yzxv1wmcxg8pszlzzsdvb7ccy0agpihxjg";
+    sha256 = "02bvq9hx2h4pgjclv09nm0al8ybvq0syhyhn5cvw0wgnn9bwn5mb";
   };
   subPackages = [ "cmd/scollector" ];
 
diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix
index 1e818a508d9..c0126fda572 100644
--- a/pkgs/servers/monitoring/cadvisor/default.nix
+++ b/pkgs/servers/monitoring/cadvisor/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Analyzes resource usage and performance characteristics of running docker containers.";
+    description = "Analyzes resource usage and performance characteristics of running docker containers";
     homepage = https://github.com/google/cadvisor;
     license = licenses.asl20;
     maintainers = with maintainers; [ offline ];
diff --git a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
index c8793e17abb..e816f346e53 100644
--- a/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
+++ b/pkgs/servers/monitoring/prometheus/mesos_exporter/default.nix
@@ -17,7 +17,7 @@ goPackages.buildGoPackage rec {
   meta = with lib; {
     description = "Export Mesos metrics to Prometheus";
     homepage = https://github.com/prometheus/mesos_exporter;
-    licenses = licenses.asl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
index 231aa31802c..da15952f0f3 100644
--- a/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
+++ b/pkgs/servers/monitoring/prometheus/statsd_bridge/default.nix
@@ -20,7 +20,7 @@ goPackages.buildGoPackage rec {
   meta = with lib; {
     description = "Receives StatsD-style metrics and exports them to Prometheus";
     homepage = https://github.com/prometheus/statsd_bridge;
-    licenses = licenses.asl20;
+    license = licenses.asl20;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix
index 2785898bed5..38e59a39f38 100644
--- a/pkgs/servers/monitoring/sensu/default.nix
+++ b/pkgs/servers/monitoring/sensu/default.nix
@@ -9,8 +9,7 @@
     gemset = ./gemset.nix;
 
     meta = with lib; {
-      description = "A monitoring framework that aims to be simple, malleable,
-and scalable.";
+      description = "A monitoring framework that aims to be simple, malleable, and scalable";
       homepage    = http://sensuapp.org/;
       license     = with licenses; mit;
       maintainers = with maintainers; [ theuni ];
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index bbbe54b95fd..41e3b547f70 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -6,21 +6,21 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.musicpd.org/download/libmpdclient/2/${name}.tar.xz";
-    sha256 = "1jlrfqxqq3gscwrppr2h0xqxd5abl1ypwpwpwnpxs6p9c2jppjbw";
+    sha256 = "10pzs9z815a8hgbbbiliapyiw82bnplsccj5irgqjw5f5plcs22g";
   };
 
   buildInputs = [ doxygen ];
 
   passthru = {
     majorVersion = "2";
-    minorVersion = "9";
+    minorVersion = "10";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Client library for MPD (music player daemon)";
-    homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = with stdenv.lib.platforms; unix;
-    maintainers = [ stdenv.lib.maintainers.mornfall ];
+    homepage = http://www.musicpd.org/libs/libmpdclient/;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ mornfall emery ];
   };
 }
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 0078b4af96f..36b78388980 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -21,6 +21,8 @@
 , jackSupport ? true, jack2
 , gmeSupport ? true, game-music-emu
 , icuSupport ? true, icu
+, clientSupport ? false, mpd_clientlib
+, opusSupport ? true, libopus
 }:
 
 let
@@ -32,8 +34,8 @@ let
 in stdenv.mkDerivation rec {
   name = "mpd-${major}.${minor}";
   src = fetchurl {
-    url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz";
-    sha256 = "1j3cv8b76bfj3ddpd29v3apb5025i87y5h5b4lrs2g5vqsgpvb6y";
+    url    = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz";
+    sha256 = "0vzj365s4j0pw5w37lfhx3dmpkdp85driravsvx8rlrw0lii91a7";
   };
 
   buildInputs = [ pkgconfig glib boost ]
@@ -61,7 +63,9 @@ in stdenv.mkDerivation rec {
     ++ opt pulseaudioSupport pulseaudio
     ++ opt jackSupport jack2
     ++ opt gmeSupport game-music-emu
-    ++ opt icuSupport icu;
+    ++ opt icuSupport icu
+    ++ opt clientSupport mpd_clientlib
+    ++ opt opusSupport libopus;
 
   configureFlags =
     [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa")
@@ -88,6 +92,8 @@ in stdenv.mkDerivation rec {
       (mkFlag stdenv.isDarwin "osx")
       (mkFlag icuSupport "icu")
       (mkFlag gmeSupport "gme")
+      (mkFlag clientSupport "libmpdclient")
+      (mkFlag opusSupport "opus")
       "--enable-debug"
     ]
     ++ opt stdenv.isLinux
@@ -101,7 +107,7 @@ in stdenv.mkDerivation rec {
     description = "A flexible, powerful daemon for playing music";
     homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ astsmtl fuuzetsu ];
+    maintainers = with maintainers; [ astsmtl fuuzetsu emery ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 303159cb7f4..ef08dd3747f 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 
-let version = "3.0.1";
+let version = "3.0.2";
     system-libraries = [
       "pcre"
       "wiredtiger"
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "04qjw7b98h37g8rcih7va3rvg2z95ly38bg181a4nfkak50hd638";
+    sha256 = "16c3cr7l8ddziavmxrg2aq9bp1knnscy57xx5zsvz6yv7hh24181";
   };
 
   nativeBuildInputs = [ scons ];
diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 1c8eac99737..79343b04483 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, which, protobuf, gperftools, boost, zlib, curl, python, m4 }:
+{ stdenv, fetchurl, which, protobuf, gperftools
+, boost, zlib, curl, python, m4, icu, jemalloc }:
 
 stdenv.mkDerivation rec {
-  name = "rethinkdb-1.15.2";
+  name = "rethinkdb-${version}";
+  version = "2.0.0-1";
 
   src = fetchurl {
     url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "1fpx9apqm62i332q2isanpdql8gwwab4qxwzrspqwgcka9zd6gy3";
+    sha256 = "0fbxs6gmlmgkbfrmi0f4xyr3vqwylr6i7fa4p68y12qy6kv7q9pc";
   };
 
   preConfigure = ''
@@ -13,9 +15,9 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  configureFlags = "--lib-path ${gperftools}/lib";
+  configureFlags = "--lib-path ${gperftools}/lib --lib-path ${jemalloc}/lib";
 
-  buildInputs = [ protobuf boost zlib curl ];
+  buildInputs = [ protobuf boost zlib curl icu jemalloc ];
 
   nativeBuildInputs = [ which m4 python ];
 
diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 37d3650f683..3e9e2158524 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/Project-OSRM/osrm-backend/wiki;
-    description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project.";
+    description = "Open Source Routing Machine computes shortest paths in a graph. It was designed to run well with map data from the Openstreetmap Project";
     license = stdenv.lib.licenses.bsd2;
   };
 }
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
new file mode 100644
index 00000000000..62334de1b56
--- /dev/null
+++ b/pkgs/servers/plex/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl, rpmextract, glibc
+, dataDir ? "/var/lib/plex" # Plex's data directory must be baked into the package due to symlinks.
+}:
+
+stdenv.mkDerivation rec {
+  name = "plex-${version}";
+  version = "0.9.11.16.958";
+  vsnHash = "80f1748";
+
+  src = fetchurl {
+    url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
+    sha256 = "1wrl654nk10i9p01cgy9fqiqalxyl718qhp4kjnxvcwafayxkp26";
+  };
+
+  buildInputs = [ rpmextract glibc ];
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ];
+
+  unpackPhase = ''
+    rpmextract $src
+  '';
+
+  installPhase = ''
+    install -d $out/usr/lib
+    cp -dr --no-preserve='ownership' usr/lib/plexmediaserver $out/usr/lib/
+
+    # Now we need to patch up the executables and libraries to work on Nix.
+    # Side note: PLEASE don't put spaces in your binary names. This is stupid.
+    for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner"; do
+      patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
+      patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
+    done
+
+    find $out/usr/lib/plexmediaserver/Resources -type f -a -perm +0100 \
+        -print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \;
+
+
+    # Our next problem is the "Resources" directory in /usr/lib/plexmediaserver.
+    # This is ostensibly a skeleton directory, which contains files that Plex
+    # copies into its folder in /var. Unfortunately, there are some SQLite
+    # databases in the directory that are opened at startup. Since these
+    # database files are read-only, SQLite chokes and Plex fails to start. To
+    # solve this, we keep the resources directory in the Nix store, but we
+    # rename the database files and replace the originals with symlinks to
+    # /var/lib/plex. Then, in the systemd unit, the base database files are
+    # copied to /var/lib/plex before starting Plex.
+    RSC=$out/usr/lib/plexmediaserver/Resources
+    for db in "com.plexapp.plugins.library.db"; do
+        mv $RSC/$db $RSC/base_$db
+        ln -s ${dataDir}/.skeleton/$db $RSC/$db
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://plex.tv/;
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ forkk ];
+    description = "Media / DLNA server";
+    longDescription = ''
+      Plex is a media server which allows you to store your media and play it
+      back across many different devices.
+    '';
+  };
+}
diff --git a/pkgs/servers/pulseaudio/caps-fix.patch b/pkgs/servers/pulseaudio/caps-fix.patch
new file mode 100644
index 00000000000..1d69a16982f
--- /dev/null
+++ b/pkgs/servers/pulseaudio/caps-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 3c71472..71b5c3d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -620,6 +620,8 @@ AC_ARG_WITH([caps],
+ 
+ if test "x${with_caps}" != "xno"; then
+     AC_SEARCH_LIBS([cap_init], [cap], [], [])
++    AS_IF([test "x${with_caps}" != "xyes" -a "x${with_caps}" != "x"],
++          LIBS="-L${with_caps}/lib $LIBS")
+ 
+     # Only give an error on hosts that we know could support capabilities
+     AC_CHECK_HEADERS([sys/capability.h], [], [
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 4228f8b1eab..b031b0b4508 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -1,34 +1,99 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, gdbm, libtool, glib, dbus, avahi
-, gconf, gtk, intltool, gettext, alsaLib, libsamplerate, libsndfile, speex
-, bluez, sbc, udev, libcap, json_c
-, jackaudioSupport ? false, jack2 ? null
-, x11Support ? false, xlibs
-, useSystemd ? false, systemd ? null
-, ossWrapper ? false }:
+{ stdenv, fetchurl, pkgconfig, intltool, automake, autoconf, libtool
+, json_c, libsndfile, gettext, check
 
-assert jackaudioSupport -> jack2 != null;
+# Optional Dependencies
+, xlibs ? null, libcap ? null, valgrind ? null, oss ? null, coreaudio ? null
+, alsaLib ? null, esound ? null, glib ? null, gtk3 ? null, gconf ? null
+, avahi ? null, libjack2 ? null, libasyncns ? null, lirc ? null, dbus ? null
+, sbc ? null, bluez5 ? null, udev ? null, openssl ? null, fftw ? null
+, speexdsp ? null, systemd ? null, webrtc-audio-processing ? null
 
+# Database selection
+, tdb ? null, gdbm ? null
+
+# Extra options
+, prefix ? ""
+}:
+
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
+
+  libOnly = prefix == "lib";
+
+  hasXlibs = xlibs != null;
+
+  optLibcap = shouldUsePkg libcap;
+  hasCaps = optLibcap != null || stdenv.isFreeBSD; # Built-in on FreeBSD
+
+  optOss = if libOnly then null else shouldUsePkg oss;
+  hasOss = optOss != null || stdenv.isFreeBSD; # Built-in on FreeBSD
+
+  optCoreaudio = if libOnly then null else shouldUsePkg coreaudio;
+  optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
+  optEsound = if libOnly then null else shouldUsePkg esound;
+  optGlib = if libOnly then null else shouldUsePkg glib;
+  optGtk3 = if libOnly || hasXlibs then null else shouldUsePkg gtk3;
+  optGconf = if libOnly then null else shouldUsePkg gconf;
+  optAvahi = if libOnly then null else shouldUsePkg avahi;
+  optLibjack2 = if libOnly then null else shouldUsePkg libjack2;
+  optLibasyncns = shouldUsePkg libasyncns;
+  optLirc = if libOnly then null else shouldUsePkg lirc;
+  optDbus = shouldUsePkg dbus;
+  optSbc = if libOnly then null else shouldUsePkg sbc;
+  optBluez5 = if optDbus == null || optSbc == null then null
+    else shouldUsePkg bluez5;
+  optUdev = if libOnly then null else shouldUsePkg udev;
+  optOpenssl = if libOnly then null else shouldUsePkg openssl;
+  optFftw = shouldUsePkg fftw;
+  optSpeexdsp = shouldUsePkg speexdsp;
+  optSystemd = shouldUsePkg systemd;
+  optWebrtc-audio-processing = if libOnly then null else shouldUsePkg webrtc-audio-processing;
+  hasWebrtc = if libOnly then null else optWebrtc-audio-processing != null;
+
+  # Pick a database to use
+  databaseName = if tdb != null then "tdb" else
+    if gdbm != null then "gdbm" else "simple";
+  database = {
+    tdb = tdb;
+    gdbm = gdbm;
+    simple = null;
+  }.${databaseName};
+in
 stdenv.mkDerivation rec {
-  name = "pulseaudio-6.0";
+  name = "${prefix}pulseaudio-${version}";
+  version = "6.0";
 
   src = fetchurl {
-    url = "http://freedesktop.org/software/pulseaudio/releases/${name}.tar.xz";
+    url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
     sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm";
   };
 
-  # Since `libpulse*.la' contain `-lgdbm' and `-lcap', it must be propagated.
-  propagatedBuildInputs
-    = [ gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  patches = [ ./caps-fix.patch ];
+
+  nativeBuildInputs = [ pkgconfig intltool automake autoconf libtool ];
+  buildInputs = [
+    json_c libsndfile gettext check database
 
-  buildInputs =
-    [ pkgconfig gnum4 libtool intltool glib dbus avahi libsamplerate libsndfile
-      speex json_c ]
-    ++ stdenv.lib.optional jackaudioSupport jack2
-    ++ stdenv.lib.optionals x11Support [ xlibs.xlibs xlibs.libXtst xlibs.libXi ]
-    ++ stdenv.lib.optional useSystemd systemd
-    ++ stdenv.lib.optionals stdenv.isLinux [ alsaLib bluez sbc udev ];
+    optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
+    optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev
+    optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing
+  ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [
+      libX11 libxcb libICE libSM libXtst xextproto libXi
+    ]) ++ stdenv.lib.optionals (optBluez5 != null) [ optBluez5 optSbc ];
 
   preConfigure = ''
+    # Performs and autoreconf
+    export NOCONFIGURE="yes"
+    patchShebangs bootstrap.sh
+    ./bootstrap.sh
+
     # Move the udev rules under $(prefix).
     sed -i "src/Makefile.in" \
         -e "s|udevrulesdir[[:blank:]]*=.*$|udevrulesdir = $out/lib/udev/rules.d|g"
@@ -40,18 +105,54 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--disable-solaris"
-    "--disable-jack"
-    "--disable-oss-output"
-  ] ++ stdenv.lib.optional (!ossWrapper) "--disable-oss-wrapper" ++
-  [
-    "--localstatedir=/var"
-    "--sysconfdir=/etc"
-    "--with-access-group=audio"
+    (mkOther                          "localstatedir"              "/var")
+    (mkOther                          "sysconfdir"                 "/etc")
+    (mkEnable false                   "atomic-arm-memory-barrier"  null)         # TODO: Enable on armv8
+    (mkEnable false                   "neon-opt"                   null)         # TODO: Enable on armv8
+    (mkEnable hasXlibs                "x11"                        null)
+    (mkWith   hasCaps                 "caps"                       optLibcap)
+    (mkEnable true                    "tests"                      null)
+    (mkEnable false                   "samplerate"                 null)         # Deprecated
+    (mkWith   true                    "database"                   databaseName)
+    (mkEnable hasOss                  "oss-output"                 null)
+    (mkEnable hasOss                  "oss-wrapper"                null)
+    (mkEnable (optCoreaudio != null)  "coreaudio-output"           null)
+    (mkEnable (optAlsaLib != null)    "alsa"                       null)
+    (mkEnable (optEsound != null)     "esound"                     null)
+    (mkEnable false                   "solaris"                    null)
+    (mkEnable false                   "waveout"                    null)         # Windows Only
+    (mkEnable (optGlib != null)       "glib2"                      null)
+    (mkEnable (optGtk3 != null)       "gtk3"                       null)
+    (mkEnable (optGconf != null)      "gconf"                      null)
+    (mkEnable (optAvahi != null)      "avahi"                      null)
+    (mkEnable (optLibjack2 != null)   "jack"                       null)
+    (mkEnable (optLibasyncns != null) "asyncns"                    null)
+    (mkEnable false                   "tcpwrap"                    null)
+    (mkEnable (optLirc != null)       "lirc"                       null)
+    (mkEnable (optDbus != null)       "dbus"                       null)
+    (mkEnable false                   "bluez4"                     null)
+    (mkEnable (optBluez5 != null)     "bluez5"                     null)
+    (mkEnable (optBluez5 != null)     "bluez5-ofono-headset"       null)
+    (mkEnable (optBluez5 != null)     "bluez5-native-headset"      null)
+    (mkEnable (optUdev != null)       "udev"                       null)
+    (mkEnable false                   "hal-compat"                 null)
+    (mkEnable true                    "ipv6"                       null)
+    (mkEnable (optOpenssl != null)    "openssl"                    null)
+    (mkWith   (optFftw != null)       "fftw"                       null)
+    (mkWith   (optSpeexdsp != null)   "speex"                      null)
+    (mkEnable false                   "xen"                        null)
+    (mkEnable false                   "gcov"                       null)
+    (mkEnable (optSystemd != null)    "systemd-daemon"             null)
+    (mkEnable (optSystemd != null)    "systemd-login"              null)
+    (mkEnable (optSystemd != null)    "systemd-journal"            null)
+    (mkEnable true                    "manpages"                   null)
+    (mkEnable hasWebrtc               "webrtc-aec"                 null)
+    (mkEnable true                    "adrian-aec"                 null)
+    (mkWith   true                    "system-user"                "pulseaudio")
+    (mkWith   true                    "system-group"               "pulseaudio")
+    (mkWith   true                    "access-group"               "audio")
     "--with-systemduserunitdir=\${out}/lib/systemd/user"
-  ]
-    ++ stdenv.lib.optional jackaudioSupport "--enable-jack"
-    ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--with-mac-sysroot=/";
 
   enableParallelBuilding = true;
 
@@ -63,7 +164,14 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin
     "-I/usr/include";
 
-  installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse";
+  installFlags = [
+    "sysconfdir=$(out)/etc"
+    "pulseconfdir=$(out)/etc/pulse"
+  ];
+
+  postInstall = stdenv.lib.optionalString libOnly ''
+    rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
+  '';
 
   meta = with stdenv.lib; {
     description = "Sound server for POSIX and Win32 systems";
@@ -71,7 +179,7 @@ stdenv.mkDerivation rec {
     # Note: Practically, the server is under the GPL due to the
     # dependency on `libsamplerate'.  See `LICENSE' for details.
     licenses    = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ lovek323 ];
+    maintainers = with maintainers; [ lovek323 wkennington ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 39a7460674e..6a09d683f8d 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rippled-${version}";
-  version = "0.27.3-sp2";
+  version = "0.27.4";
 
   src = fetchFromGitHub {
     owner = "ripple";
     repo = "rippled";
     rev = version;
-    sha256 = "1q4i87cc7yks9slpgrfnlimngm45n3h035ssjvywmfwhhh7r9m3y";
+    sha256 = "13xg2baqcf2h1ww2yk371r27726iq8xb4brsj9rqv692aviblqs3";
   };
 
   postPatch = ''
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     homepage = https://ripple.com;
     maintainers = [ maintainers.emery maintainers.offline ];
     license = licenses.isc;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 79736e17a50..49b81794f04 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -13,7 +13,7 @@
 , acl ? null
 , libaio ? null
 , fam ? null
-, ceph ? null
+, libceph ? null
 , glusterfs ? null
 
 # buildtools/wafsamba/wscript optionals
@@ -50,11 +50,11 @@ let
   hasInfinibandOrNull = if libibverbs != null && librdmacm != null then true else null;
 in
 stdenv.mkDerivation rec {
-  name = "samba-4.2.0";
+  name = "samba-4.2.1";
 
   src = fetchurl {
     url = "mirror://samba/pub/samba/stable/${name}.tar.gz";
-    sha256 = "03s9pjdgq6nlv2lcnlmxlhhj8m5drgv6z4xy9zkgwwd92mw0b9k6";
+    sha256 = "1hsakc8h6rs48xr6i55m90pd53hpxcqjjnlwq8i2rp0nq4ws5sip";
   };
 
   patches = [
@@ -68,7 +68,7 @@ stdenv.mkDerivation rec {
     pythonPackages.subunit libbsd nss_wrapper socket_wrapper uid_wrapper
     libarchive
 
-    kerberos zlib openldap cups pam avahi acl libaio fam ceph glusterfs
+    kerberos zlib openldap cups pam avahi acl libaio fam libceph glusterfs
 
     libiconv gettext
 
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     (mkWith   (libarchive != null) "libarchive"        null)
     (mkWith   true                 "cluster-support"   null)
     (mkWith   (ncurses != null)    "regedit"           null)
-    (mkWith   ceph                 "libcephfs"         ceph)
+    (mkWith   libceph              "libcephfs"         libceph)
     (mkEnable (glusterfs != null)  "glusterfs"         null)
 
     # dynconfig/wscript options
diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix
index 6a0693ef1f5..69941d5c46c 100644
--- a/pkgs/servers/search/elasticsearch/plugins.nix
+++ b/pkgs/servers/search/elasticsearch/plugins.nix
@@ -1,4 +1,4 @@
-{ pkgs,  stdenv, fetchurl, unzip, elasticsearch }:
+{ pkgs,  stdenv, fetchurl, fetchFromGitHub, unzip, elasticsearch }:
 
 with pkgs.lib;
 
@@ -89,6 +89,21 @@ in {
       maintainers = [ maintainers.edwtjo ];
       platforms = elasticsearch.meta.platforms;
     };
+  };
 
+  elasticsearch_kopf = esPlugin rec {
+    name = "elasticsearch-kopf-${version}";
+    pluginName = "elasticsearch-kopf";
+    version = "1.4.7";
+    src = fetchurl {
+      url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip";
+      sha256 = "17r9mmfjnraswij1glmglljga4i4mfiraivxmai6giwmm2grwlz3";
+    };
+    meta = {
+      homepage = https://github.com/lmenezes/elasticsearch-kopf;
+      description = "Web administration tool for ElasticSearch";
+      license = licenses.mit;
+    };
   };
+
 }
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index f6c9d73aa8a..e5740491675 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, ncurses, openssl, pcre, boost, judy, bison, libxml2
+{ stdenv, fetchurl, cmake, ncurses, zlib, openssl, pcre, boost, judy, bison, libxml2
 , libaio, libevent, groff, jemalloc, perl, fixDarwinDylibNames
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "04ckq67qgkghh7yzrbzwidk7wn7yjml15gzj2c5p1hs2k7lr9lww";
   };
 
-  buildInputs = [ cmake ncurses openssl pcre libxml2 boost judy bison libevent ]
+  buildInputs = [ cmake ncurses openssl zlib pcre libxml2 boost judy bison libevent ]
     ++ stdenv.lib.optionals stdenv.isLinux [ jemalloc libaio ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ];
 
@@ -81,9 +81,10 @@ stdenv.mkDerivation rec {
       --replace basedir=\"\" basedir=\"$out\"
 
     # Remove superfluous files
-    rm -r $out/mysql-test $out/sql-bench $out/data
+    rm -r $out/mysql-test $out/sql-bench $out/data # Don't need testing data
     rm $out/share/man/man1/mysql-test-run.pl.1
-    rm $out/bin/rcmysql
+    rm $out/bin/rcmysql # Not needed with nixos units
+    rm $out/bin/mysqlbug # Encodes a path to gcc and not really useful
     find $out/bin -name \*test\* -exec rm {} \;
 
     # Separate libs and includes into their own derivation
@@ -91,6 +92,11 @@ stdenv.mkDerivation rec {
     mv $out/lib $lib
     mv $out/include $lib
 
+    # Fix the mysql_config
+    sed -i $out/bin/mysql_config \
+      -e 's,-lz,-L${zlib}/lib -lz,g' \
+      -e 's,-lssl,-L${openssl}/lib -lssl,g'
+
     # Add mysql_config to libs since configure scripts use it
     mkdir -p $lib/bin
     cp $out/bin/mysql_config $lib/bin
diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix
index 137e536e5d8..775621e64b4 100644
--- a/pkgs/servers/sql/pgpool/default.nix
+++ b/pkgs/servers/sql/pgpool/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://pgpool.net/mediawiki/index.php;
-    description = "a middleware that works between postgresql servers and postgresql clients.";
+    description = "A middleware that works between postgresql servers and postgresql clients";
     license = licenses.free;
     platforms = platforms.linux;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix
index 3f9aa4470f9..0de4dfff153 100644
--- a/pkgs/servers/sslh/default.nix
+++ b/pkgs/servers/sslh/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sslh-${version}";
-  version = "1.16";
+  version = "1.17";
 
   src = fetchurl {
     url = "https://github.com/yrutschle/sslh/archive/v${version}.tar.gz";
-    sha256 = "0xwi2bflvq4phrqjic84xch20jkg3wdys219mw2cy23sjkzk63mb";
+    sha256 = "1l8ssm47f0hwiisgfj0ca5j2z8j98pir4pf2acrj1798fnzw6mxm";
   };
 
   postPatch = "patchShebangs *.sh";
diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix
index 5b191bef872..358afb3dfb3 100644
--- a/pkgs/servers/varnish/default.nix
+++ b/pkgs/servers/varnish/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, python }:
+{ stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, python
+, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.6";
+  version = "4.0.3";
   name = "varnish-${version}";
 
   src = fetchurl {
     url = "http://repo.varnish-cache.org/source/${name}.tar.gz";
-    sha256 = "1dw0nrplx5pa09z8vbjpncniv3qib5bh3qp3yqbk2d774n7ys3c4";
+    sha256 = "01l2iypajkdanxpbvzfxm6vs4jay4dgw7lmchqidnivz15sa3fcl";
   };
 
-  buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python ];
+  buildInputs = [ pcre libxslt groff ncurses pkgconfig readline python
+    pythonPackages.docutils];
 
   meta = {
     description = "Web application accelerator also known as a caching HTTP reverse proxy";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 27fed661d75..b7823129043 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1,7 +1,7 @@
 { args, xorg }:
 
 let
-  inherit (args) stdenv;
+  inherit (args) stdenv makeWrapper;
   inherit (stdenv) lib isDarwin;
   inherit (lib) overrideDerivation;
 
@@ -346,13 +346,14 @@ in
     in
       if (!isDarwin)
       then {
-        buildInputs = commonBuildInputs;
+        buildInputs = [ makeWrapper ] ++ commonBuildInputs;
         propagatedBuildInputs = commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev
         ];
         patches = commonPatches;
         configureFlags = [
           "--enable-kdrive"             # not built by default
+          "--enable-xephyr"
           "--enable-xcsecurity"         # enable SECURITY extension
           "--with-default-font-path="   # there were only paths containing "${prefix}",
                                         # and there are no fonts in this package anyway
@@ -360,6 +361,9 @@ in
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled
           ln -s /var/tmp $out/share/X11/xkb/compiled
+          wrapProgram $out/bin/Xephyr \
+            --set XKB_BINDIR "${xorg.xkbcomp}/bin" \
+            --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
         '';
         passthru.version = version; # needed by virtualbox guest additions
       } else {
diff --git a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
index f5196c60c7c..a0951269b42 100644
--- a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
+++ b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch
@@ -1,15 +1,15 @@
-diff -rc xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c
-*** xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c	Tue Jan 23 04:13:16 2007
---- xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c	Fri Mar 30 00:52:53 2007
+*** xorg-server-X11R7.2-1.2.0-orig/xkb/xkbInit.c	2015-02-11 00:32:06.000000000 +0100
+--- xorg-server-X11R7.2-1.2.0/xkb/xkbInit.c	2015-04-11 10:10:41.948438435 +0200
 ***************
-*** 923,928 ****
---- 923,931 ----
-  	XkbDfltRepeatInterval = (long)atoi(argv[i]);
-  	return 2;
-      }
+*** 733,738 ****
+--- 733,742 ----
+  int
+  XkbProcessArguments(int argc, char *argv[], int i)
+  {
 +     char *xkbBinDir = getenv("XKB_BINDIR");
 +     if (xkbBinDir)
 +         XkbBinDirectory = Xstrdup(xkbBinDir);
-      return 0;
-  }
-  
++ 
+      if (strncmp(argv[i], "-xkbdir", 7) == 0) {
+          if (++i < argc) {
+  #if !defined(WIN32) && !defined(__CYGWIN__)
diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix
new file mode 100644
index 00000000000..236c5d1f00f
--- /dev/null
+++ b/pkgs/shells/es/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchgit, readline, yacc, autoconf, automake, libtool }:
+
+let
+  version = "git-2015-04-11";
+in
+stdenv.mkDerivation {
+
+  name = "es-${version}";
+
+  src = fetchgit {
+    url = "git://github.com/wryun/es-shell";
+    rev = "fdf29d5296ce3a0ef96d2b5952cff07878753975";
+    sha256 = "1hj0g8r59ry9l50h4gdal38nf8lvb3cgl6c9bx5aabkw5i778dfk";
+  };
+
+  buildInputs = [ readline yacc libtool autoconf automake ];
+
+  preConfigure =
+    ''
+      aclocal
+      autoconf
+      libtoolize -qi
+    '';
+
+  configureFlags="--with-readline --prefix=$(out) --bindir=$(out)/bin --mandir=$(out)/man";
+
+  preInstall = ''
+    mkdir -p $out/{bin,man}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Es is an extensible shell";
+    longDescription =
+      ''
+        Es is an extensible shell. The language was derived
+        from the Plan 9 shell, rc, and was influenced by
+        functional programming languages, such as Scheme,
+        and the Tcl embeddable programming language.
+      '';
+    homepage = http://wryun.github.io/es-shell/;
+    license = licenses.publicDomain;
+    maintainers = [ maintainers.sjmackenzie ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index da797005be4..ba510e8907a 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       systems.
     '';
     homepage = "https://www.mirbsd.org/mksh.htm";
-    licenses = "custom";
+    license = "custom";
     maintainers = [ maintainers.AndersonTorres ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index 9887e8f1b6f..ada34030034 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -68,7 +68,7 @@ EOF
       a host of other features.
     '';
     license = "MIT-like";
-    homePage = "http://www.zsh.org/";
+    homepage = "http://www.zsh.org/";
     maintainers = with stdenv.lib.maintainers; [ chaoflow ];
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index e7a828355e7..1a43b5a6159 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -221,7 +221,8 @@ let
              || system == "x86_64-darwin"
              || system == "x86_64-freebsd"
              || system == "x86_64-openbsd"
-             || system == "x86_64-solaris";
+             || system == "x86_64-solaris"
+             || system == "mips64el-linux";
       isMips = system == "mips-linux"
             || system == "mips64el-linux";
       isArm = system == "armv5tel-linux"
diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 8434e651dbe..53b3531b685 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "xdg-utils-1.1.0-rc3p7";
 
   src = fetchgit {
-    url = "git://anongit.freedesktop.org/xdg/xdg-utils";
+    url = "http://anongit.freedesktop.org/git/xdg/xdg-utils.git";
     rev = "e8ee3b18d16e41b95148111b920a0c8beed3ac6c";
     sha256 = "0qy9h7vh6sw7wmadjvasw4sdhb9fvv7bn32ifgasdx7ag3r3939w";
   };
diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
new file mode 100644
index 00000000000..d8c88b6ee65
--- /dev/null
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}:

+stdenv.mkDerivation rec {

+  name = "innoextract-1.4";

+  src = fetchurl {

+    url = "http://constexpr.org/innoextract/files/${name}.tar.gz";

+    sha256 = "1j8wj0ijdnfh0r9qjr7ykp9v3n2yd4qisxln81bl6474w5d4njas";

+  };

+  buildInputs = [ python doxygen lzma boost ];

+  nativeBuildInputs = [ cmake ];

+}
\ No newline at end of file
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index cf58ab7890c..dc859b49736 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,34 +1,33 @@
-{ stdenv, fetchFromGitHub, writeScript
+{ stdenv, fetchFromGitHub, writeScript, glibcLocales
 , buildPythonPackage, pythonPackages, python
 
 , enableAcoustid   ? true
-, enableBeatport   ? true
 , enableDiscogs    ? true
 , enableEchonest   ? true
 , enableFetchart   ? true
 , enableLastfm     ? true
 , enableMpd        ? true
 , enableReplaygain ? true
+, enableThumbnails ? true
 , enableWeb        ? true
 
 , bashInteractive, bashCompletion
 }:
 
 assert enableAcoustid    -> pythonPackages.pyacoustid     != null;
-assert enableBeatport    -> pythonPackages.responses      != null;
 assert enableDiscogs     -> pythonPackages.discogs_client != null;
 assert enableEchonest    -> pythonPackages.pyechonest     != null;
 assert enableFetchart    -> pythonPackages.responses      != null;
 assert enableLastfm      -> pythonPackages.pylast         != null;
 assert enableMpd         -> pythonPackages.mpd            != null;
 assert enableReplaygain  -> pythonPackages.audiotools     != null;
+assert enableThumbnails  -> pythonPackages.pyxdg          != null;
 assert enableWeb         -> pythonPackages.flask          != null;
 
 with stdenv.lib;
 
 let
   optionalPlugins = {
-    beatport = enableBeatport;
     chroma = enableAcoustid;
     discogs = enableDiscogs;
     echonest = enableEchonest;
@@ -38,15 +37,16 @@ let
     mpdstats = enableMpd;
     mpdupdate = enableMpd;
     replaygain = enableReplaygain;
+    thumbnails = enableThumbnails;
     web = enableWeb;
   };
 
   pluginsWithoutDeps = [
-    "bench" "bpd" "bpm" "bucket" "convert" "duplicates" "embedart" "freedesktop"
-    "fromfilename" "ftintitle" "fuzzy" "ihate" "importadded" "importfeeds"
-    "info" "inline" "keyfinder" "lyrics" "mbcollection" "mbsync" "missing"
-    "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist"
-    "spotify" "the" "types" "zero"
+    "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
+    "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
+    "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics"
+    "mbcollection" "mbsync" "missing" "permissions" "play" "plexupdate" "random"
+    "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero"
   ];
 
   enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
@@ -59,14 +59,14 @@ let
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.10";
+  version = "1.3.11";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "136rvzpygjym6hxq19qwiri5jxx718bbmi471mvc3vibrb7xj1sr";
+    sha256 = "16jb1frds9vl40n9hy18x9xipxfzln3ym823vx8jymhv3by8p62m";
   };
 
   propagatedBuildInputs = [
@@ -74,18 +74,20 @@ in buildPythonPackage rec {
     pythonPackages.munkres
     pythonPackages.musicbrainzngs
     pythonPackages.mutagen
+    pythonPackages.pathlib
     pythonPackages.pyyaml
     pythonPackages.unidecode
     python.modules.sqlite3
     python.modules.readline
-  ] ++ optional enableAcoustid                     pythonPackages.pyacoustid
-    ++ optional (enableBeatport || enableFetchart) pythonPackages.requests2
-    ++ optional enableDiscogs                      pythonPackages.discogs_client
-    ++ optional enableEchonest                     pythonPackages.pyechonest
-    ++ optional enableLastfm                       pythonPackages.pylast
-    ++ optional enableMpd                          pythonPackages.mpd
-    ++ optional enableReplaygain                   pythonPackages.audiotools
-    ++ optional enableWeb                          pythonPackages.flask;
+  ] ++ optional enableAcoustid   pythonPackages.pyacoustid
+    ++ optional enableFetchart   pythonPackages.requests2
+    ++ optional enableDiscogs    pythonPackages.discogs_client
+    ++ optional enableEchonest   pythonPackages.pyechonest
+    ++ optional enableLastfm     pythonPackages.pylast
+    ++ optional enableMpd        pythonPackages.mpd
+    ++ optional enableReplaygain pythonPackages.audiotools
+    ++ optional enableThumbnails pythonPackages.pyxdg
+    ++ optional enableWeb        pythonPackages.flask;
 
   buildInputs = with pythonPackages; [
     beautifulsoup4
@@ -134,6 +136,8 @@ in buildPythonPackage rec {
   checkPhase = ''
     runHook preCheck
 
+    LANG=en_US.UTF-8 \
+    LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive \
     BEETS_TEST_SHELL="${testShell}" \
     BASH_COMPLETION_SCRIPT="${completion}" \
     HOME="$(mktemp -d)" \
@@ -164,6 +168,6 @@ in buildPythonPackage rec {
     homepage = http://beets.radbox.org;
     description = "Music tagger and library organizer";
     license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ iElectric aszlig ];
+    maintainers = with stdenv.lib.maintainers; [ iElectric aszlig pjones ];
   };
 }
diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix
index 9512a917d85..b7bcadd73c5 100644
--- a/pkgs/tools/backup/attic/default.nix
+++ b/pkgs/tools/backup/attic/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchzip, python3Packages, openssl, acl }:
 
 python3Packages.buildPythonPackage rec {
-  name = "attic-0.14";
+  name = "attic-0.15";
   namePrefix = "";
 
   src = fetchzip {
     name = "${name}-src";
-    url = "https://github.com/jborg/attic/archive/0.14.tar.gz";
-    sha256 = "1ij99dmd571rvk3kz97vs7wbjj2pbbd54l310lydnwywxhqs8hrv";
+    url = "https://github.com/jborg/attic/archive/0.15.tar.gz";
+    sha256 = "0bing5zg82mwvdi27jl77ardw65zaq4996k4677gz2lq7p7b4gd7";
   };
 
   propagatedBuildInputs = with python3Packages;
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix
index 55c84a1015f..016e3c5d51e 100644
--- a/pkgs/tools/backup/bareos/default.nix
+++ b/pkgs/tools/backup/bareos/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool
 , readline ? null, openssl ? null, python ? null, ncurses ? null
-, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
-, acl ? null, glusterfs ? null, ceph ? null, libcap ? null
+, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null
+, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
 }:
 
-assert sqlite != null || postgresql != null || mysql != null;
+assert sqlite != null || postgresql != null || libmysql != null;
 
 with stdenv.lib;
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig nettools gettext readline openssl python
-    ncurses sqlite postgresql mysql.lib zlib lzo acl glusterfs ceph libcap
+    ncurses sqlite postgresql libmysql zlib lzo acl glusterfs libceph libcap
   ];
 
   postPatch = ''
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
     ++ optional (openssl != null) "--with-openssl=${openssl}"
     ++ optional (sqlite != null) "--with-sqlite3=${sqlite}"
     ++ optional (postgresql != null) "--with-postgresql=${postgresql}"
-    ++ optional (mysql != null) "--with-mysql=${mysql.lib}"
+    ++ optional (libmysql != null) "--with-mysql=${libmysql}"
     ++ optional (zlib != null) "--with-zlib=${zlib}"
     ++ optional (lzo != null) "--with-lzo=${lzo}"
     ++ optional (acl != null) "--enable-acl"
     ++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}"
-    ++ optional (ceph != null) "--with-cephfs=${ceph}";
+    ++ optional (libceph != null) "--with-cephfs=${libceph}";
 
   installFlags = [
     "sysconfdir=\${out}/etc"
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.bareos.org/;
-    description = "a fork of the bacula project.";
+    description = "A fork of the bacula project";
     license = licenses.agpl3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix
index 7de503adc07..bf876d52d45 100644
--- a/pkgs/tools/cd-dvd/cuetools/default.nix
+++ b/pkgs/tools/cd-dvd/cuetools/default.nix
@@ -1,22 +1,25 @@
-{stdenv, fetchurl, automake, autoconf, flex, bison }:
+{ stdenv, fetchurl, autoreconfHook
+, bison, flac, flex, id3v2, vorbisTools
+}:
 
-stdenv.mkDerivation {
-  name = "cuetools-1.3.1";
+stdenv.mkDerivation rec {
+  name = "cuetools-${version}";
+  version = "1.4.1";
 
   src = fetchurl {
-    url = https://github.com/svend/cuetools/archive/cuetools-1.3.1.tar.gz;
-    sha256 = "1cap3wl0mlcqrjywpz46003w8jws05rr3r87pzqkz1g89v9459dg";
+    url = "https://github.com/svend/cuetools/archive/${version}.tar.gz";
+    sha256 = "01xi3rvdmil9nawsha04iagjylqr1l9v9vlzk99scs8c207l58i4";
   };
 
-  preConfigure = "autoreconf -fiv";
+  nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ automake autoconf flex bison ]; 
+  buildInputs = [ bison flac flex id3v2 vorbisTools ];
 
-  meta = {
-    description = "cd/dvd cue and toc file parsers and utilities";
+  meta = with stdenv.lib; {
+    description = "A set of utilities for working with cue files and toc files";
     homepage = https://github.com/svend/cuetools;
-    platforms = stdenv.lib.platforms.all;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [ jcumming ];
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ codyopel jcumming ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 0d7a0e14e7d..343709dd957 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -10,7 +10,7 @@ pythonPackages.buildPythonPackage rec {
   };
 
   meta = with stdenv.lib; {
-    description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives.";
+    description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives";
     homepage = "http://brettcsmith.org/2007/dtrx/";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.spwhitt ];
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 26e82886b6f..d27ada615c7 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -11,8 +11,7 @@ stdenv.mkDerivation rec {
     owner = "Cyan4973";
   };
 
-  # valgrind is required only by `make test`
-  buildInputs = [ valgrind ];
+  buildInputs = stdenv.lib.optional doCheck valgrind;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index c85c7366cda..fcc3b373fd1 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -1,24 +1,44 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
-stdenv.mkDerivation {
-  name = "xdelta-3.0z";
+let version = "3.0.9"; in
+stdenv.mkDerivation rec {
+  name = "xdelta-${version}";
   
-  src = fetchurl {
-    url = http://xdelta.googlecode.com/files/xdelta3.0z.tar.gz;
-    sha256 = "1rpk4n3yz8x81vakzn3n75h79a2ycm06p5v72djklx0wn9gb412m";
+  src = fetchFromGitHub {
+    sha256 = "1pd7dyq44dbggmwkrr8251anqsf2an67zbvrk4vfnc92jkmjp17i";
+    rev = "v${version}";
+    repo = "xdelta-devel";
+    owner = "jmacd";
   };
 
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      cp xdelta3 $out/bin/
+  buildInputs = [ autoreconfHook ];
 
-      mkdir -p $out/share/man/man1
-      cp xdelta3.1 $out/share/man/man1/
-    '';
+  postPatch = ''
+    cd xdelta3
+  '' + stdenv.lib.optionalString doCheck ''
+    mkdir tmp
+    substituteInPlace testing/file.h --replace /tmp tmp
+    substituteInPlace xdelta3-test.h --replace /tmp $PWD/tmp
+  '';
 
-  meta = {
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  checkPhase = ''
+    ./xdelta3regtest
+  '';
+
+  installPhase = ''
+    install -D -m755 xdelta3 $out/bin/xdelta3
+    install -D -m644 xdelta3.1 $out/share/man/man1/xdelta3.1
+  '';
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Binary differential compression in VCDIFF (RFC 3284) format";
     homepage = http://xdelta.org/;
-    description = "A binary diff tool that uses the VCDIFF (RFC 3284) format and compression";
+    license = with licenses; gpl2Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/filesystems/ceph/0.80.nix b/pkgs/tools/filesystems/ceph/0.80.nix
new file mode 100644
index 00000000000..2faf30f570c
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0.80.nix
@@ -0,0 +1,16 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "0.80.9";
+
+  src = fetchgit {
+    url = "git://github.com/ceph/ceph.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0c1hwl2jzghvbrnddwbp748b02jqznvigwriqx447iz2xyrz2w8q";
+  };
+
+  patches = [
+    ./0001-Cleanup-boost-optionals.patch
+    ./fix-pgrefdebugging.patch
+  ];
+})
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
new file mode 100644
index 00000000000..a14259184a5
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -0,0 +1,13 @@
+{ callPackage, fetchgit, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "0.94.1";
+
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph.git";
+    rev = "refs/tags/v${version}";
+    sha256 = "0rrl10vda4xv22al2c5ccd8v8drs26186dvkrxndvqz8p9999cjx";
+  };
+
+  patches = [ ./fix-pgrefdebugging.patch ];
+})
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 6fd6993937e..31d5e95359c 100644..120000
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -1,61 +1 @@
-{ stdenv, fetchgit, autoconf, automake, makeWrapper, pkgconfig, libtool, which
-, boost, btrfsProgs, cryptopp, curl, expat, fcgi, fuse, gperftools, keyutils
-, leveldb, libaio, libatomic_ops, libedit, libuuid, linuxHeaders, openssl
-, python, snappy, udev, xfsprogs, xz
-, zfs ? null
-}:
-
-with stdenv.lib;
-let
-  wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $out)\""
-    + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
-    + " --prefix PATH : \"$out/bin\""
-    + " --prefix LD_LIBRARY_PATH : \"$out/lib\"";
-in
-stdenv.mkDerivation rec {
-  name="ceph-${version}";
-  version="0.94";
-
-  src = fetchgit {
-    url = "git://github.com/ceph/ceph.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "0xqfmfg34w8yngv2qg4kwbpv9xhc8rn9hzsrgpw68f5hrs3dfimz";
-  };
-
-  patches = [
-    ./0001-Makefile-env-Don-t-force-sbin.patch
-  ];
-
-  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
-  buildInputs = [
-    boost btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
-    libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
-    snappy udev xfsprogs xz zfs
-  ];
-
-  preConfigure = ''
-    ./autogen.sh
-  '';
-
-  configureFlags = [
-    "--exec_prefix=$(out)"
-  ] ++ optional (zfs != null) "--with-zfs=${zfs}";
-
-  postInstall = ''
-    wrapProgram $out/bin/ceph ${wrapArgs}
-    wrapProgram $out/bin/ceph-brag ${wrapArgs}
-    wrapProgram $out/bin/ceph-rest-api ${wrapArgs}
-    wrapProgram $out/sbin/ceph-create-keys ${wrapArgs}
-    wrapProgram $out/sbin/ceph-disk ${wrapArgs}
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://ceph.com/;
-    description = "Distributed storage system";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ ak wkennington ];
-    platforms = with platforms; linux;
-  };
-}
+0.94.nix
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/ceph/dev.nix b/pkgs/tools/filesystems/ceph/dev.nix
new file mode 120000
index 00000000000..31d5e95359c
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/dev.nix
@@ -0,0 +1 @@
+0.94.nix
\ No newline at end of file
diff --git a/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch b/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch
new file mode 100644
index 00000000000..4d13a0572d8
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch
@@ -0,0 +1,17 @@
+diff --git a/configure.ac b/configure.ac
+index 38ab682..febb58e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -541,8 +541,10 @@ fi
+ #set pg ref debugging?
+ AC_ARG_ENABLE([pgrefdebugging],
+ 	    [AS_HELP_STRING([--enable-pgrefdebugging], [enable pg ref debugging])],
+-			[AC_DEFINE([PG_DEBUG_REFS], [1], [Defined if you want pg ref debugging])],
+-			[])
++			[], [enable_pgrefdebugging=no])
++AS_IF([test "x$enable_pgrefdebugging" = "xyes"],
++	  [AC_DEFINE([PG_DEBUG_REFS], [1], [Defined if you want pg ref debugging])],
++	  [])
+ 
+ #
+ # Java is painful
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
new file mode 100644
index 00000000000..825d14c9fb1
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -0,0 +1,207 @@
+{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which
+, boost, python, pythonPackages, libxml2, git
+
+# Optional Dependencies
+, snappy ? null, leveldb ? null, yasm ? null, fcgi ? null, expat ? null
+, curl ? null, fuse ? null, accelio ? null, libibverbs ? null, librdmacm ? null
+, libedit ? null, libatomic_ops ? null, kinetic-cpp-client ? null
+, rocksdb ? null, libs3 ? null
+
+# Mallocs
+, jemalloc ? null, gperftools ? null
+
+# Crypto Dependencies
+, cryptopp ? null
+, nss ? null, nspr ? null
+
+# Linux Only Dependencies
+, linuxHeaders, libuuid, udev, keyutils, libaio ? null, libxfs ? null
+, zfs ? null
+
+# Version specific arguments
+, version, src, patches ? [], buildInputs ? []
+, ...
+}:
+
+# We must have one crypto library
+assert cryptopp != null || (nss != null && nspr != null);
+
+with stdenv.lib;
+let
+  mkFlag = trueStr: falseStr: cond: name: val:
+    if cond == null then null else
+      "--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
+  mkEnable = mkFlag "enable-" "disable-";
+  mkWith = mkFlag "with-" "without-";
+  mkOther = mkFlag "" "" true;
+
+  hasServer = snappy != null && leveldb != null;
+  hasMon = hasServer;
+  hasMds = hasServer;
+  hasOsd = hasServer;
+  hasRadosgw = fcgi != null && expat != null && curl != null && libedit != null;
+
+  hasXio = (stdenv.isLinux || stdenv.isFreeBSD) &&
+    versionAtLeast version "0.95" &&
+    accelio != null && libibverbs != null && librdmacm != null;
+
+  hasRocksdb = versionAtLeast version "0.95" && rocksdb != null;
+
+  # TODO: Reenable when kinetic support is fixed
+  hasKinetic = versionAtLeast version "0.95" && kinetic-cpp-client != null && false;
+
+  # Malloc implementation (can be jemalloc, tcmalloc or null)
+  malloc = if jemalloc != null then jemalloc else gperftools;
+
+  # We prefer nss over cryptopp
+  cryptoStr = if nss != null && nspr != null then "nss" else
+    if cryptopp != null then "cryptopp" else "none";
+  cryptoLibsMap = {
+    nss = [ nss nspr ];
+    cryptopp = [ cryptopp ];
+    none = [ ];
+  };
+
+  wrapArgs = "--prefix PYTHONPATH : \"$(toPythonPath $lib)\""
+    + " --prefix PYTHONPATH : \"$(toPythonPath ${python.modules.readline})\""
+    + " --prefix PYTHONPATH : \"$(toPythonPath ${pythonPackages.flask})\""
+    + " --prefix PATH : \"$out/bin\"";
+in
+stdenv.mkDerivation {
+  name="ceph-${version}";
+
+  inherit src;
+
+  patches = patches ++ [
+    ./0001-Makefile-env-Don-t-force-sbin.patch
+  ];
+
+  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which ];
+  buildInputs = buildInputs ++ cryptoLibsMap.${cryptoStr} ++ [
+    boost python libxml2 yasm libatomic_ops libs3 malloc pythonPackages.flask
+  ] ++ optional (versionAtLeast version "0.95") [
+    git                   # Used for the gitversion string
+    pythonPackages.sphinx # Used for docs
+  ] ++ optional stdenv.isLinux [
+    linuxHeaders libuuid udev keyutils libaio libxfs zfs
+  ] ++ optional hasServer [
+    snappy leveldb
+  ] ++ optional hasRadosgw [
+    fcgi expat curl fuse libedit
+  ] ++ optional hasXio [
+    accelio libibverbs librdmacm
+  ] ++ optional hasRocksdb [
+    rocksdb
+  ] ++ optional hasKinetic [
+    kinetic-cpp-client
+  ];
+
+  postPatch = ''
+    # Fix zfs pkgconfig detection
+    sed -i 's,\[zfs\],\[libzfs\],g' configure.ac
+
+    # Fix seagate kinetic linking
+    sed -i 's,libcrypto.a,-lcrypto,g' src/os/Makefile.am
+  '';
+
+  preConfigure = ''
+    # Ceph expects the arch command to be usable during configure
+    # for detecting the assembly type
+    mkdir mybin
+    echo "#${stdenv.shell} -e" >> mybin/arch
+    echo "uname -m" >> mybin/arch
+    chmod +x mybin/arch
+    PATH="$PATH:$(pwd)/mybin"
+
+    ./autogen.sh
+
+    # Fix the python site-packages install directory
+    sed -i "s,\(PYTHON\(\|_EXEC\)_PREFIX=\).*,\1'$lib',g" configure
+  '';
+
+  configureFlags = [
+    "--exec_prefix=\${out}"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--libdir=\${lib}/lib"
+    "--includedir=\${lib}/include"
+
+    (mkWith   true                         "rbd"               null)
+    (mkWith   true                         "cephfs"            null)
+    (mkWith   hasRadosgw                   "radosgw"           null)
+    (mkWith   true                         "radosstriper"      null)
+    (mkWith   hasServer                    "mon"               null)
+    (mkWith   hasServer                    "osd"               null)
+    (mkWith   hasServer                    "mds"               null)
+    (mkEnable true                         "client"            null)
+    (mkEnable hasServer                    "server"            null)
+    (mkWith   (cryptoStr == "cryptopp")    "cryptopp"          null)
+    (mkWith   (cryptoStr == "nss")         "nss"               null)
+    (mkEnable false                        "root-make-check"   null)
+    (mkWith   false                        "profiler"          null)
+    (mkWith   false                        "debug"             null)
+    (mkEnable false                        "coverage"          null)
+    (mkWith   (fuse != null)               "fuse"              null)
+    (mkWith   (malloc == jemalloc)         "jemalloc"          null)
+    (mkWith   (malloc == gperftools)       "tcmalloc"          null)
+    (mkEnable false                        "pgrefdebugging"    null)
+    (mkEnable false                        "cephfs-java"       null)
+    (mkEnable hasXio                       "xio"               null)
+    (mkWith   (libatomic_ops != null)      "libatomic-ops"     null)
+    (mkWith   true                         "ocf"               null)
+    (mkWith   hasKinetic                   "kinetic"           null)
+    (mkWith   hasRocksdb                   "librocksdb"        null)
+    (mkWith   false                        "librocksdb-static" null)
+    (mkWith   (libs3 != null)              "system-libs3"      null)
+    (mkWith   true                         "rest-bench"        null)
+  ] ++ optional stdenv.isLinux [
+    (mkWith   (libaio != null)             "libaio"            null)
+    (mkWith   (libxfs != null)             "libxfs"            null)
+    (mkWith   (zfs != null)                "libzfs"            null)
+  ];
+
+  installFlags = [ "sysconfdir=\${out}/etc" ];
+
+  outputs = [ "out" "lib" ];
+
+  postInstall = ''
+    # Wrap all of the python scripts
+    wrapProgram $out/bin/ceph ${wrapArgs}
+    wrapProgram $out/bin/ceph-brag ${wrapArgs}
+    wrapProgram $out/bin/ceph-rest-api ${wrapArgs}
+    wrapProgram $out/sbin/ceph-create-keys ${wrapArgs}
+    wrapProgram $out/sbin/ceph-disk ${wrapArgs}
+
+    # Bring in lib as a native build input
+    mkdir -p $out/nix-support
+    echo "$lib" > $out/nix-support/propagated-native-build-inputs
+
+    # Fix the python library loading
+    find $lib/lib -name \*.pyc -or -name \*.pyd -exec rm {} \;
+    for PY in $(find $lib/lib -name \*.py); do
+      LIBS="$(sed -n "s/.*find_library('\([^)]*\)').*/\1/p" "$PY")"
+
+      # Fix each find_library call
+      for LIB in $LIBS; do
+        REALLIB="$lib/lib/lib$LIB.so"
+        sed -i "s,find_library('$LIB'),'$REALLIB',g" "$PY"
+      done
+
+      # Reapply compilation optimizations
+      NAME=$(basename -s .py "$PY")
+      (cd "$(dirname $PY)"; python -c "import $NAME"; python -O -c "import $NAME")
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://ceph.com/;
+    description = "Distributed storage system";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ ak wkennington ];
+    platforms = with platforms; unix;
+  };
+
+  passthru.version = version;
+}
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
new file mode 100644
index 00000000000..8aa4bbd34bb
--- /dev/null
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -0,0 +1,11 @@
+{ callPackage, fetchgit, git, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "2015-04-22";
+
+  src = fetchgit {
+    url = "git://github.com/ceph/ceph.git";
+    rev = "89262abc53e324f3ef4d504473a4f1d6eb337c20";
+    sha256 = "0d6hlk1nwgx9cdhvppggz6sbjc1jl8j26l9739qspw1sviac5lcb";
+  };
+})
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index 0f9bff82967..409e7a8c36f 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    description = "Quickly find duplicate files.";
+    description = "Quickly find duplicate files";
     homepage = http://duff.dreda.org/;
     license = with licenses; zlib;
     longDescription = ''
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix
index 253f335ae4a..50242bb6388 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/pkgs/tools/filesystems/mp3fs/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "14ngiqg24p3a0s6hp33zjl4i46d8qn4v9id36psycq3n3csmwyx4";
   };
 
+  patches = [ ./fix-statfs-operation.patch ];
+
   buildInputs = [ flac fuse lame libid3tag pkgconfig ];
 
   enableParallelBuilding = true;
@@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
       which only understands the MP3 format, or transcode files through
       simple drag-and-drop in a file browser.
     '';
-    homepage = http://khenriks.github.com/mp3fs/;
+    homepage = http://khenriks.github.io/mp3fs/;
     license = with licenses; gpl3Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch b/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch
new file mode 100644
index 00000000000..9b3094e6005
--- /dev/null
+++ b/pkgs/tools/filesystems/mp3fs/fix-statfs-operation.patch
@@ -0,0 +1,39 @@
+From fea072084ff9d7c4d2c688059a2462bb0e59a2ec Mon Sep 17 00:00:00 2001
+From: K Henriksson <kthenriksson@gmail.com>
+Date: Wed, 27 Aug 2014 21:55:18 -0700
+Subject: [PATCH] Fix statfs operation
+
+The statfs implementation does not properly translate names back to the
+original, since the major encoding rewrite. This corrects that, and
+should fix issue #27.
+---
+ src/fuseops.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/fuseops.c b/src/fuseops.c
+index e7b4e7e..c333cbd 100644
+--- a/src/fuseops.c
++++ b/src/fuseops.c
+@@ -337,9 +337,20 @@ static int mp3fs_statfs(const char *path, struct statvfs *stbuf) {
+     if (!origpath) {
+         goto translate_fail;
+     }
+-    
++
++    /* pass-through for regular files */
++    if (statvfs(origpath, stbuf) == 0) {
++        goto passthrough;
++    } else {
++        /* Not really an error. */
++        errno = 0;
++    }
++
++    find_original(origpath);
++
+     statvfs(origpath, stbuf);
+-    
++
++passthrough:
+     free(origpath);
+ translate_fail:
+     return -errno;
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 718e941ec64..f10e05ac486 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -3,15 +3,15 @@
 
 stdenv.mkDerivation rec {
   pname = "ntfs-3g";
-  version = "2014.2.15";
+  version = "2015.3.14";
   name = "${pname}-${version}";
 
-  buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt];
+  buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ];
   nativeBuildInputs = stdenv.lib.optional crypto pkgconfig;
 
   src = fetchurl {
     url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
-    sha256 = "0mjv98m2j0kdzkjiqd2ra1akhb8milx8nwcx7hd26jxi1i09jc2c";
+    sha256 = "1wiqcmy07y02k3iqq56cscnhg5syisbjj9mxfaid85l3bl0rdycp";
   };
 
   patchPhase = ''
@@ -22,11 +22,14 @@ stdenv.mkDerivation rec {
       --replace /bin/umount ${utillinux}/bin/umount
   '';
 
-  configureFlags =
-    ''
-      --disable-ldconfig --exec-prefix=''${prefix} --enable-mount-helper
-      --enable-posix-acls --enable-xattr-mappings --${if crypto then "enable" else "disable"}-crypto
-    '';
+  configureFlags = [
+    "--disable-ldconfig"
+    "--exec-prefix=\${prefix}"
+    "--enable-mount-helper"
+    "--enable-posix-acls"
+    "--enable-xattr-mappings"
+    "--${if crypto then "enable" else "disable"}-crypto"
+  ];
 
   postInstall =
     ''
diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix
index 235b2b8381b..7dfbbf66c0a 100644
--- a/pkgs/tools/filesystems/reiser4progs/default.nix
+++ b/pkgs/tools/filesystems/reiser4progs/default.nix
@@ -1,20 +1,26 @@
 {stdenv, fetchurl, libaal}:
 
-stdenv.mkDerivation {
-  name = "reiser4progs-1.0.6";
+let version = "1.0.9"; in
+stdenv.mkDerivation rec {
+  name = "reiser4progs-${version}";
 
   src = fetchurl {
-    url = http://chichkin_i.zelnet.ru/namesys/reiser4progs-1.0.6.tar.gz;
-    sha256 = "0x6m6px19hz54r8q4wwpf437qmqh44c5ddw9846isr64zs2rpld0";
+    url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz";
+    sha256 = "0d6djyd7wjvzbqj738b2z4jr5c2s30g8q8xygipyi0007g42gc7z";
   };
 
   buildInputs = [libaal];
 
+  preConfigure = ''
+    substituteInPlace configure --replace " -static" ""
+  '';
+
   preInstall = ''
     substituteInPlace Makefile --replace ./run-ldconfig true
   '';
 
   meta = {
+    inherit version;
     homepage = http://www.namesys.com/;
     description = "Reiser4 utilities";
   };
diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix
index 0c5ec063b1a..899f9463951 100644
--- a/pkgs/tools/filesystems/reiserfsprogs/default.nix
+++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix
@@ -1,22 +1,18 @@
 { stdenv, fetchurl, libuuid }:
 
+let version = "3.6.24"; in
 stdenv.mkDerivation rec {
-  name = "reiserfsprogs-3.6.21";
+  name = "reiserfsprogs-${version}";
 
   src = fetchurl {
-    url = "http://ftp.be.debian.org/pub/linux/utils/fs/reiserfs/${name}.tar.bz2";
-    sha256 = "19mqzhh6jsf2gh8zr5scqi9pyk1fwivrxncd11rqnp2148c58jam";
+    url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${name}.tar.xz";
+    sha256 = "0q07df9wxxih8714a3mdp61h5n347l7j2a0l351acs3xapzgwi3y";
   };
 
   buildInputs = [ libuuid ];
 
-  postInstall =
-    ''
-      ln -s reiserfsck $out/sbin/fsck.reiserfs
-      ln -s mkreiserfs $out/sbin/mkfs.reiserfs
-    '';
-
   meta = {
+    inherit version;
     homepage = http://www.namesys.com/;
     description = "ReiserFS utilities";
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix
index 23340f88376..1d39108afb1 100644
--- a/pkgs/tools/filesystems/unionfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, cmake, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "unionfs-fuse-0.26";
+  name = "unionfs-fuse-${version}";
+  version = "1.0";
 
   src = fetchurl {
-    url = "http://podgorny.cz/unionfs-fuse/releases/${name}.tar.xz";
-    sha256 = "0qpnr4czgc62vsfnmv933w62nq3xwcbnvqch72qakfgca75rsp4d";
+    url = "https://github.com/rpodgorny/unionfs-fuse/archive/v${version}.tar.gz";
+    sha256 = "02fcrjb06lxkxpk4l8arsqmai807sray24lj2nrasqaacg80ps1f";
   };
 
   patches =
diff --git a/pkgs/tools/filesystems/zfstools/default.nix b/pkgs/tools/filesystems/zfstools/default.nix
index 1c1be59f515..16df5331476 100644
--- a/pkgs/tools/filesystems/zfstools/default.nix
+++ b/pkgs/tools/filesystems/zfstools/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, ruby, zfs }:
+{ stdenv, fetchFromGitHub, ruby, zfs }:
 
 stdenv.mkDerivation rec {
   name = "zfstools-${version}";
 
-  version = "0.3.1";
+  version = "0.3.2";
 
-  src = fetchgit {
-    url = https://github.com/bdrewery/zfstools.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "0bhs0gn1f4z1jm631vp26sbysy4crq489q56rxqfd8ns1xsp1f5j";
+  src = fetchFromGitHub {
+    sha256 = "1dzfir9413qrmx9kqpndi3l2m09f6l1wspnwn84lm3n1g9cr46nd";
+    rev = "v${version}";
+    repo = "zfstools";
+    owner = "bdrewery";
   };
 
   buildInputs = [ ruby ];
@@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
+    inherit version;
     homepage = https://github.com/bdrewery/zfstools;
     description = "OpenSolaris-like and compatible auto snapshotting script for ZFS";
     longDescription = ''
diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix
index 826f1a56055..10309d208d8 100644
--- a/pkgs/tools/graphics/pdf2svg/default.nix
+++ b/pkgs/tools/graphics/pdf2svg/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation {
     homepage = http://www.cityinthesky.co.uk/opensource/pdf2svg;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.ianwookim ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
new file mode 100644
index 00000000000..35b13448b59
--- /dev/null
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, nasm }:
+
+let
+  arch =
+    if      stdenv.system == "x86_64-linux" then "bandwidth64"
+    else if stdenv.system == "i686-linux" then "bandwidth32"
+    else if stdenv.system == "x86_64-darwin" then "bandwidth-mac64"
+    else if stdenv.system == "i686-darwin" then "bandwidth-mac32"
+    else if stdenv.system == "i686-cygwin" then "bandwidth-win32"
+    else null;
+in
+stdenv.mkDerivation rec {
+  name = "bandwidth-1.1b";
+
+  src = fetchurl {
+    url = "http://zsmith.co/archives/${name}.tar.gz";
+    sha256 = "01c3ca0x3rh65j1s2g6cg5xr9fvm0lp2wpmv71vhz55xwqqqmiz8";
+  };
+
+  buildInputs = [ nasm ];
+
+  buildFlags = [ arch ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${arch} $out/bin
+    ln -s ${arch} $out/bin/bandwidth
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://zsmith.co/bandwidth.html;
+    description = "and artificial benchmark for identifying weaknesses in the memory subsystem";
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ wkennington ];
+  };
+}
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 49e158ea2d0..a6e383df91a 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -1,20 +1,22 @@
 {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
-  , FileDesktopEntry, libxslt, docbook_xsl, python, setuptools, makeWrapper
+, FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper
+, perlPackages
 }:
 stdenv.mkDerivation rec {
-  version = "2.12.4";
+  version = "2.15.3";
   name = "debian-devscripts-${version}";
   src = fetchurl {
-    url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.gz";
-    sha256 = "34bcbec78bd4fe34d9f1326b9d1477ff2410e20e2dca6b7bfbf2bf92dbb83904";
+    url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
+    sha256 = "f589e2e02c5e9a46a77b2516155631ac3ddfd8a39bcfc16c920862583850bc7d";
   };
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 
-    FileDesktopEntry libxslt python setuptools makeWrapper ];
+    FileDesktopEntry libxslt python3 setuptools makeWrapper
+    perlPackages.ParseDebControl ];
   preConfigure = ''
     export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
     sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
     sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile
-    tgtpy="$out/lib/${python.libPrefix}/site-packages"
+    tgtpy="$out/lib/${python3.libPrefix}/site-packages"
     mkdir -p "$tgtpy"
     export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
     sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile*
@@ -25,7 +27,8 @@ stdenv.mkDerivation rec {
     for i in "$out/bin"/*; do
       wrapProgram "$i" \
         --prefix PERL5LIB : "$PERL5LIB" \
-        --prefix PERL5LIB : "$out/share/devscripts"
+        --prefix PERL5LIB : "$out/share/devscripts" \
+        --prefix PYTHONPATH : "$out/lib/python3.4/site-packages"
     done
   '';
   meta = {
diff --git a/pkgs/tools/misc/fluentd/Gemfile b/pkgs/tools/misc/fluentd/Gemfile
index 41c5bde1acc..8c9dd3aa0a0 100644
--- a/pkgs/tools/misc/fluentd/Gemfile
+++ b/pkgs/tools/misc/fluentd/Gemfile
@@ -2,3 +2,4 @@ source "https://rubygems.org"
 
 gem 'fluentd'
 gem 'fluent-plugin-elasticsearch'
+gem 'fluent-plugin-record-reformer'
diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock
index ba4cc4bb4a8..4f51d365513 100644
--- a/pkgs/tools/misc/fluentd/Gemfile.lock
+++ b/pkgs/tools/misc/fluentd/Gemfile.lock
@@ -16,6 +16,8 @@ GEM
       elasticsearch
       fluentd (>= 0.10.43)
       patron (~> 0)
+    fluent-plugin-record-reformer (0.6.0)
+      fluentd
     fluentd (0.12.6)
       cool.io (>= 1.2.2, < 2.0.0)
       http_parser.rb (>= 0.5.1, < 0.7.0)
@@ -46,4 +48,5 @@ PLATFORMS
 
 DEPENDENCIES
   fluent-plugin-elasticsearch
+  fluent-plugin-record-reformer
   fluentd
diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix
index b659dafddeb..cfc1e9ab564 100644
--- a/pkgs/tools/misc/fluentd/default.nix
+++ b/pkgs/tools/misc/fluentd/default.nix
@@ -11,7 +11,7 @@ bundlerEnv {
   buildInputs = [ curl ];
 
   meta = with lib; {
-    description = "Fluentd data collector.";
+    description = "A data collector";
     homepage    = http://www.fluentd.org/;
     license     = with licenses; asl20;
     maintainers = with maintainers; [ offline ];
diff --git a/pkgs/tools/misc/fluentd/gemset.nix b/pkgs/tools/misc/fluentd/gemset.nix
index 4d0072c6afe..84577c03587 100644
--- a/pkgs/tools/misc/fluentd/gemset.nix
+++ b/pkgs/tools/misc/fluentd/gemset.nix
@@ -60,6 +60,16 @@
       "patron"
     ];
   };
+  "fluent-plugin-record-reformer" = {
+    version = "0.6.0";
+    source = {
+      type = "gem";
+      sha256 = "1h43xx7dypbrhdw22c28jsp3054g4imic2wd12rl5nf1k85phfkk";
+    };
+    dependencies = [
+      "fluentd"
+    ];
+  };
   "fluentd" = {
     version = "0.12.6";
     source = {
diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 3e1fa21fd56..501c6820df2 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake
+{ stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper
 , zfs ? null
 , efiSupport ? false
@@ -20,7 +20,7 @@ let
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.02-git-2ae9457";
+  version = "2.02-git-2015-04-24";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -41,10 +41,10 @@ assert zfsSupport -> zfs != null;
 stdenv.mkDerivation rec {
   name = "grub-${version}";
 
-  src = fetchgit {
-    url = "git://git.savannah.gnu.org/grub.git";
-    rev = "2ae9457e6eb4c352051fb32bc6fc931a22528ab2";
-    sha256 = "1ik60qgkymg0xdns5az1hbxasspah2vzxg334rpbk2yy3h3nx5ln";
+  src = fetchFromSavannah {
+    repo = "grub";
+    rev = "70b002de55abbfd6b2d2f2ea4408078d93c9e0de";
+    sha256 = "1bhm1yxjmckzn45v70lzmz0qpj5prhb4iyiyqqw8rvyykcixw5qk";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index f7790fd3468..7924615201e 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "less-471";
+  name = "less-475";
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
-    sha256 = "1y17zfrn91fs71jry5gp9ibj7darglhr42krimw7hqsjkbx17xip";
+    sha256 = "1w7d10h6hzgz5zww8g4aja2fbl7xwx30vd07hcg1fcy7hm8yc1q2";
   };
 
   # Look for ‘sysless’ in /etc.
   configureFlags = "--sysconfdir=/etc";
 
+  preConfigure = "chmod +x ./configure";
+
   buildInputs = [ ncurses ];
 
   meta = {
diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 5a42a5d8515..843672fa26c 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB";
 
   meta = {
-    description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young.";
+    description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young";
     homepage = https://joeyh.name/code/moreutils/;
     maintainers = with maintainers; [ koral ];
   };
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index b8182cff862..aa0be62ed64 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -89,7 +89,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://pipelight.net/";
-    licenses = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ];
+    license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ];
     description = "A wrapper for using Windows plugins in Linux browsers";
     maintainers = with stdenv.lib.maintainers; [skeidel];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index 21643a9d11a..aed93775ce9 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   installPhase = "scons --prefix=$out install";
 
   meta = {
-    description = "Extremely fast tool to remove duplicates and other lint from your filesystem.";
+    description = "Extremely fast tool to remove duplicates and other lint from your filesystem";
     homepage = http://rmlint.readthedocs.org;
     platforms = platforms.linux;
     license = licenses.gpl3;
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index d85da36f7ee..a30f0277ec0 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.10.2015.01.28";
+  version = "0.10.2015.03.25";
 
   src = fetchurl {
     url = "https://github.com/spaam/svtplay-dl/archive/${version}.tar.gz";
-    sha256 = "0hjqhb4s0qpw2l7azcqmckbdc4mcvczp0w1dfk125n01z0w9c20c";
+    sha256 = "0j0fg3qrldpaf880v488rr2snw6ghpdln4l9mbvmi70rjzzxv4ap";
   };
 
   pythonPaths = [ pycrypto ];
diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix
index 10db8764f89..fd64f6694ee 100644
--- a/pkgs/tools/misc/t/default.nix
+++ b/pkgs/tools/misc/t/default.nix
@@ -9,7 +9,7 @@ bundlerEnv {
   gemset = ./gemset.nix;
 
   meta = with lib; {
-    description = "A command-line power tool for Twitter.";
+    description = "A command-line power tool for Twitter";
     homepage    = http://sferik.github.io/t/;
     license     = with licenses; asl20;
     maintainers = with maintainers; [ offline ];
diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix
index b95dfde9850..accd3b8070a 100644
--- a/pkgs/tools/misc/usbmuxd/default.nix
+++ b/pkgs/tools/misc/usbmuxd/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, fetchurl, cmake, libplist, libusb1, pkgconfig }:
+{ stdenv, fetchurl, libplist, libusb1, pkgconfig, libimobiledevice }:
 
 stdenv.mkDerivation rec {
-  name = "usbmuxd-1.0.7";
+  name = "usbmuxd-${version}";
+  version = "1.1.0";
 
   src = fetchurl {
-    url = "http://marcansoft.com/uploads/usbmuxd/${name}.tar.bz2";
-    sha256 = "09swwr6x46qxmwylrylnyqh4pznr0swla9gijggwxxw8dw82r840";
+    url = "http://www.libimobiledevice.org/downloads/${name}.tar.bz2";
+    sha256 = "0bdlc7a8plvglqqx39qqampqm6y0hcdws76l9dffwl22zss4i29y";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
-  propagatedBuildInputs = [ libusb1 libplist ];
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ libusb1 libplist libimobiledevice ];
 
-  patchPhase =
-    ''
-    sed -e 's,/lib/udev,lib/udev,' -i udev/CMakeLists.txt
-    sed -e 's,/bin/echo,echo,g' -i Modules/describe.sh
-    '';
+  preConfigure = ''
+    configureFlags="$configureFlags --with-udevrulesdir=$out/lib/udev/rules.d"
+    configureFlags="$configureFlags --with-systemdsystemunitdir=$out/lib/systemd/system"
+  '';
 
-
-  cmakeFlags = ''-DLIB_SUFFIX='';
   meta = {
     homepage = http://marcansoft.com/blog/iphonelinux/usbmuxd/;
     description = "USB Multiplex Daemon (for talking to iPhone or iPod)";
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index e602ee5f412..569d84bd72e 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -2,7 +2,7 @@
 
 let
   version = "16"; # see ${src}/util/version/Version.h
-  date = "20150308";
+  date = "20150422";
 in
 stdenv.mkDerivation {
   name = "cjdns-${version}-${date}";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "cjdelisle";
     repo = "cjdns";
-    rev = "dc7eaf676cb83f13ba3e76a1bd0f2e093e6d6e1b";
-    sha256 = "1llhv9kflh4rzv9b9qq9zhrckcc6a7xs0dp147adwmaxqjj8v601";
+    rev = "78e13484b6639adacefc62eb7cf93ef7db4a936f";
+    sha256 = "1l1c43r11mj4c8is24988yfycw74flgv7qvc2cfhlisz7fhgfkds";
   };
 
   buildInputs = [ which python27 nodejs ] ++
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 08c00fc4b34..713fe40c189 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,4 +1,6 @@
 { stdenv, fetchurl
+, idnSupport ? false, libidn ? null
+, ldapSupport ? false, openldap ? null
 , zlibSupport ? false, zlib ? null
 , sslSupport ? false, openssl ? null
 , scpSupport ? false, libssh2 ? null
@@ -6,23 +8,27 @@
 , c-aresSupport ? false, c-ares ? null
 }:
 
+assert idnSupport -> libidn != null;
+assert ldapSupport -> openldap != null;
 assert zlibSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.41.0";
+  name = "curl-7.42.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1slbbxp2k8m34mdzrl5qhafr5zhhcv7fgjhs2mcxjmswvimm92wz";
+    sha256 = "13yhcqfksy2vwc4sjv97nv3cbd2pb2a8lnvv8g46qp1gail7sm9j";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.
   propagatedBuildInputs = with stdenv.lib;
+    optional idnSupport libidn ++
+    optional ldapSupport openldap ++
     optional zlibSupport zlib ++
     optional gssSupport gss ++
     optional c-aresSupport c-ares ++
@@ -43,6 +49,9 @@ stdenv.mkDerivation rec {
   configureFlags = [
       ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
       ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
+      ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
+      ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
+      ( if idnSupport then "--with-libidn=${libidn}" else "--without-libidn" )
     ]
     ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
     ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}";
diff --git a/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch b/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch
new file mode 100644
index 00000000000..d1ef9e024d2
--- /dev/null
+++ b/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch
@@ -0,0 +1,20 @@
+diff -u ddclient-3.8.1/ddclient ddclient-3.8.1.patched/ddclient
+--- ddclient-3.8.1/ddclient	2011-07-11 23:04:21.000000000 +0200
++++ ddclient-3.8.1.patched/ddclient	2012-11-08 11:52:31.930647236 +0100
+@@ -19,6 +19,7 @@ use strict;
+ use Getopt::Long;
+ use Sys::Hostname;
+ use IO::Socket;
++use IO::Handle qw( );
+ 
+ my ($VERSION) = q$Revision: 157 $ =~ /(\d+)/;
+ 
+@@ -675,7 +676,7 @@ $SIG{'TERM'}   = sub { $caught_term = 1; };
+ $SIG{'KILL'}   = sub { $caught_kill = 1; };
+ # don't fork() if foreground or force is on
+ if (opt('foreground') || opt('force')) {
+-    ;
++    STDOUT->autoflush(1);
+ } elsif (opt('daemon')) {
+     $SIG{'CHLD'}   = 'IGNORE';
+     my $pid = fork;
diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index fdc5e145c4d..41688d84351 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -10,7 +10,7 @@ buildPerlPackage {
 
   buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ];
 
-  patches = [ ./ddclient-foreground.patch ];
+  patches = [ ./ddclient-foreground.patch ./ddclient-line-buffer-stdout.patch ];
 
   # Use iproute2 instead of ifconfig
   preConfigure = '' 
diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix
index 15422d81f41..0cbf41754c3 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -2,11 +2,11 @@
 sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }:
 
 stdenv.mkDerivation rec {
-  name = "dropbear-2014.66";
+  name = "dropbear-2015.67";
 
   src = fetchurl {
     url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2";
-    sha256 = "0xmbcjm2pbhih459667wy8acs4nax4amvzwqwfxw0z2i19ky4gxb";
+    sha256 = "1rf8k3v0bklp04a6x85zpa4f45ad5rfqmiv5f1wfbzaxcja0asby";
   };
 
   dontDisableStatic = enableStatic;
@@ -31,10 +31,6 @@ stdenv.mkDerivation rec {
     # Allow sessions to inherit the PATH from the parent dropbear.
     # Otherwise they only get the usual /bin:/usr/bin kind of PATH
     ./pass-path.patch
-
-    # Bugfix
-    # http://article.gmane.org/gmane.network.ssh.dropbear/1361
-    ./proxycrash.patch
   ];
 
   buildInputs = [ zlib ];
diff --git a/pkgs/tools/networking/dropbear/proxycrash.patch b/pkgs/tools/networking/dropbear/proxycrash.patch
deleted file mode 100644
index 1a17e7e3c62..00000000000
--- a/pkgs/tools/networking/dropbear/proxycrash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -r 5ba19d00da08 cli-runopts.c
---- a/cli-runopts.c	Sun May 26 18:43:00 2013 +0800
-+++ b/cli-runopts.c	Mon Jun 17 19:51:08 2013 +0000
-@@ -383,6 +383,13 @@
- 		exit(EXIT_FAILURE);
- 	}
-
-+#ifdef ENABLE_CLI_PROXYCMD
-+	if (cli_opts.proxycmd) {
-+		/* To match the common path of m_freeing it */
-+		cli_opts.proxycmd = m_strdup(cli_opts.proxycmd);
-+	}
-+#endif
-+
- 	if (cli_opts.remoteport == NULL) {
- 		cli_opts.remoteport = "22";
- 	}
diff --git a/pkgs/tools/networking/eggdrop/default.nix b/pkgs/tools/networking/eggdrop/default.nix
index 13efc944bd0..cf7fb20df68 100644
--- a/pkgs/tools/networking/eggdrop/default.nix
+++ b/pkgs/tools/networking/eggdrop/default.nix
@@ -1,14 +1,15 @@
-{stdenv, fetchurl, tcl}:
+{ stdenv, fetchurl, tcl }:
 
-stdenv.mkDerivation {
-  name = "eggdrop-1.6.19+ctcpfix";
+stdenv.mkDerivation rec {
+  name = "eggdrop-${version}";
+  version = "1.6.21";
 
   src = fetchurl {
-    url = ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/eggdrop1.6.19+ctcpfix.tar.gz;
-    sha256 = "1lpa6sqwizn8y30i14559j3427vi743pmsxjq9g70x4m71hmshvi";
+    url = "ftp://ftp.eggheads.org/pub/eggdrop/GNU/1.6/eggdrop${version}.tar.gz";
+    sha256 = "1galvbh9y4c3msrg1s9na0asm077mh1g2i2vsv1vczmfrbgq92vs";
   };
 
-  buildInputs = [tcl]; 
+  buildInputs = [ tcl ];
 
   preConfigure = ''
     prefix=$out/eggdrop
@@ -19,5 +20,13 @@ stdenv.mkDerivation {
     make config
   '';
 
-  configureFlags = "--with-tcllib=${tcl}/lib/libtcl8.5.so --with-tclinc=${tcl}/include/tcl.h";
+  configureFlags = [
+    "--with-tcllib=${tcl}/lib/lib${tcl.libPrefix}.so"
+    "--with-tclinc=${tcl}/include/tcl.h"
+  ];
+
+  meta = with stdenv.lib; {
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+  };
 }
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
new file mode 100644
index 00000000000..fcb3e903753
--- /dev/null
+++ b/pkgs/tools/networking/hans/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, nettools }:
+
+let version = "0.4.4"; in
+stdenv.mkDerivation rec {
+  name = "hans-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1xskffmmdmg1whlrl5wpkv9z29vh0igrbmsz0b45s9v0761a7kis";
+    rev = "v${version}";
+    repo = "hans";
+    owner = "friedrich";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Tunnel IPv4 over ICMP";
+    longDescription = ''
+      Hans makes it possible to tunnel IPv4 through ICMP echo packets, so you
+      could call it a ping tunnel. This can be useful when you find yourself in
+      the situation that your Internet access is firewalled, but pings are
+      allowed.
+    '';
+    homepage = http://code.gerade.org/hans/;
+    license = with licenses; gpl3Plus;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  buildInputs = [ nettools ];
+
+  postPatch = ''
+    substituteInPlace src/tun.cpp --replace "/sbin/" "/${nettools}/bin/"
+  '';
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    install -D -m0755 hans $out/bin/hans
+  '';
+}
diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix
index aa2574fbc1d..23322d5b8f2 100644
--- a/pkgs/tools/networking/hping/default.nix
+++ b/pkgs/tools/networking/hping/default.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
     description = "A command-line oriented TCP/IP packet assembler/analyzer";
     homepage = "http://www.hping.org/";
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index 7e9906e7971..9243550a1b1 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -1,26 +1,27 @@
-{ stdenv, fetchurl, gettext }:
+{ stdenv, fetchurl, gettext, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "httping-${version}";
 
-  version = "2.3.4";
+  version = "2.4";
 
   src = fetchurl {
-    url = "http://www.vanheusden.com/httping/httping-2.3.4.tgz";
-    sha256 = "1hkbhdxb0phrvrddx9kcfpqlzm41xv9jvy82nfkqa7bb0v5p2qd7";
+    url = "http://www.vanheusden.com/httping/${name}.tgz";
+    sha256 = "1110r3gpsj9xmybdw7w4zkhj3zmn5mnv2nq0ijbvrywbn019zdfs";
   };
 
-  buildInputs = [ gettext ];
+  buildInputs = [ gettext ncurses ];
 
   makeFlags = [
     "DESTDIR=$(out)"
     "PREFIX="
   ];
 
-  meta = {
-    homepage = "http://www.vanheusden.com/httping";
-    description = "ping for HTTP requests";
-    maintainers = with stdenv.lib.maintainers; [ rickynils ];
-    platforms = with stdenv.lib.platforms; linux;
+  meta = with stdenv.lib; {
+    inherit version;
+    homepage = http://www.vanheusden.com/httping;
+    description = "ping with HTTP requests";
+    maintainers = with maintainers; [ nckx rickynils ];
+    platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 088e8e8de7f..b5ef06c34ea 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,15 +1,12 @@
-{ stdenv, procps, coreutils, fetchurl, openjdk8, ant, gcj, gettext }:
-
-# TODO: support other systems, just copy appropriate lib/wrapper.. to $out
-assert stdenv.system != "x86_64-linux";
+{ stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.18";
+  name = "i2p-0.9.19";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1hahdzvfh1zqb8qdc59xbjpqm8qq95k2xx22mpnhcdh90lb6xqnl";
+    sha256 = "1q9sda1a708laxf452qnzbfv7bwfwyam5n1giw2n3z3ar602i936";
   };
-  buildInputs = [ openjdk8 ant gcj gettext ];
+  buildInputs = [ jdk ant gettext which ];
   buildPhase = ''
     export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
     ant preppkg-linux-only
@@ -24,7 +21,11 @@ stdenv.mkDerivation rec {
       -e "s#/usr/ucb/ps#${procps}/bin/ps#" \
       -e "s#/usr/bin/tr#${coreutils}/bin/tr#" \
       -e 's#%USER_HOME#$HOME#' \
-      -e "s#%SYSTEM_java_io_tmpdir#/tmp#"
+      -e "s#%SYSTEM_java_io_tmpdir#/tmp#" \
+      -e 's#JAVA=java#JAVA=${jre}/bin/java#'
+    sed -i $out/runplain.sh \
+      -e "s#nohup \(.*Launch\) .*#\1#" \
+      -e "s#echo \$\! .*##"
     mv $out/runplain.sh $out/bin/i2prouter-plain
     mv $out/man $out/share/
     chmod +x $out/bin/* $out/i2psvc
@@ -35,7 +36,8 @@ stdenv.mkDerivation rec {
     homepage = "https://geti2p.net";
     description = "Applications and router for I2P, anonymity over the Internet";
     maintainers = [ stdenv.lib.maintainers.joelmo ];
-    licenses = licenses.gpl2;
-    platforms = platforms.linux;
+    license = licenses.gpl2;
+    # TODO: support other systems, just copy appropriate lib/wrapper.. to $out
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 984e91e255f..f1b32ddb7e7 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = "https://track.privacysolutions.no/projects/i2pd";
     description = "Minimal I2P router written in C++";
-    licenses = licenses.gpl2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index 9901a1e2a96..1e1f1bd8b76 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.6.0";
+  name = "lftp-4.6.1";
 
   src = fetchurl {
     urls = [
       "http://lftp.yar.ru/ftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "1liry2icaqyn9zlp7w6sykp3nyqsn172xnqglhvr6awz23r3b1fr";
+    sha256 = "0w9nb24abqlnjzi30q8s0yv3h0zjxhynliyxwdgnrv0qag0k401s";
   };
 
   patches = [ ./no-gets.patch ];
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 924eb2f9f42..2104768e3b9 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -3,12 +3,12 @@
 , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.11";
+  version = "0.9.12";
   name = "mu-${version}";
 
   src = fetchurl {
     url = "https://github.com/djcb/mu/archive/v${version}.tar.gz";
-    sha256 = "01n1lzq4pfsm5pn932p948d1z55yqc7kkm1ifjxjchb3k8lr66fh";
+    sha256 = "1bxryacmas2llj68m2dv8dr1vwx8f5k2i2azh69jajkpqx7i4wdq";
   };
 
   buildInputs =
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 196c176018a..0830871c0cd 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,15 +2,16 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-stdenv.mkDerivation rec {
-  version = "v0.5.9-rc4-53-gdd5d906";
+let version = "v0.5.9-rc5"; in
+stdenv.mkDerivation {
   name = "netsniff-ng-${version}";
 
-  src = fetchFromGitHub rec { # Upstream recommends and supports git
+  # Upstream recommends and supports git
+  src = fetchFromGitHub rec {
     repo = "netsniff-ng";
     owner = repo;
-    rev = "dd5d906c40db5264d8d33c37565b39540f0258c8";
-    sha256 = "0iwnfjbxiv10zk5mfpnvs2xb88f14hv1a156kn9mhasszknp0a57";
+    rev = "76f4acca4bef1658543a97475f1c1d83accc395c";
+    sha256 = "11k88lsdqy41j4xwyx3vq85zjj4n39hj828f1b6naq1ywyfcvmr5";
   };
 
   buildInputs = [ bison flex geoip geolite-legacy libcli libnet libnl
@@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Swiss army knife for daily Linux network plumbing";
     longDescription = ''
       netsniff-ng is a free Linux networking toolkit. Its gain of performance
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 56c0dd1363a..1ea61b0fea2 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3
-, libnotify, libsecret, dbus_glib, polkit, isocodes, libgnome_keyring 
+, libnotify, libsecret, dbus_glib, polkit, isocodes
 , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas
-, makeWrapper, networkmanager_openvpn, networkmanager_vpnc
-, networkmanager_openconnect, networkmanager_pptp, networkmanager_l2tp
-, udev, hicolor_icon_theme, dconf }:
+, makeWrapper, udev, hicolor_icon_theme }:
 
 let
   pn = "network-manager-applet";
-  major = "0.9";
+  major = "1.0";
   version = networkmanager.version;
 in
 
@@ -16,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
-    sha256 = "1jz0vawfixzm892m6plrzhsybgdxwv96pfwld9p85lb7wshykzj6";
+    sha256 = "0liia390bhkl09lvk2rplcwhmfbxpjffa1xszfawc0h00v9fivaz";
   };
 
   buildInputs = [
@@ -32,30 +30,9 @@ stdenv.mkDerivation rec {
     ''CFLAGS=-DMOBILE_BROADBAND_PROVIDER_INFO=\"${mobile_broadband_provider_info}/share/mobile-broadband-provider-info/serviceproviders.xml\"''
   ];
 
-  postInstall = ''
-    mkdir -p $out/etc/NetworkManager/VPN
-    ln -s ${networkmanager_openvpn}/etc/NetworkManager/VPN/nm-openvpn-service.name $out/etc/NetworkManager/VPN/nm-openvpn-service.name
-    ln -s ${networkmanager_vpnc}/etc/NetworkManager/VPN/nm-vpnc-service.name $out/etc/NetworkManager/VPN/nm-vpnc-service.name
-    ln -s ${networkmanager_openconnect}/etc/NetworkManager/VPN/nm-openconnect-service.name $out/etc/NetworkManager/VPN/nm-openconnect-service.name
-    ln -s ${networkmanager_pptp}/etc/NetworkManager/VPN/nm-pptp-service.name $out/etc/NetworkManager/VPN/nm-pptp-service.name
-    ln -s ${networkmanager_l2tp}/etc/NetworkManager/VPN/nm-l2tp-service.name $out/etc/NetworkManager/VPN/nm-l2tp-service.name
-    mkdir -p $out/lib/NetworkManager
-    ln -s ${networkmanager_openvpn}/lib/NetworkManager/* $out/lib/NetworkManager/
-    ln -s ${networkmanager_vpnc}/lib/NetworkManager/* $out/lib/NetworkManager/
-    ln -s ${networkmanager_openconnect}/lib/NetworkManager/* $out/lib/NetworkManager/
-    ln -s ${networkmanager_pptp}/lib/NetworkManager/* $out/lib/NetworkManager/
-    ln -s ${networkmanager_l2tp}/lib/NetworkManager/* $out/lib/NetworkManager/
-    mkdir -p $out/libexec
-    ln -s ${networkmanager_openvpn}/libexec/* $out/libexec/
-    ln -s ${networkmanager_vpnc}/libexec/* $out/libexec/
-    ln -s ${networkmanager_openconnect}/libexec/* $out/libexec/
-    ln -s ${networkmanager_pptp}/libexec/* $out/libexec/
-    ln -s ${networkmanager_l2tp}/libexec/* $out/libexec/
-  '';
-
   preFixup = ''
     wrapProgram "$out/bin/nm-applet" \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
       --prefix PATH ":" "${gnome3.gconf}/bin"
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 505f42d2f3d..c39d1a9f5ba 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,19 +1,22 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
 , udev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
-, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll
-, gobjectIntrospection, modemmanager, openresolv }:
+, libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
+, gobjectIntrospection, modemmanager, openresolv, libndp }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "0.9.8.10";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
-    sha256 = "0wn9qh8r56r8l19dqr68pdl1rv3zg1dv47rfy6fqa91q7li2fk86";
+    url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz";
+    sha256 = "0isrv1875whysnrf3fd1cz96xwd54nvj1rijk3fmx5qccznayris";
   };
 
   preConfigure = ''
     substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
+    substituteInPlace src/ppp-manager/nm-ppp-manager.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
+    substituteInPlace src/devices/nm-device.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
+    configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
   '';
 
   # Right now we hardcode quite a few paths at build time. Probably we should
@@ -21,12 +24,13 @@ stdenv.mkDerivation rec {
   # remove unneeded build-time dependencies.
   configureFlags = [
     "--with-distro=exherbo"
-    "--with-dhclient=${dhcp}/sbin/dhclient"
+    "--with-dhclient=${dhcp}/bin/dhclient"
     # Upstream prefers dhclient, so don't add dhcpcd to the closure
     #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"
     "--with-dhcpcd=no"
-    "--with-iptables=${iptables}/sbin/iptables"
-    "--with-udev-dir=\${out}/lib/udev"
+    "--with-pppd=${ppp}/bin/pppd"
+    "--with-iptables=${iptables}/bin/iptables"
+    #"--with-udev-dir=$(out)/lib/udev"
     "--with-resolvconf=${openresolv}/sbin/resolvconf"
     "--sysconfdir=/etc" "--localstatedir=/var"
     "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
@@ -37,21 +41,13 @@ stdenv.mkDerivation rec {
     "--with-modem-manager-1"
   ];
 
-  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz bluez5 gobjectIntrospection modemmanager ];
+  buildInputs = [ wirelesstools udev libnl libuuid polkit ppp libndp
+                  xz bluez5 gobjectIntrospection modemmanager readline ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
-  patches =
-    [ ( substituteAll {
-        src = ./nixos-purity.patch;
-        inherit avahi dnsmasq ppp bind;
-        glibc = stdenv.cc.libc;
-      })
-      ./libnl-3.2.25.patch
-    ];
-
   preInstall =
     ''
       installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" )
@@ -66,7 +62,6 @@ stdenv.mkDerivation rec {
 
       # rename to network-manager to be in style
       mv $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/network-manager.service 
-      echo "Alias=NetworkManager.service" >> $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
 
       # systemd in NixOS doesn't use `systemctl enable`, so we need to establish
       # aliases ourselves.
diff --git a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch b/pkgs/tools/networking/network-manager/libnl-3.2.25.patch
deleted file mode 100644
index 17c2966b706..00000000000
--- a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
-index ba8053e..5ac39d3 100644
---- a/src/nm-netlink-monitor.c
-+++ b/src/nm-netlink-monitor.c
-@@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg)
- static int
- event_msg_recv (struct nl_msg *msg, void *arg)
- {
--	struct nl_sock *nlh = arg;
--	struct nlmsghdr *hdr = nlmsg_hdr (msg);
- 	struct ucred *creds = nlmsg_get_creds (msg);
--	const struct sockaddr_nl *snl;
--	guint32 local_port;
--	gboolean accept_msg = FALSE;
--
--	/* Only messages sent from the kernel */
--	if (!creds || creds->uid != 0) {
--		nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d",
--		            creds ? creds->uid : -1);
--		return NL_SKIP;
--	}
--
--	snl = nlmsg_get_src (msg);
--	g_assert (snl);
--
--	/* Accept any messages from the kernel */
--	if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0)
--		accept_msg = TRUE;
- 
--	/* And any multicast message directed to our netlink PID, since multicast
--	 * currently requires CAP_ADMIN to use.
--	 */
--	local_port = nl_socket_get_local_port (nlh);
--	if ((hdr->nlmsg_pid == local_port) && snl->nl_groups)
--		accept_msg = TRUE;
--
--	if (accept_msg == FALSE) {
--		nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)",
--		            hdr->nlmsg_pid,
--		            local_port,
--		            (hdr->nlmsg_flags & NLM_F_MULTI));
--		return NL_SKIP;
-+	if (!creds || creds->pid || creds->uid || creds->gid) {
-+		if (creds)
-+			nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)",
-+			            creds->pid, creds->uid, creds->gid);
-+		else
-+			nm_log_dbg (LOGD_HW, "netlink: received message without credentials");
-+		return NL_STOP;
- 	}
- 
- 	return NL_OK;
-@@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh,
- {
- 	int err;
- 
--	nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data);
-+	nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL);
- 
- 	if (valid_func)
- 		nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data);
diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix
index cc6532bac71..79e12244732 100644
--- a/pkgs/tools/networking/network-manager/openconnect.nix
+++ b/pkgs/tools/networking/network-manager/openconnect.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager
+{ stdenv, fetchurl, openconnect, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-openconnect";
-  version = "0.9.8.4";
+  version = networkmanager.version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1dl7wcmibrzf9qnpchgk9fxfhw0j2hzzzqmylkm2c41iv81xrd4r";
+    url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";
+    sha256 = "0przs8hzvb6wrf4gc0p9063x67qp9503396aknqq5f79xzw25wq6";
   };
 
-  buildInputs = [ openconnect networkmanager ]
+  buildInputs = [ openconnect networkmanager libsecret ]
     ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring gnome3.gconf ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix
index bb837dc6b8f..e48f4f32bf1 100644
--- a/pkgs/tools/networking/network-manager/openvpn.nix
+++ b/pkgs/tools/networking/network-manager/openvpn.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager
+{ stdenv, fetchurl, openvpn, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-openvpn";
-  version = "0.9.8.4";
+  version = networkmanager.version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "11v63s1f3bsa7pmkvr7x65rsigh48wfqzsnixrwc3wqslsv5535g";
+    url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";
+    sha256 = "1w0v3xah0wg467jy0fd3188zla8q4l1iq0zdy28bcdipin693bfh";
   };
 
-  buildInputs = [ openvpn networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
+  buildInputs = [ openvpn networkmanager libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring
+                                        gnome3.networkmanagerapplet ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
   configureFlags = [
     "${if withGnome then "--with-gnome --with-gtkver=3" else "--without-gnome"}"
     "--disable-static"
+    "--localstatedir=/" # needed for the management socket under /run/NetworkManager
   ];
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix
index 6928db809a8..78293504533 100644
--- a/pkgs/tools/networking/network-manager/pptp.nix
+++ b/pkgs/tools/networking/network-manager/pptp.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, networkmanager, pptp, ppp, intltool, pkgconfig, substituteAll
-, withGnome ? true, gnome3 }:
+, libsecret, withGnome ? true, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-pptp";
-  version = "0.9.8.4";
+  version = networkmanager.version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1s6wmznd6azvg028x8y3syniqy9j7nmx5j71w2wc6mk0f9pqzflp";
+    url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";
+    sha256 = "0xpflw6vp1ahvpz7mnnldqvk455wz2j7dahd9lxqs95frmjmq390";
   };
 
-  buildInputs = [ networkmanager pptp ppp ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
+  buildInputs = [ networkmanager pptp ppp libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring
+                                        gnome3.networkmanagerapplet ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix
index 809970ff0fd..8e2bb2bbfc3 100644
--- a/pkgs/tools/networking/network-manager/vpnc.nix
+++ b/pkgs/tools/networking/network-manager/vpnc.nix
@@ -1,20 +1,19 @@
-{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager
+{ stdenv, fetchurl, vpnc, intltool, pkgconfig, networkmanager, libsecret
 , withGnome ? true, gnome3, procps, module_init_tools }:
 
 stdenv.mkDerivation rec {
   name = "${pname}${if withGnome then "-gnome" else ""}-${version}";
   pname = "NetworkManager-vpnc";
-  # TODO: version doesn't match due to bad release
-  #version = networkmanager.version;
-  version = "0.9.8.6";
+  version = networkmanager.version;
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/0.9/${pname}-${version}.tar.xz";
-    sha256 = "1mmbm3q27b3dbbs4vs976cxif8jdcs92j3ajdbgykrnl2gbnqc20";
+    url = "mirror://gnome/sources/${pname}/1.0/${pname}-${version}.tar.xz";
+    sha256 = "154q6lcy99h00kyivjhsv21a2i4cw4ff35cbvh062bfd68wl3l2y";
   };
 
-  buildInputs = [ vpnc networkmanager ]
-    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring ];
+  buildInputs = [ vpnc networkmanager libsecret ]
+    ++ stdenv.lib.optionals withGnome [ gnome3.gtk gnome3.libgnome_keyring
+                                        gnome3.networkmanagerapplet ];
 
   nativeBuildInputs = [ intltool pkgconfig ];
 
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 93dad85ce1e..9bd1e7f4853 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, libcap ? null }:
+{ stdenv, fetchurl, autoreconfHook, libcap ? null, openssl ? null }:
 
 assert stdenv.isLinux -> libcap != null;
 
@@ -10,11 +10,18 @@ stdenv.mkDerivation rec {
     sha256 = "0ccv9kh5asxpk7bjn73vwrqimbkbfl743bgx0km47bfajl7bqs8d";
   };
 
-  configureFlags = stdenv.lib.optional (libcap != null) "--enable-linuxcaps";
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--enable-ignore-dns-errors"
+  ] ++ stdenv.lib.optional (libcap != null) "--enable-linuxcaps";
 
-  buildInputs = [ autoreconfHook libcap ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libcap openssl ];
 
-  postInstall = "rm -rf $out/share/doc";
+  postInstall = ''
+    rm -rf $out/share/doc
+  '';
 
   meta = {
     homepage = http://www.ntp.org/;
diff --git a/pkgs/tools/networking/sproxy-web/default.nix b/pkgs/tools/networking/sproxy-web/default.nix
deleted file mode 100644
index 67daab08359..00000000000
--- a/pkgs/tools/networking/sproxy-web/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ cabal, aeson, blazeHtml, blazeMarkup, configurator, hflags
-, httpTypes, mtl, postgresqlSimple, resourcePool, scotty, text
-, waiExtra, waiMiddlewareStatic, fetchurl
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sproxy-web";
-  version = "0.1.0.2";
-  src = fetchurl {
-    url = "https://github.com/zalora/sproxy-web/archive/0.1.0.2.tar.gz";
-    sha256 = "1rdzglvsas0rdgq3j5c9ll411yk168x7v3l7w8zdjgafa947j4d4";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    aeson blazeHtml blazeMarkup configurator hflags httpTypes mtl
-    postgresqlSimple resourcePool scotty text waiExtra
-    waiMiddlewareStatic
-  ];
-  meta = {
-    homepage = "http://bitbucket.org/zalorasea/sproxy-web";
-    description = "Web interface to sproxy";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/tools/networking/sproxy/default.nix b/pkgs/tools/networking/sproxy/default.nix
deleted file mode 100644
index 5ecd7d06e26..00000000000
--- a/pkgs/tools/networking/sproxy/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ cabal, aeson, attoparsec, caseInsensitive, certificate
-, concurrentExtra, conduit, connection, cryptoRandom, curl
-, dataDefault, hslogger, hspec, httpConduit, httpKit, httpTypes
-, interpolatedstringPerl6, mtl, network, optparseApplicative
-, postgresqlSimple, safe, SHA, split, stringConversions, time, tls
-, unorderedContainers, utf8String, wai, warp, x509, yaml, fetchurl
-}:
-
-cabal.mkDerivation (self: {
-  pname = "sproxy";
-  version = "0.8.0";
-  src = fetchurl {
-    url = "https://github.com/zalora/sproxy/archive/0.8.0.tar.gz";
-    sha256 = "11xn4k509ck73pacyz2kh0924n2vy8rwakwd42dwbvhhysf47rdx";
-  };
-  isLibrary = false;
-  isExecutable = true;
-  patches = [ ./new-http-kit.patch ];
-  doCheck = false;
-  buildDepends = [
-    aeson attoparsec caseInsensitive certificate concurrentExtra
-    cryptoRandom curl dataDefault hslogger httpKit httpTypes
-    interpolatedstringPerl6 mtl network optparseApplicative
-    postgresqlSimple safe SHA split stringConversions time tls
-    unorderedContainers utf8String x509 yaml
-  ];
-  testDepends = [
-    aeson attoparsec caseInsensitive certificate concurrentExtra
-    conduit connection cryptoRandom curl dataDefault hslogger hspec
-    httpConduit httpKit httpTypes interpolatedstringPerl6 mtl network
-    optparseApplicative postgresqlSimple safe SHA split
-    stringConversions time tls unorderedContainers utf8String wai warp
-    x509 yaml
-  ];
-  meta = {
-    license = self.stdenv.lib.licenses.mit;
-    platforms = self.ghc.meta.platforms;
-    broken = true;
-  };
-})
diff --git a/pkgs/tools/networking/sproxy/new-http-kit.patch b/pkgs/tools/networking/sproxy/new-http-kit.patch
deleted file mode 100644
index c15c3f3989a..00000000000
--- a/pkgs/tools/networking/sproxy/new-http-kit.patch
+++ /dev/null
@@ -1,224 +0,0 @@
-From 383d2cbe240600a86ab99fdefcea4e913d171ec6 Mon Sep 17 00:00:00 2001
-From: Simon Hengel <sol@typeful.net>
-Date: Thu, 24 Apr 2014 22:51:02 +0800
-Subject: [PATCH] Depend on http-kit >= 0.2
-
----
- sproxy.cabal        |  2 +-
- src/Authenticate.hs | 17 ++++++++---------
- src/HTTP.hs         | 47 +++++++++--------------------------------------
- src/Proxy.hs        | 32 ++++++++++++++------------------
- 4 files changed, 32 insertions(+), 66 deletions(-)
-
-diff --git a/sproxy.cabal b/sproxy.cabal
-index 08e1d61..91adf5d 100644
---- a/sproxy.cabal
-+++ b/sproxy.cabal
-@@ -49,7 +49,7 @@ executable sproxy
-                        unix,
-                        utf8-string,
-                        x509,
--                       http-kit,
-+                       http-kit >= 0.2,
-                        yaml >= 0.8
-   default-language:    Haskell2010
-   ghc-options:         -Wall -threaded -O2
-diff --git a/src/Authenticate.hs b/src/Authenticate.hs
-index 7d4c218..15a69a9 100644
---- a/src/Authenticate.hs
-+++ b/src/Authenticate.hs
-@@ -30,8 +30,7 @@ import           System.Posix.Types (EpochTime)
- import           System.Posix.Time (epochTime)
- import           Data.Digest.Pure.SHA (hmacSha1, showDigest)
- 
--import           Network.HTTP.Toolkit.Header
--import           Network.HTTP.Toolkit.Request
-+import           Network.HTTP.Toolkit
- 
- import           Type
- import           Cookies
-@@ -90,19 +89,19 @@ instance FromJSON UserInfo where
- 
- -- https://wiki.zalora.com/Main_Page -> https://wiki.zalora.com/
- -- Note that this always uses https:
--rootURI :: RequestHeader -> URI.URI
--rootURI (MessageHeader _ headers) =
-+rootURI :: Request a -> URI.URI
-+rootURI (Request _ _ headers _) =
-   let host = cs $ fromMaybe (error "Host header not found") $ lookup "Host" headers
-   in URI.URI "https:" (Just $ URI.URIAuth "" host "") "/" "" ""
- 
--redirectForAuth :: AuthConfig -> RequestHeader -> SendData -> IO ()
--redirectForAuth c request@(MessageHeader (_, path_) _) send = do
-+redirectForAuth :: AuthConfig -> Request a -> SendData -> IO ()
-+redirectForAuth c request@(Request _ path_ _ _) send = do
-   let redirectUri = rootURI request
-       path = urlEncode True path_
-       authURL = "https://accounts.google.com/o/oauth2/auth?scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email+https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.profile&state=" ++ cs path ++ "&redirect_uri=" ++ (cs $ show $ redirectUri) ++ "&response_type=code&client_id=" ++ authConfigClientID c ++ "&approval_prompt=force&access_type=offline"
--  sendResponse send found302 [("Location", UTF8.fromString $ authURL)] ""
-+  sendResponse_ send found302 [("Location", UTF8.fromString $ authURL)] ""
- 
--authenticate :: AuthConfig -> SendData -> RequestHeader -> ByteString -> ByteString -> IO ()
-+authenticate :: AuthConfig -> SendData -> Request a -> ByteString -> ByteString -> IO ()
- authenticate config send request path code = do
-   tokenRes <- post "https://accounts.google.com/o/oauth2/token" ["code=" ++ UTF8.toString code, "client_id=" ++ clientID, "client_secret=" ++ clientSecret, "redirect_uri=" ++ (cs $ show $ rootURI request), "grant_type=authorization_code"]
-   case tokenRes of
-@@ -121,7 +120,7 @@ authenticate config send request path code = do
-                 Just userInfo -> do
-                   clientToken <- authToken authTokenKey (userEmail userInfo) (userGivenName userInfo, userFamilyName userInfo)
-                   let cookie = setCookie cookieDomain cookieName (show clientToken) authShelfLife
--                  sendResponse send found302 [("Location", cs $ (show $ (rootURI request) {URI.uriPath = ""}) ++ cs (urlDecode False path)), ("Set-Cookie", UTF8.fromString cookie)] ""
-+                  sendResponse_ send found302 [("Location", cs $ (show $ (rootURI request) {URI.uriPath = ""}) ++ cs (urlDecode False path)), ("Set-Cookie", UTF8.fromString cookie)] ""
-   where
-     cookieDomain = authConfigCookieDomain config
-     cookieName = authConfigCookieName config
-diff --git a/src/HTTP.hs b/src/HTTP.hs
-index 07038a0..dbcae71 100644
---- a/src/HTTP.hs
-+++ b/src/HTTP.hs
-@@ -1,19 +1,14 @@
- {-# LANGUAGE OverloadedStrings #-}
- module HTTP (
--  sendRequest
--, sendResponse
--, sendResponse_
-+  sendResponse_
- , internalServerError
- ) where
- 
--import           Data.Foldable (forM_)
- import           Data.ByteString (ByteString)
--import qualified Data.ByteString as B
--import qualified Data.ByteString.Char8 as B8
--import qualified Data.ByteString.UTF8 as UTF8
--import qualified Data.CaseInsensitive as CI
-+import qualified Data.ByteString.Char8 as B
- import           Network.HTTP.Types
--import           Network.HTTP.Toolkit.Body
-+import           Network.HTTP.Toolkit
-+import qualified Network.HTTP.Toolkit.Body as Body
- 
- import           Type
- import qualified Log
-@@ -21,34 +16,10 @@ import qualified Log
- internalServerError :: SendData -> String -> IO ()
- internalServerError send err = do
-   Log.debug $ show err
--  sendResponse send internalServerError500 [] "Internal Server Error"
-+  sendResponse_ send internalServerError500 [] "Internal Server Error"
- 
--sendRequest :: SendData -> Method -> ByteString -> [Header] -> BodyReader -> IO ()
--sendRequest send method path headers body = do
--  sendHeader send startLine headers
--  sendBody send body
-+sendResponse_ :: SendData -> Status -> [Header] -> ByteString -> IO ()
-+sendResponse_ send status headers_ body = do
-+  Body.fromByteString body >>= sendResponse send . Response status headers
-   where
--    startLine = B8.unwords [method, path, "HTTP/1.1"]
--
--sendResponse :: SendData -> Status -> [Header] -> ByteString -> IO ()
--sendResponse send status headers_ body = do
--  sendHeader send (statusLine status) headers
--  send body
--  where
--    headers = ("Content-Length", UTF8.fromString $ show $ B.length body) : headers_
--
--sendResponse_ :: SendData -> Status -> [Header] -> BodyReader -> IO ()
--sendResponse_ send status headers body = do
--  sendHeader send (statusLine status) headers
--  sendBody send body
--
--statusLine :: Status -> ByteString
--statusLine status = B.concat ["HTTP/1.1 ", UTF8.fromString $ show (statusCode status), " ", statusMessage status]
--
--sendHeader :: SendData -> ByteString -> [Header] -> IO ()
--sendHeader send startLine headers = do
--  send startLine
--  send "\r\n"
--  forM_ headers $ \(k, v) -> do
--    send $ B.concat [CI.original k, ": ", v, "\r\n"]
--  send "\r\n"
-+    headers = ("Content-Length", B.pack . show . B.length $ body) : headers_
-diff --git a/src/Proxy.hs b/src/Proxy.hs
-index aa320af..88b95d9 100644
---- a/src/Proxy.hs
-+++ b/src/Proxy.hs
-@@ -32,11 +32,7 @@ import qualified Network.URI as URI
- import Options.Applicative hiding (action)
- import System.IO
- 
--import Network.HTTP.Toolkit.Body
--import Network.HTTP.Toolkit.Header
--import Network.HTTP.Toolkit.Connection
--import Network.HTTP.Toolkit.Request
--import Network.HTTP.Toolkit.Response
-+import Network.HTTP.Toolkit
- 
- import Type
- import Util
-@@ -142,10 +138,10 @@ runProxy port config authConfig authorize = (listen port (serve config authConfi
- redirectToHttps :: SockAddr -> Socket -> IO ()
- redirectToHttps _ sock = do
-   conn <- makeConnection (Socket.recv sock 4096)
--  (request, _) <- readRequest conn
--  sendResponse (Socket.sendAll sock) seeOther303 [("Location", cs $ show $ requestURI request)] ""
-+  request <- readRequest conn
-+  sendResponse_ (Socket.sendAll sock) seeOther303 [("Location", cs $ show $ requestURI request)] ""
-   where
--    requestURI (MessageHeader (_, path) headers) =
-+    requestURI (Request _ path headers _) =
-       let host = fromMaybe (error "Host header not found") $ lookup "Host" headers
-       in fromJust $ URI.parseURI $ "https://" ++ cs host ++ cs path
- 
-@@ -171,8 +167,8 @@ serve config authConfig withAuthorizeAction addr sock = do
-     serve_ send conn authorize = go
-       where
-         go :: IO ()
--        go = forever $ readRequest conn >>= \(request, body) -> case request of
--          MessageHeader (_, url) headers -> do
-+        go = forever $ readRequest conn >>= \request -> case request of
-+          Request _ url headers _ -> do
-             -- TODO: Don't loop for more input on Connection: close header.
-             -- Check if this is an authorization response.
-             case URI.parseURIReference $ BU.toString url of
-@@ -192,17 +188,17 @@ serve config authConfig withAuthorizeAction addr sock = do
-                         case auth of
-                           Nothing -> redirectForAuth authConfig request send
-                           Just token -> do
--                            forwardRequest config send authorize cookies addr request body token
-+                            forwardRequest config send authorize cookies addr request token
- 
- -- Check our access control list for this user's request and forward it to the backend if allowed.
--forwardRequest :: Config -> SendData -> AuthorizeAction -> [(Name, Cookies.Value)] -> SockAddr -> RequestHeader -> BodyReader -> AuthToken -> IO ()
--forwardRequest config send authorize cookies addr (MessageHeader (method, path) headers) body token = do
-+forwardRequest :: Config -> SendData -> AuthorizeAction -> [(Name, Cookies.Value)] -> SockAddr -> Request BodyReader -> AuthToken -> IO ()
-+forwardRequest config send authorize cookies addr request@(Request method path headers _) token = do
-     groups <- authorize (authEmail token) (maybe (error "No Host") cs $ lookup "Host" headers) path method
-     ip <- formatSockAddr addr
-     case groups of
-         [] -> do
-             -- TODO: Send back a page that allows the user to request authorization.
--            sendResponse send forbidden403 [] "Access Denied"
-+            sendResponse_ send forbidden403 [] "Access Denied"
-         _ -> do
-             -- TODO: Reuse connections to the backend server.
-             let downStreamHeaders =
-@@ -216,10 +212,10 @@ forwardRequest config send authorize cookies addr (MessageHeader (method, path)
-                     setCookies $
-                     fromList headers
-             bracket (connectTo host port) hClose $ \h -> do
--              sendRequest (B.hPutStr h) method path downStreamHeaders body
--              conn <- makeConnection (B.hGetSome h 4096)
--              (MessageHeader status responseHeaders, responseBody) <- readResponse method conn
--              sendResponse_ send status (removeConnectionHeader responseHeaders) responseBody
-+              sendRequest (B.hPutStr h) request{requestHeaders = downStreamHeaders}
-+              conn <- connectionFromHandle h
-+              response <- readResponse method conn
-+              sendResponse send response{responseHeaders = removeConnectionHeader (responseHeaders response)}
-   where
-     host = configBackendAddress config
-     port = PortNumber (configBackendPort config)
--- 
-1.9.1
-
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 74788e6ff2a..ef9c56deacb 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,15 +2,24 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.14";
+  version = "5.16";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0nk9cjrgpa54sphykizqx4kayrq71z1zmwdsr1lvlbmq3pyb95r1";
+    sha256 = "13b0ad7smz4949hchdgsx3yjr5i3z8flwiy8w6xalvk2n8zykdxn";
   };
 
   buildInputs = [ openssl ];
-  configureFlags = [ "--with-ssl=${openssl}" ];
+  configureFlags = [
+    "--with-ssl=${openssl}"
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ];
+
+  installFlags = [
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
+  ];
 
   meta = {
     description = "universal tls/ssl wrapper";
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index e1594733268..e356d6d6537 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,31 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "1v00k4b6m9wk0533s2jpg4rv9lhplh7zdp6vx2yyrmrbzc4jgy0g";
+    sha256 = "1jly2apag4yg649w3flaq73wdrcfyxnhx5py9j73y7adxmswigbn";
   };
 
-  buildInputs = [openssl expat libevent];
-
-  patches = [
-    # This patch fixes unbound 1.5.1 on linux versions previous to 3.15 which
-    # do not implement IP_PMTUDISC_OMIT.
-    #
-    # It should be discarded when this support makes it into a released
-    # version.
-    ./linux-pre-3.15-unbound-1.5.1.patch
-  ];
+  buildInputs = [ openssl expat libevent ];
 
   configureFlags = [
     "--with-ssl=${openssl}"
     "--with-libexpat=${expat}"
     "--with-libevent=${libevent}"
     "--localstatedir=/var"
+    "--sysconfdir=/etc"
   ];
 
+  installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
+
   meta = {
     description = "Validating, recursive, and caching DNS resolver";
     license = stdenv.lib.licenses.bsd3;
diff --git a/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch b/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch
deleted file mode 100644
index 61956807899..00000000000
--- a/pkgs/tools/networking/unbound/linux-pre-3.15-unbound-1.5.1.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- ./services/listen_dnsport.c	2014-12-10 10:59:31.726514857 +0100
-+++ ./services/listen_dnsport.c	2014-12-10 11:08:45.009071300 +0100
-@@ -368,29 +368,47 @@
-  * (and also uses the interface mtu to determine the size of the packets).
-  * So there won't be any EMSGSIZE error.  Against DNS fragmentation attacks.
-  * FreeBSD already has same semantics without setting the option. */
--#    if defined(IP_PMTUDISC_OMIT)
--		int action = IP_PMTUDISC_OMIT;
--#    else
--		int action = IP_PMTUDISC_DONT;
--#    endif
-+		int omit_set = 0;
-+		int action;
-+#   if defined(IP_PMTUDISC_OMIT)
-+		action = IP_PMTUDISC_OMIT;
- 		if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, 
- 			&action, (socklen_t)sizeof(action)) < 0) {
--			log_err("setsockopt(..., IP_MTU_DISCOVER, "
--#    if defined(IP_PMTUDISC_OMIT)
--				"IP_PMTUDISC_OMIT"
-+
-+			if (errno != EINVAL) {
-+				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_OMIT...) failed: %s",
-+					strerror(errno));
-+
-+#    ifndef USE_WINSOCK
-+				close(s);
- #    else
--				"IP_PMTUDISC_DONT"
-+				closesocket(s);
- #    endif
--				"...) failed: %s",
--				strerror(errno));
-+				*noproto = 0;
-+				*inuse = 0;
-+				return -1;
-+			}
-+		}
-+		else
-+		{
-+		    omit_set = 1;
-+		}
-+#   endif
-+		if (omit_set == 0) {
-+   			action = IP_PMTUDISC_DONT;
-+			if (setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER,
-+				&action, (socklen_t)sizeof(action)) < 0) {
-+				log_err("setsockopt(..., IP_MTU_DISCOVER, IP_PMTUDISC_DONT...) failed: %s",
-+					strerror(errno));
- #    ifndef USE_WINSOCK
--			close(s);
-+				close(s);
- #    else
--			closesocket(s);
-+				closesocket(s);
- #    endif
--			*noproto = 0;
--			*inuse = 0;
--			return -1;
-+				*noproto = 0;
-+				*inuse = 0;
-+				return -1;
-+			}
- 		}
- #  elif defined(IP_DONTFRAG)
- 		int off = 0;
diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix
index 9af28dbebd6..f4cdb7eaddb 100644
--- a/pkgs/tools/networking/wrk/default.nix
+++ b/pkgs/tools/networking/wrk/default.nix
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   '';
   
   meta = with stdenv.lib; {
-    description = "HTTP benchmarking tool.";
+    description = "HTTP benchmarking tool";
     homepage = http://github.com/wg/wrk;
     longDescription = ''
       wrk is a modern HTTP benchmarking tool capable of generating
diff --git a/pkgs/tools/package-management/dpkg/cache-arch.patch b/pkgs/tools/package-management/dpkg/cache-arch.patch
deleted file mode 100644
index 9677c8fdee3..00000000000
--- a/pkgs/tools/package-management/dpkg/cache-arch.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Don't invoke "dpkg --print-architecture" for every call to
-Dpkg::Arch::get_raw_build_arch().
-
-diff -ru -x '*~' dpkg-1.16.9/scripts/Dpkg/Arch.pm dpkg-1.16.9-new/scripts/Dpkg/Arch.pm
---- dpkg-1.16.9/scripts/Dpkg/Arch.pm	2012-10-20 06:34:17.000000000 +0200
-+++ dpkg-1.16.9-new/scripts/Dpkg/Arch.pm	2012-12-04 19:42:20.451002537 +0100
-@@ -59,7 +59,7 @@
- 	# dpkg-architecture itself, by avoiding computing the DEB_BUILD_
- 	# variables when they are not requested.
- 
--	my $build_arch = `dpkg --print-architecture`;
-+	$build_arch = `dpkg --print-architecture`;
- 	syserr("dpkg --print-architecture failed") if $? >> 8;
- 
- 	chomp $build_arch;
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 8ef32dab95a..624386f34f2 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,16 +1,21 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
 
-let version = "1.16.9"; in
+let version = "1.17.25"; in
 
 stdenv.mkDerivation {
   name = "dpkg-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "0ykby9x4x2zb7rfj30lfjcsrq2q32z2lnsrl8pbdvb2l9sx7zkbk";
+    sha256 = "1akblsdfblih7879gi5qagqpgy6zz866kcyvg5y11ywqmqw9s087";
   };
 
-  patches = [ ./cache-arch.patch ];
+  postPatch = ''
+    # dpkg tries to force some dependents like debian_devscripts to use
+    # -fstack-protector-strong - not (yet?) a good idea. Disable for now:
+    substituteInPlace scripts/Dpkg/Vendor/Debian.pm \
+      --replace "stackprotectorstrong => 1" "stackprotectorstrong => 0"
+  '';
 
   configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}";
 
@@ -36,13 +41,17 @@ stdenv.mkDerivation {
         if head -n 1 $i | grep -q perl; then
           wrapProgram $i --prefix PERL5LIB : $out/${perl.libPrefix}
         fi
-      done # */
+      done
+
+      mkdir -p $out/etc/dpkg
+      cp -r scripts/t/origins $out/etc/dpkg
     '';
 
   meta = with stdenv.lib; {
     description = "The Debian package manager";
     homepage = http://wiki.debian.org/Teams/Dpkg;
+    license = with licenses; gpl2Plus;
     platforms = platforms.linux;
-    maintainers = [ maintainers.mornfall ];
+    maintainers = with maintainers; [ mornfall nckx ];
   };
 }
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index a87cde81c1a..88bd8f46037 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.9pre4088_1711679";
+  name = "nix-1.9pre4100_4bbcfaf";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/21171422/download/4/${name}.tar.xz";
-    sha256 = "37240acbb9ea9a3a0f141a85296787e1d4b7c2ab987c218be2f8007b28167b03";
+    url = "http://hydra.nixos.org/build/21565942/download/4/${name}.tar.xz";
+    sha256 = "1jcy0n8mi17k5vk89vammfh74lvsgnm4gjsk23cq1shspjnbbgxs";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];
diff --git a/pkgs/tools/security/afl/README.md b/pkgs/tools/security/afl/README.md
index 7d954461773..0b0d4e80fbc 100644
--- a/pkgs/tools/security/afl/README.md
+++ b/pkgs/tools/security/afl/README.md
@@ -11,9 +11,9 @@ right QEMU version and options in `qemu.nix`:
 
 https://github.com/mirrorer/afl/blob/master/qemu_mode/build_qemu_support.sh
 
-`afl-config.h` and `afl-qemu-cpu-inl.h` are part of the afl source
-code, and copied from `config.h` and `afl-qemu-cpu-inl.h`
-appropriately. The QEMU patches need to be slightly adjusted to
-`#include` these files (the patches try to otherwise include files
-like `../../config.h` which causes the build to fail). See `qemu.nix`
-for details.
+`afl-config.h`, `afl-types.h`, and `afl-qemu-cpu-inl.h` are part of
+the afl source code, and copied from `config.h`, `types.h` and
+`afl-qemu-cpu-inl.h` appropriately. These files and the QEMU patches
+need to be slightly adjusted to fix their `#include`s (the patches
+try to otherwise include files like `../../config.h` which causes the
+build to fail).
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 93c5988b55d..ea495145d1a 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, bash, callPackage, makeWrapper }:
+{ stdenv, fetchurl, bash, callPackage, makeWrapper
+, clang, llvm, which, libcgroup }:
 
 let
   afl-qemu = callPackage ./qemu.nix {};
@@ -8,16 +9,21 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.58b";
+  version = "1.67b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1szggm4x9i9bsrcb99s5vbgncagp7jvhz8cg9amkx7p6mp2x4pld";
+    sha256 = "11763zgwqg2b5hak006rp0jb3w252js067z9ibgl4nj3br2ncmd2";
   };
 
-  buildInputs  = [ makeWrapper ];
+  # Note: libcgroup isn't needed for building, just for the afl-cgroup
+  # script.
+  buildInputs  = [ makeWrapper clang llvm which ];
 
-  buildPhase   = "make PREFIX=$out";
+  buildPhase   = ''
+    make PREFIX=$out
+    cd llvm_mode && make && cd ..
+  '';
   installPhase = ''
     # Do the normal installation
     make install PREFIX=$out
@@ -25,13 +31,34 @@ stdenv.mkDerivation rec {
     # Install the custom QEMU emulator for binary blob fuzzing.
     cp ${afl-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace
 
+    # Install the cgroups wrapper for asan-based fuzzing.
+    cp experimental/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup
+    chmod +x $out/bin/afl-cgroup
+    substituteInPlace $out/bin/afl-cgroup \
+      --replace "cgcreate" "${libcgroup}/bin/cgcreate" \
+      --replace "cgexec"   "${libcgroup}/bin/cgexec" \
+      --replace "cgdelete" "${libcgroup}/bin/cgdelete"
+
+    # Patch shebangs before wrapping
+    patchShebangs $out/bin
+
     # Wrap every program with a custom $AFL_PATH; I believe there is a
     # bug in afl which causes it to fail to find `afl-qemu-trace`
     # relative to `afl-fuzz` or `afl-showmap`, so we instead set
     # $AFL_PATH as a workaround, which allows it to be found.
-    for x in `ls $out/bin/afl-*`; do
+    for x in `ls $out/bin/afl-* | grep -v afl-clang-fast`; do
       wrapProgram $x --prefix AFL_PATH : "$out/bin"
     done
+    # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it
+    # has totally different semantics in that case(?) - and also set a
+    # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out
+    # of $PATH.
+    for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do
+      wrapProgram $x \
+        --prefix AFL_PATH : "$out/lib/afl" \
+        --prefix AFL_CC   : "${clang}/bin/clang" \
+        --prefix AFL_CXX  : "${clang}/bin/clang++"
+    done
   '';
 
   meta = {
diff --git a/pkgs/tools/security/afl/qemu-patches/afl-config.h b/pkgs/tools/security/afl/qemu-patches/afl-config.h
index 051b38ffbca..0017f9d83f4 100644
--- a/pkgs/tools/security/afl/qemu-patches/afl-config.h
+++ b/pkgs/tools/security/afl/qemu-patches/afl-config.h
@@ -138,6 +138,11 @@
 
 #define TMIN_MAX_FILE       (10 * 1024 * 1024)
 
+/* Block normalization steps for afl-tmin: */
+
+#define TMIN_SET_MIN_SIZE   4
+#define TMIN_SET_STEPS      128
+
 /* Maximum dictionary token size (-x), in bytes: */
 
 #define MAX_DICT_FILE       128
diff --git a/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h
index c6ebc873ae0..e4a470b5523 100644
--- a/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h
+++ b/pkgs/tools/security/afl/qemu-patches/afl-qemu-cpu-inl.h
@@ -134,6 +134,12 @@ static void afl_setup(void) {
 
     if (afl_area_ptr == (void*)-1) exit(1);
 
+    /* With AFL_INST_RATIO set to a low value, we want to touch the bitmap
+       so that the parent doesn't give up on us. */
+
+    if (inst_r) afl_area_ptr[0] = 1;
+
+
   }
 
   if (getenv("AFL_INST_LIBS")) {
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index 441d64415cb..5b69811d08d 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://www.qemu.org/;
-    description = "Fork of QEMU with American Fuzzy Lop instrumentation support";
+    description = "Fork of QEMU with AFL instrumentation support";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ thoughtpolice ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/security/eid-mw/eid-nssdb.in b/pkgs/tools/security/eid-mw/eid-nssdb.in
index a5f52167b36..934c0256da7 100644
--- a/pkgs/tools/security/eid-mw/eid-nssdb.in
+++ b/pkgs/tools/security/eid-mw/eid-nssdb.in
@@ -3,12 +3,13 @@
 rootdb="/etc/pki/nssdb"
 userdb="$HOME/.pki/nssdb"
 dbentry="Belgium eID"
-libfile="/run/current-system/sw/libbeidpkcs11.so"
+libfile="/run/current-system/sw/lib/libbeidpkcs11.so"
 
 dbdir="$userdb"
 
-case "$1" in
---help)	cat << EOF
+while true; do
+	case "$1" in
+	--help|"")	cat << EOF
 (Un)register $dbentry with NSS-compatible browsers.
 
 Usage: `basename "$0"` [OPTION] ACTION [LIBRARY]
@@ -27,14 +28,20 @@ Actions:
 Default arguments if unspecified:
   LIBRARY	$libfile
 EOF
-	exit ;;
---db)	dbdir="$2"
-	shift 2 ;;
---user)	shift ;;
---system)
-	dbdir="$rootdb"
-	shift ;;
-esac
+		exit ;;
+	--db)	dbdir="$2"
+		shift 2 ;;
+	--user)	dbdir="$userdb"
+		shift ;;
+	--system)
+		dbdir="$rootdb"
+		shift ;;
+	-*)	echo "$0: unknown option: '$1'" >&2
+		echo "Try --help for usage information."
+		exit 1 ;;
+	*)	break ;;
+	esac
+done
 
 if [ "$2" ]; then
 	libfile="$2"
@@ -50,9 +57,6 @@ if ! [ -d "$dbdir" ]; then
 	exit 1
 fi
 
-echo "NSS database: $dbdir"
-echo "BEID library: $libfile"
-
 dbdir="sql:$dbdir"
 
 case "$1" in
@@ -63,6 +67,7 @@ remove) echo "Removing $dbentry from database:"
 	modutil -dbdir "$dbdir" -delete "$dbentry" ;;
 show)	echo "Displaying $dbentry database entry, if any:"
 	echo "Note: this may fail if you don't have the correct permissions." ;;
+'')	exec "$0" --help ;;
 *)	echo "$0: unknown action: '$1'" >&2
 	echo "Try --help for usage information."
 	exit 1 ;;
@@ -70,6 +75,9 @@ esac
 
 ret=$?
 
+echo "NSS database: $dbdir"
+echo "BEID library: $libfile"
+
 modutil -dbdir "$dbdir" -list "$dbentry" 2>/dev/null
 
 exit $ret
diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index fc5da48a1b9..71e5282e85b 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,11 +13,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.2";
+  name = "gnupg-2.1.3";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "14k7c5spai3yppz6izf1ggbnffskl54ln87v1wgy9pwism1mlks0";
+    sha256 = "1vf8fmwcq81abzw2mypz5j7m4xy0vl4z6lri5lxfbd2bsyq7ygi1";
   };
 
   patches = [ ./socket-activate-2.1.1.patch ];
diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index a3652f62232..92c7a027d69 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -3,23 +3,19 @@
 stdenv.mkDerivation rec {
   name = "lastpass-cli-${version}";
 
-  version = "0.4.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
     rev = "v${version}";
-    sha256 = "1r06lifjc28sm88d6x3xwn76l9fjwjmd1wbmvr9j8rna889q0wl9";
+    sha256 = "0k2dbfizd6gwd4s8badm50qg2djrh22szd932l1a96mn79q8zb70";
   };
 
   buildInputs = [
     openssl curl libxml2 pkgconfig asciidoc docbook_xsl libxslt
   ];
 
-  prePatch = ''
-    substituteInPlace version.h --replace "0.3.0" "0.4.0"
-  '';
-
   makeFlags = "PREFIX=$(out)";
 
   installTargets = "install install-doc";
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 1aa5e0b51f1..c03029232ac 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, coreutils, gnused, getopt, pwgen, git, tree, gnupg
+, coreutils, gnused, getopt, pwgen, git, tree, gnupg, which
 , makeWrapper
 
 , xclip ? null, xdotool ? null, dmenu ? null
@@ -59,6 +59,16 @@ stdenv.mkDerivation rec {
     '' else ""}
   '';
 
+  wrapperPath = with stdenv.lib; makeSearchPath "bin/" ([
+    coreutils
+    gnused
+    getopt
+    git
+    gnupg
+    tree
+    which
+  ] ++ ifEnable x11Support [ dmenu xclip xdotool ]);
+
   postFixup = ''
     # Fix program name in --help
     substituteInPlace $out/bin/pass \
@@ -66,11 +76,11 @@ stdenv.mkDerivation rec {
 
     # Ensure all dependencies are in PATH
     wrapProgram $out/bin/pass \
-      --prefix PATH : "${coreutils}/bin:${gnused}/bin:${getopt}/bin:${gnupg}/bin:${git}/bin:${tree}/bin:${pwgen}/bin${if x11Support then ":${xclip}/bin" else ""}"
-
-    ${if x11Support then ''
-      wrapProgram $out/bin/passmenu \
-        --prefix PATH : "$out/bin:${xdotool}/bin:${dmenu}/bin"
-    '' else ""}
+      --prefix PATH : "${wrapperPath}"
+  '' + stdenv.lib.optionalString x11Support ''
+    # We just wrap passmenu with the same PATH as pass. It doesn't
+    # need all the tools in there but it doesn't hurt either.
+    wrapProgram $out/bin/passmenu \
+      --prefix PATH : "$out/bin:${wrapperPath}"
   '';
 }
diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 632edaedd2e..757959f5345 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -10,11 +10,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "pinentry-0.9.0";
+  name = "pinentry-0.9.1";
 
   src = fetchurl {
     url = "mirror://gnupg/pinentry/${name}.tar.bz2";
-    sha256 = "1awhajq21hcjgqfxg9czaxg555gij4bba6axrwg8w6lfmc3ml14h";
+    sha256 = "15cn7q6wg3k433l9ks48pz4dbikp7ysp0h8jqynz6p9rdf2qxl4w";
   };
 
   buildInputs = [ libcap gtk2 ncurses qt4 ];
diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index b91dc65219b..67d8b110568 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.0.6";
+  version = "4.5";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "d954510bf812f624945bdba8e1c37e23573de89e2f159d7c89a3e3589a765559" else
-      "89ce71312f5d73fc2af637a93d7697587b2132fce0e9f6e815b25ddba66518d0";
+      "15scfjzpbih7pzpqh4jd7jmc9g93sx2myfs6ykr70f5hbc7qhwmg" else
+      "0lrvhka3z9bh0snplsnxshs8i9iww187ipfn7f96hp5rxgl30p49";
   };
 
   patchPhase = ''
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 70f11c39d6f..38ff4acc43b 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl }:
+{ stdenv, fetchurl, openssl, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "trousers-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v";
   };
 
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl pkgconfig ];
 
   patches = [ ./allow-non-tss-config-file-owner.patch ];
 
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-DALLOW_NON_TSS_CONFIG_FILE";
   NIX_LDFLAGS = "-lgcc_s";
 
+  # Fix broken libtool file
+  preFixup = ''
+    sed 's,-lcrypto,-L${openssl}/lib -lcrypto,' -i $out/lib/libtspi.la
+  '';
+
   meta = with stdenv.lib; {
     description = "Trusted computing software stack";
     homepage    = http://trousers.sourceforge.net/;
diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix
new file mode 100644
index 00000000000..706b3700a41
--- /dev/null
+++ b/pkgs/tools/system/actkbd/default.nix
@@ -0,0 +1,34 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "actkbd-0.2.8";
+
+  src = fetchurl {
+    url = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/files/${name}.tar.bz2";
+    sha256 = "1ipb7k5q7k7p54is96ij2n74jfa6xc0llb9lpjwxhsqviqxn9slm";
+  };
+
+  preConfigure = ''
+    substituteInPlace Makefile \
+      --replace /usr/local $out \
+      --replace /etc $out/etc
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/doc/actkbd
+    cp -r README samples $out/share/doc/actkbd
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A keyboard shortcut daemon";
+    longDescription = ''
+      actkbd is a simple daemon that binds actions to keyboard events
+      directly on evdev interface (that is, no X11 required). It
+      recognises key combinations and can handle press, repeat and
+      release events.
+    '';
+    license = licenses.gpl2;
+    homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/";
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix
index e6b09932f86..263690728d2 100644
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig readline libxml2 ];
 
   meta = with stdenv.lib; {
-    description = "Configuration editing tool.";
+    description = "Configuration editing tool";
     license = licenses.lgpl2;
     homepage = http://augeas.net/;
     maintainers = with maintainers; [offline];
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index e0149078271..80d9d2d98ef 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -26,11 +26,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "collectd-5.4.1";
+  name = "collectd-5.4.2";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm";
+    sha256 = "14z3qkqbmfjvqvcb2v17480f7c8j7wa49myk0zlxpd9qq40fk2cp";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index c408c0f34ea..5d6e322facc 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,15 +1,25 @@
-{ stdenv, fetchgit, libaio }:
+{ stdenv, fetchFromGitHub, libaio, zlib }:
+
+let version = "2.2.7"; in
 
 stdenv.mkDerivation rec {
-  name = "fio-2.0.8";
-  
-  src = fetchgit {
-    url = git://git.kernel.dk/fio.git;
-    rev = "cf9a74c8bd63d9db5256f1362885c740e11a1fe5";
-    sha256 = "b34de480bbbb9cde221d0c4557ead91790feb825a1e31c4013e222ee7f43e937";
+  name = "fio-${version}";
+
+  src = fetchFromGitHub {
+    owner = "axboe";
+    repo = "fio";
+    rev = "fio-${version}";
+    sha256 = "02k528n97xp1ly3d0mdn0lgwqlpn49b644696m75kcr0hn07382v";
   };
-  
-  buildInputs = [ libaio ];
+
+  buildInputs = [ libaio zlib ];
+
+  enableParallelBuilding = true;
+
+  configurePhase = ''
+    substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
+    ./configure
+  '';
 
   installPhase = ''
     make install prefix=$out
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
new file mode 100644
index 00000000000..baaa97b4b24
--- /dev/null
+++ b/pkgs/tools/system/foremost/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl }:
+
+let version = "1.5.7"; in
+stdenv.mkDerivation rec {
+  name = "foremost-${version}";
+
+  src = fetchurl {
+    sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h";
+    url = "http://foremost.sourceforge.net/pkg/${name}.tar.gz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Recover files based on their contents";
+    longDescription = ''
+      Foremost is a console program to recover files based on their headers,
+      footers, and internal data structures. Foremost can work on image files, such
+      as those generated by dd, Safeback, Encase, etc, or directly on a drive.
+      The headers and footers can be specified by a configuration file or you can
+      use command line switches to specify built-in file types. These built-in types
+      look at the data structures of a given file format allowing for a more
+      reliable and faster recovery.
+    '';
+    homepage = http://foremost.sourceforge.net/;
+    license = with licenses; publicDomain;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  patches = [ ./makefile.patch ];
+
+  makeFlags = "PREFIX=$(out)";
+
+  enableParallelBuilding = true;
+
+  preInstall = ''
+    mkdir -p $out/{bin,share/man/man8}
+  '';
+}
diff --git a/pkgs/tools/system/foremost/makefile.patch b/pkgs/tools/system/foremost/makefile.patch
new file mode 100644
index 00000000000..6626c9520ec
--- /dev/null
+++ b/pkgs/tools/system/foremost/makefile.patch
@@ -0,0 +1,23 @@
+--- a/Makefile	2015-04-21 00:40:46.949266581 +0200
++++ b/Makefile	2015-04-21 00:41:38.637165883 +0200
+@@ -24,9 +24,9 @@
+ RAW_FLAGS += -DVERSION=\"$(VERSION)\"
+ 
+ # Where we get installed
+-BIN = /usr/local/bin
+-MAN = /usr/share/man/man8
+-CONF= /usr/local/etc
++BIN = $(PREFIX)/bin
++MAN = $(PREFIX)/share/man/man8
++CONF= $(PREFIX)/etc
+ # Setup for compiling and cross-compiling for Windows
+ # The CR_ prefix refers to cross compiling from OSX to Windows
+ CR_CC = $(CR_BASE)/gcc
+@@ -120,7 +120,6 @@
+ install: goals
+ 	install -m 755 $(NAME) $(BIN)
+ 	install -m 444 $(MAN_PAGES) $(MAN)
+-	install -m 444 foremost.conf $(CONF)
+ macinstall: BIN = /usr/local/bin/
+ macinstall: MAN = /usr/share/man/man1/
+ macinstall: CONF = /usr/local/etc/
diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix
index 1c231e90db4..b52c1c0f636 100644
--- a/pkgs/tools/system/honcho/default.nix
+++ b/pkgs/tools/system/honcho/default.nix
@@ -20,9 +20,9 @@ let honcho = buildPythonPackage rec {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    description = "A Python clone of Foreman, a tool for managing Procfile-based applications.";
+    description = "A Python clone of Foreman, a tool for managing Procfile-based applications";
     license = licenses.mit;
-    homePage = https://github.com/nickstenning/honcho;
+    homepage = https://github.com/nickstenning/honcho;
     maintainers = with maintainers; [ benley ];
     platforms = platforms.unix;
   };
diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix
index 932b68197ce..54721f7ce73 100644
--- a/pkgs/tools/system/ioping/default.nix
+++ b/pkgs/tools/system/ioping/default.nix
@@ -1,47 +1,20 @@
-x@{builderDefsPackage
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="ioping";
-    version = "0.9";
-    name="${baseName}-${version}";
-    url="https://docs.google.com/uc?id=0B_PlDc2qaehFWWtLZ3Z3N1ltdm8&export=download";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    name = "${sourceInfo.name}.tar.gz";
+stdenv.mkDerivation rec {
+  name = "ioping-${version}";
+  version = "0.9";
+  src = fetchurl {
+    url = "https://github.com/koct9i/ioping/releases/download/v${version}/${name}.tar.gz";
     sha256 = "0pbp7b3304y9yyv2w41l3898h5q8w77hnnnq1vz8qz4qfl4467lm";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  makeFlags = "PREFIX=$(out)";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doMakeInstall"];
-  makeFlags = [
-    ''PREFIX="$out"''
-  ];
-      
-  meta = {
-    description = "Filesystem IO delay time measurer";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl3Plus;
-    homepage = "http://code.google.com/p/ioping/";
-    inherit version;
+  meta = with stdenv.lib; {
+    description = "Disk I/O latency measuring tool";
+    maintainers = with maintainers; [ raskin ];
+    platforms = with platforms; unix;
+    license = licenses.gpl3Plus;
+    homepage = https://github.com/koct9i/ioping;
   };
-}) x
-
+}
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 32f48eb7e14..a9fdcf6fa64 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libestr, json_c, zlib, pythonPackages
-, krb5 ? null, systemd ? null, jemalloc ? null, mysql ? null, postgresql ? null
+, krb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null
 , libgt ? null, liblogging ? null, libnet ? null, hadoop ? null, rdkafka ? null
@@ -11,19 +11,19 @@ let
   mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
 in
 stdenv.mkDerivation rec {
-  name = "rsyslog-8.8.0";
+  name = "rsyslog-8.9.0";
 
   src = fetchurl {
     url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
-    sha256 = "1sx0j5icp172rzcpybjpfw53aj34w8j7k3f1ga0pmbv58r3pwyhl";
+    sha256 = "1p3saxfs723479rbsdyvqwfrblcp0bw6mkz2ncrxvnccfn70xc7a";
   };
 
   buildInputs = [
     pkgconfig libestr json_c zlib pythonPackages.docutils
-    krb5 jemalloc postgresql libdbi net_snmp libuuid curl gnutls
+    krb5 jemalloc libmysql postgresql libdbi net_snmp libuuid curl gnutls
     libgcrypt liblognorm openssl librelp libgt liblogging libnet hadoop rdkafka
     libmongo-client czmq rabbitmq-c hiredis
-  ] ++ stdenv.lib.optional stdenv.isLinux systemd ++ stdenv.lib.optional (mysql != null) mysql.lib;
+  ] ++ stdenv.lib.optional stdenv.isLinux systemd;
 
   configureFlags = [
     "--sysconfdir=/etc"
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     (mkFlag (jemalloc != null)        "jemalloc")
     (mkFlag true                      "unlimited-select")
     (mkFlag true                      "usertools")
-    (mkFlag (mysql != null)           "mysql")
+    (mkFlag (libmysql != null)        "mysql")
     (mkFlag (postgresql != null)      "pgsql")
     (mkFlag (libdbi != null)          "libdbi")
     (mkFlag (net_snmp != null)        "snmp")
diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index 28a0fa52d27..28c68f52aaf 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "UNIX init scheme with service supervision";
     license = licenses.bsd3;
-    homePage = "http://smarden.org/runit";
+    homepage = "http://smarden.org/runit";
     maintainers = with maintainers; [ rickynils ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 46cbde74a03..f67921c6b71 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, attr }:
 
-let version = "0.03.20"; in
+let version = "0.04.00"; in
 stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
 
   src = fetchurl {
-    sha256 = "0j1nppja56cgsd7vg3465y9kbxy3hl8mbyzc254qqm4z9ij1m3dg";
+    sha256 = "1rivmqa3qy9saxcz7mg211imcfyfwdhyhl2z6k1zc55vhnjdwhih";
     url = "http://kernel.ubuntu.com/~cking/tarballs/stress-ng/${name}.tar.gz";
   };
 
+  buildInputs = [ attr ];
+
   patchPhase = ''
     substituteInPlace Makefile --replace "/usr" ""
   '';
@@ -18,6 +20,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
+    inherit version;
     description = "Stress test a computer system";
     longDescription = ''
       Stress test a system in various selectable ways, exercising both various
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix
index 3b19c711410..62f7280a54a 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/pkgs/tools/system/suid-chroot/default.nix
@@ -1,34 +1,22 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl }:
+
+let version = "1.0.2"; in
+stdenv.mkDerivation rec {
+  name = "suid-chroot-${version}";
 
-  version = a.lib.attrByPath ["version"] "1.0.1" a; 
-  buildInputs = with a; [
-    
-  ];
-in
-rec {
   src = fetchurl {
-    url = "http://myweb.tiscali.co.uk/scottrix/linux/download/suid-chroot-${version}.tar.bz2";
-    sha256 = "15gs09md4lyym47ipzffm1ws8jkg028x0cgwxxs9qkdqbl5zb777";
+    sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx";
+    url = "http://myweb.tiscali.co.uk/scottrix/linux/download/${name}.tar.bz2";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["replacePaths" "doMakeInstall"];
-
-  installFlags = "PREFIX=$out";
+  postPatch = ''
+    substituteInPlace Makefile --replace /usr $out
+  '';
 
-  replacePaths = a.fullDepEntry (''
-    sed -e "s@/usr/@$out/@g" -i Makefile
-  '') ["minInit" "doUnpack"];
-      
-  name = "suid-chroot-" + version;
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     description = "Setuid-safe wrapper for chroot";
-    maintainers = [
-    ];
+    license = with licenses; gpl2Plus;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix
index 63850454b3d..c513e475e58 100644
--- a/pkgs/tools/system/thinkfan/default.nix
+++ b/pkgs/tools/system/thinkfan/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   meta = {
     description = "";
     license = stdenv.lib.licenses.gpl3;
-    homePage = "http://thinkfan.sourceforge.net/";
+    homepage = "http://thinkfan.sourceforge.net/";
     maintainers = with stdenv.lib.maintainers; [ iElectric ];
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
new file mode 100644
index 00000000000..a0be19607ea
--- /dev/null
+++ b/pkgs/tools/text/aha/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub }:
+
+let version = "0.4.8"; in
+stdenv.mkDerivation rec {
+  name = "aha-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "1209rda6kc9x88b47y1035zs9lxk0x3qzsb87f8m5b55fdkgxqlj";
+    rev = version;
+    repo = "aha";
+    owner = "theZiz";
+  };
+
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "ANSI HTML Adapter";
+    longDescription = ''
+      aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code.
+    '';
+    homepage = https://github.com/theZiz/aha;
+    downloadPage = https://github.com/theZiz/aha/releases;
+    license = with licenses; [ lgpl2Plus mpl11 ];
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index da7799900a3..2ea4a950145 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -14,7 +14,7 @@ pythonPackages.buildPythonPackage rec {
 
   meta = {
     homepage = https://pypi.python.org/pypi/grin;
-    description = "A grep program configured the way I like it.";
+    description = "A grep program configured the way I like it";
     platform = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.sjagoe ];
   };
diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix
index 27de591d889..8fd0bea2254 100644
--- a/pkgs/tools/text/html2text/default.nix
+++ b/pkgs/tools/text/html2text/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    description = "html2text is a command line utility, written in C++, that converts HTML documents into plain text.";
+    description = "A command line utility, written in C++, that converts HTML documents into plain text";
     homepage = http://www.mbayer.de/html2text/;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/typesetting/tex/texlive/pgf.nix b/pkgs/tools/typesetting/tex/texlive/pgf.nix
deleted file mode 100644
index b46229e9828..00000000000
--- a/pkgs/tools/typesetting/tex/texlive/pgf.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-args: with args;
-
-
-rec {
-  name = "texlive-pgf-2010";
-
-  src = fetchurl {
-    url = "mirror://debian/pool/main/p/pgf/pgf_2.10.orig.tar.gz";
-    sha256 = "642092e6b49df9e33bd901ac7eb7024ff235a29f43d27e78e5827ca3bc03f120";
-  };
-
-  propagatedBuildInputs = [texLiveLatexXColor texLive];
-
-  phaseNames = ["doCopy"];
-  doCopy = fullDepEntry (''
-    mkdir -p $out/share/
-    mkdir -p $out/texmf-dist/tex/generic/pgf
-    cp -r * $out/texmf-dist/tex/generic/pgf
-    ln -s $out/texmf* $out/share/
-  '') ["minInit" "doUnpack" "defEnsureDir" "addInputs"];
-
-  meta = {
-    description = "Extra components for TeXLive: graphics package";
-
-    longDescription = ''
-      PGF is a macro package for creating graphics.  It is platform-
-      and format-independent and works together with the most
-      important TeX backend drivers, including pdftex and dvips.  It
-      comes with a user-friedly syntax layer called TikZ.
-
-      Its usage is similar to pstricks and the standard picture
-      environment.  PGF works with plain (pdf-)TeX, (pdf-)LaTeX, and
-      ConTeXt.  Unlike pstricks , it can produce either PostScript or
-      PDF output.
-    '';
-
-    license = [ "GPLv2" "LPPLv1.3c" ];
-
-    homepage = http://tug.ctan.org/tex-archive/graphics/pgf/;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ecebc3ae62..34794049d7d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -375,12 +375,31 @@ let
     inherit sha256;
   };
 
+  # gitorious example
   fetchFromGitorious = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
     inherit name;
     url = "https://gitorious.org/${owner}/${repo}/archive/${rev}.tar.gz";
     inherit sha256;
   };
 
+  # cgit example, snapshot support is optional in cgit
+  fetchFromSavannah = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
+    inherit name sha256;
+    url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz";
+  };
+
+  # gitlab example
+  fetchFromGitLab = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
+    inherit name sha256;
+    url = "https://gitlab.com/${owner}/${repo}/repository/archive.tar.gz?ref=${rev}";
+  };
+
+  # gitweb example, snapshot support is optional in gitweb
+  fetchFromRepoOrCz = { repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip {
+    inherit name sha256;
+    url = "http://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz";
+  };
+
   resolveMirrorURLs = {url}: fetchurl {
     showURLs = true;
     inherit url;
@@ -475,6 +494,8 @@ let
 
   actdiag = pythonPackages.actdiag;
 
+  actkbd = callPackage ../tools/system/actkbd { };
+
   adom = callPackage ../games/adom { };
 
   advancecomp = callPackage ../tools/compression/advancecomp {};
@@ -483,6 +504,12 @@ let
 
   aegisub = callPackage ../applications/video/aegisub {
     wxGTK = wxGTK30;
+    spellcheckSupport = config.aegisub.spellcheckSupport or true;
+    automationSupport = config.aegisub.automationSupport or true;
+    openalSupport     = config.aegisub.openalSupport or false;
+    alsaSupport       = config.aegisub.alsaSupport or true;
+    pulseaudioSupport = config.aegisub.pulseaudioSupport or true;
+    portaudioSupport  = config.aegisub.portaudioSupport or false;
   };
 
   aespipe = callPackage ../tools/security/aespipe { };
@@ -491,6 +518,8 @@ let
 
   afl = callPackage ../tools/security/afl { };
 
+  aha = callPackage ../tools/text/aha { };
+
   ahcpd = callPackage ../tools/networking/ahcpd { };
 
   aiccu = callPackage ../tools/networking/aiccu { };
@@ -578,9 +607,7 @@ let
 
   otool = callPackage ../os-specific/darwin/otool { };
 
-  pass = callPackage ../tools/security/pass {
-    gnupg = gnupg1compat;
-  };
+  pass = callPackage ../tools/security/pass { };
 
   setfile = callPackage ../os-specific/darwin/setfile { };
 
@@ -634,6 +661,8 @@ let
 
   bashmount = callPackage ../tools/filesystems/bashmount {};
 
+  bastet = callPackage ../games/bastet {};
+
   bc = callPackage ../tools/misc/bc { };
 
   bcache-tools = callPackage ../tools/filesystems/bcache-tools { };
@@ -696,6 +725,8 @@ let
 
   byobu = callPackage ../tools/misc/byobu { };
 
+  cabal2nix = haskellngPackages.callPackage ../development/tools/haskell/cabal2nix {};
+
   capstone = callPackage ../development/libraries/capstone { };
 
   catdoc = callPackage ../tools/text/catdoc { };
@@ -802,7 +833,7 @@ let
     krb5 = null;
     systemd = null;
     jemalloc = null;
-    mysql = null;
+    libmysql = null;
     postgresql = null;
     libdbi = null;
     net_snmp = null;
@@ -885,7 +916,9 @@ let
 
   bsdiff = callPackage ../tools/compression/bsdiff { };
 
-  btar = callPackage ../tools/backup/btar { };
+  btar = callPackage ../tools/backup/btar {
+    librsync = librsync_0_9;
+  };
 
   bud = callPackage ../tools/networking/bud {
     inherit (pythonPackages) gyp;
@@ -926,7 +959,15 @@ let
 
   cdrkit = callPackage ../tools/cd-dvd/cdrkit { };
 
+  # Only ever add ceph LTS releases
+  # The default should always be symlinked to the latest LTS
+  # Dev should always point to the latest versioned release
+  libceph = ceph.lib;
+  ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { };
+  ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { };
   ceph = callPackage ../tools/filesystems/ceph { };
+  ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
+  ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });
 
   cfdg = builderDefsPackage ../tools/graphics/cfdg {
     inherit libpng bison flex ffmpeg;
@@ -978,7 +1019,9 @@ let
 
   convertlit = callPackage ../tools/text/convertlit { };
 
-  collectd = callPackage ../tools/system/collectd { };
+  collectd = callPackage ../tools/system/collectd {
+    rabbitmq-c = rabbitmq-c_0_4;
+  };
 
   colormake = callPackage ../development/tools/build-managers/colormake { };
 
@@ -1050,6 +1093,12 @@ let
 
   cudatoolkit = cudatoolkit5;
 
+  curlFull = curl.override {
+    idnSupport = true;
+    ldapSupport = true;
+    gssSupport = true;
+  };
+
   curl = callPackage ../tools/networking/curl rec {
     fetchurl = fetchurlBoot;
     zlibSupport = true;
@@ -1339,6 +1388,8 @@ let
     withGTK = true;
   };
 
+  foremost = callPackage ../tools/system/foremost { };
+
   forktty = callPackage ../os-specific/linux/forktty {};
 
   fortune = callPackage ../tools/misc/fortune { };
@@ -1610,6 +1661,8 @@ let
 
   pxz = callPackage ../tools/compression/pxz { };
 
+  hans = callPackage ../tools/networking/hans { };
+
   haproxy = callPackage ../tools/networking/haproxy { };
 
   haveged = callPackage ../tools/security/haveged { };
@@ -1620,6 +1673,8 @@ let
 
   hashcat = callPackage ../tools/security/hashcat { };
 
+  hal-flash = callPackage ../os-specific/linux/hal-flash { };
+
   halibut = callPackage ../tools/typesetting/halibut { };
 
   hddtemp = callPackage ../tools/misc/hddtemp { };
@@ -1676,13 +1731,8 @@ let
 
   ihaskell = callPackage ../development/tools/haskell/ihaskell/wrapper.nix {
     inherit (pythonPackages) ipython;
-    inherit (haskellPackages) ihaskell ghc;
-  };
-
-  ihaskell-with-packages = callPackage ../development/tools/haskell/ihaskell/ng-wrapper.nix {
-    inherit (pythonPackages) ipython;
     inherit (haskellngPackages) ihaskell ghcWithPackages;
-    packages = self: config.ihaskell.packages or [];
+    packages = config.ihaskell.packages or (self: []);
   };
 
   imapproxy = callPackage ../tools/networking/imapproxy { };
@@ -1695,6 +1745,8 @@ let
 
   inetutils = callPackage ../tools/networking/inetutils { };
 
+  innoextract = callPackage ../tools/archivers/innoextract {};
+
   ioping = callPackage ../tools/system/ioping {};
 
   iodine = callPackage ../tools/networking/iodine { };
@@ -1720,6 +1772,8 @@ let
 
   isync = callPackage ../tools/networking/isync { };
 
+  jaaa = callPackage ../applications/audio/jaaa { };
+
   jd-gui = callPackage_i686 ../tools/security/jd-gui { };
 
   jdiskreport = callPackage ../tools/misc/jdiskreport { };
@@ -1748,9 +1802,11 @@ let
 
   kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { };
 
+  kdbplus = callPackage_i686 ../applications/misc/kdbplus { };
+
   kexectools = callPackage ../os-specific/linux/kexectools { };
 
-  #keybase-node-client = callPackage ../applications/misc/keybase-node-client { };
+  keybase = callPackage ../applications/misc/keybase { };
 
   keychain = callPackage ../tools/misc/keychain { };
 
@@ -1808,13 +1864,18 @@ let
   nodejs-unstable = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_2_0; unstableVersion = true; };
   nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { };
 
-  nodePackages = callPackage ./node-packages.nix { self = nodePackages; };
+  nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; };
+
+  nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
+
+  nodePackages = nodePackages_0_12;
 
   iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; };
-  iojs-nightly = callPackage ../development/web/iojs { libuv = libuvVersions.v1_4_0; nightly = true; };
 
   iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
 
+  npm2nix = nodePackages_0_10.npm2nix;
+
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
   ldns = callPackage ../development/libraries/ldns { };
@@ -1837,8 +1898,6 @@ let
 
   libtermkey = callPackage ../development/libraries/libtermkey { };
 
-  libtidy = callPackage ../development/libraries/libtidy { };
-
   libtirpc = callPackage ../development/libraries/ti-rpc { };
 
   libshout = callPackage ../development/libraries/libshout { };
@@ -1961,7 +2020,6 @@ let
 
   minecraft = callPackage ../games/minecraft {
     pulseaudioSupport = config.pulseaudio or true;
-    pulseaudio = pulseaudio.override { ossWrapper = true; };
   };
 
   minecraft-server = callPackage ../games/minecraft-server { };
@@ -2093,7 +2151,7 @@ let
 
   networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { };
 
-  networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { dconf = gnome3.dconf; };
+  networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { };
 
   newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { };
 
@@ -2399,6 +2457,8 @@ let
 
   plan9port = callPackage ../tools/system/plan9port { };
 
+  plex = callPackage ../servers/plex { };
+
   ploticus = callPackage ../tools/graphics/ploticus {
     libpng = libpng12;
   };
@@ -2601,6 +2661,8 @@ let
 
   rrdtool = callPackage ../tools/misc/rrdtool { };
 
+  rsstail = callPackage ../applications/networking/feedreaders/rsstail { };
+
   rtorrent = callPackage ../tools/networking/p2p/rtorrent { };
 
   rtorrent-git = callPackage ../tools/networking/p2p/rtorrent/git.nix { };
@@ -2643,6 +2705,10 @@ let
 
   screen-message = callPackage ../tools/X11/screen-message { };
 
+  screencloud = callPackage ../applications/graphics/screencloud {
+    quazip = quazip.override { qt = qt4; };
+  };
+
   scrot = callPackage ../tools/graphics/scrot { };
 
   scrolls = callPackage ../games/scrolls { };
@@ -2683,6 +2749,8 @@ let
 
   simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
 
+  skydns = callPackage ../servers/dns/skydns { };
+
   sleuthkit = callPackage ../tools/system/sleuthkit {};
 
   slimrat = callPackage ../tools/networking/slimrat {
@@ -2709,10 +2777,6 @@ let
 
   spiped = callPackage ../tools/networking/spiped { };
 
-  sproxy = haskellPackages.callPackage ../tools/networking/sproxy { };
-
-  sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { };
-
   sqliteman = callPackage ../applications/misc/sqliteman { };
 
   stardict = callPackage ../applications/misc/stardict/stardict.nix {
@@ -2745,7 +2809,7 @@ let
 
   sudo = callPackage ../tools/security/sudo { };
 
-  suidChroot = builderDefsPackage (import ../tools/system/suid-chroot) { };
+  suidChroot = callPackage ../tools/system/suid-chroot { };
 
   super = callPackage ../tools/security/super { };
 
@@ -2877,6 +2941,8 @@ let
 
   tpm-tools = callPackage ../tools/security/tpm-tools { };
 
+  trace-cmd = callPackage ../os-specific/linux/trace-cmd { };
+
   traceroute = callPackage ../tools/networking/traceroute { };
 
   trash-cli = callPackage ../tools/misc/trash-cli { };
@@ -3186,6 +3252,7 @@ let
   xflux = callPackage ../tools/misc/xflux { };
 
   xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
+  libxfs = xfsprogs.lib;
 
   xml2 = callPackage ../tools/text/xml/xml2 { };
 
@@ -3219,6 +3286,11 @@ let
     inherit (xlibs) libXt libXaw libXtst xextproto libXi libXpm gccmakedep;
   };
 
+  # To expose more packages for Yi, override the extraPackages arg.
+  yi = callPackage ../applications/editors/yi/wrapper.nix {
+    haskellPackages = haskellngPackages;
+  };
+
   youtube-dl = callPackage ../tools/misc/youtube-dl { };
 
   zbar = callPackage ../tools/graphics/zbar {
@@ -3261,6 +3333,8 @@ let
 
   dash = callPackage ../shells/dash { };
 
+  es = callPackage ../shells/es { };
+
   fish = callPackage ../shells/fish {
     python = python27Full;
   };
@@ -3656,9 +3730,9 @@ let
     sha256 = "ce92859550819d4a3d1a6e2672ea64882b30afa2c08cf67fa8e1d93788c2c577";
   };
   gcc-arm-embedded-4_9 = callPackage_i686 ../development/compilers/gcc-arm-embedded {
-    version = "4.9-2014q4-20141203";
-    releaseType = "major";
-    sha256 = "a440bcf68e36b291697567816e756877cd3b5782298e3e3c44eb0812a471980f";
+    version = "4.9-2015q1-20150306";
+    releaseType = "update";
+    sha256 = "c5e0025b065750bbd76b5357b4fc8606d88afbac9ff55b8a82927b4b96178154";
   };
   gcc-arm-embedded = gcc-arm-embedded-4_9;
 
@@ -3701,7 +3775,7 @@ let
   haskellPackages = haskellPackages_ghc784;
 
   haskell-ng = callPackage ./haskell-ng.nix { };
-  haskellngPackages = haskell-ng.packages.ghc784.override {
+  haskellngPackages = haskell-ng.packages.ghc7101.override {
     overrides = config.haskellPackageOverrides or (self: super: {});
     provideOldAttributeNames = config.provideOldHaskellAttributeNames or false;
   };
@@ -3842,7 +3916,6 @@ let
   julia02 = callPackage ../development/compilers/julia/0.2.nix {
     liblapack = liblapack.override {shared = true;};
     llvm = llvm_33;
-    openblas = openblas_0_2_2;
     suitesparse = suitesparse_4_2;
   };
 
@@ -4116,6 +4189,8 @@ let
 
     macaque = callPackage ../development/ocaml-modules/macaque { };
 
+    magic-mime = callPackage ../development/ocaml-modules/magic-mime { };
+
     magick = callPackage ../development/ocaml-modules/magick { };
 
     menhir = callPackage ../development/ocaml-modules/menhir { };
@@ -4310,10 +4385,9 @@ let
     ocaml = ocaml_3_08_0;
   };
 
-  rustcAlpha  = callPackage ../development/compilers/rustc/1.0.0-alpha.nix {};
-  rustcAlpha2 = callPackage ../development/compilers/rustc/1.0.0-alpha2.nix {};
+  rustcBeta   = callPackage ../development/compilers/rustc/1.0.0-beta.nix {};
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
-  rustc = rustcAlpha2;
+  rustc = rustcBeta;
 
 
   sbclBootstrap = callPackage ../development/compilers/sbcl/bootstrap.nix {};
@@ -4341,6 +4415,8 @@ let
 
   sqldeveloper = callPackage ../development/tools/database/sqldeveloper { };
 
+  squeak = callPackage ../development/compilers/squeak { };
+
   stalin = callPackage ../development/compilers/stalin { };
 
   strategoPackages = recurseIntoAttrs strategoPackages018;
@@ -4591,7 +4667,7 @@ let
 
   perl = if system != "i686-cygwin" then perl520 else sysPerl;
 
-  php = php54;
+  php = php56;
 
   phpPackages = recurseIntoAttrs (import ./php-packages.nix {
     inherit php pkgs;
@@ -4745,7 +4821,9 @@ let
 
   sysPerl = callPackage ../development/interpreters/perl/sys-perl { };
 
-  tcl = callPackage ../development/interpreters/tcl { };
+  tcl = tcl-8_6;
+  tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
+  tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };
 
   xulrunner = callPackage ../development/interpreters/xulrunner {
     inherit (gnome) libIDL;
@@ -4789,6 +4867,8 @@ let
   jdtsdk = callPackage ../development/eclipse/jdt-sdk { };
 
   jruby165 = callPackage ../development/interpreters/jruby { };
+  
+  jython = callPackage ../development/interpreters/jython {};
 
   guileCairo = callPackage ../development/guile-modules/guile-cairo { };
 
@@ -5397,6 +5477,8 @@ let
 
   aalib = callPackage ../development/libraries/aalib { };
 
+  accelio = callPackage ../development/libraries/accelio { };
+
   accountsservice = callPackage ../development/libraries/accountsservice { };
 
   acl = callPackage ../development/libraries/acl { };
@@ -5420,6 +5502,8 @@ let
 
   appstream = callPackage ../development/libraries/appstream { };
 
+  appstream-glib = callPackage ../development/libraries/appstream-glib { };
+
   apr = callPackage ../development/libraries/apr { };
 
   aprutil = callPackage ../development/libraries/apr-util {
@@ -5552,10 +5636,19 @@ let
     cogl = cogl_1_18;
   };
 
+  clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix {
+    cogl = cogl_1_20;
+  };
+
   clutter-gst = callPackage ../development/libraries/clutter-gst { };
 
+  clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { };
+
   clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
   clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };
+  clutter_gtk_1_6 = callPackage ../development/libraries/clutter-gtk/1.6.nix {
+    clutter = clutter_1_22;
+  };
 
   cminpack = callPackage ../development/libraries/cminpack { };
 
@@ -5563,6 +5656,8 @@ let
 
   cogl_1_18 = callPackage ../development/libraries/cogl/1.18.nix { };
 
+  cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { };
+
   coin3d = callPackage ../development/libraries/coin3d { };
 
   commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
@@ -5760,6 +5855,8 @@ let
 
   gav = callPackage ../games/gav { };
 
+  gcab = callPackage ../development/libraries/gcab { };
+
   gsb = callPackage ../games/gsb { };
 
   gdome2 = callPackage ../development/libraries/gdome2 {
@@ -5772,6 +5869,8 @@ let
 
   gegl = callPackage ../development/libraries/gegl { };
 
+  gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { };
+
   geoclue = callPackage ../development/libraries/geoclue {};
 
   geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};
@@ -5790,6 +5889,10 @@ let
   gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { };
   gettext_0_19 = callPackage ../development/libraries/gettext { };
 
+  gettextWithExpat = gettext: callPackage ../development/libraries/gettext/expat.nix {
+    inherit gettext;
+  };
+
   gd = callPackage ../development/libraries/gd { };
 
   gdal = callPackage ../development/libraries/gdal { };
@@ -5930,6 +6033,8 @@ let
     inherit (gnome) gtkdoc;
   };
 
+  qt-mobility = callPackage ../development/libraries/qt-mobility {};
+
   qt_gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
 
   qt_gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost156;};
@@ -5938,7 +6043,7 @@ let
 
   gnu-efi = callPackage ../development/libraries/gnu-efi { };
 
-  gnutls = gnutls33;
+  gnutls = gnutls34;
 
   gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix {
     guileBindings = config.gnutls.guile or false;
@@ -5950,10 +6055,16 @@ let
     nettle = nettle27;
   };
 
+  gnutls34 = callPackage ../development/libraries/gnutls/3.4.nix {
+    guileBindings = config.gnutls.guile or false;
+  };
+
   gnutls32_with_guile = lowPrio (gnutls32.override { guileBindings = true; });
 
   gnutls33_with_guile = lowPrio (gnutls33.override { guileBindings = true; });
 
+  gnutls34_with_guile = lowPrio (gnutls34.override { guileBindings = true; });
+
   gpac = callPackage ../applications/video/gpac { };
 
   gpgme = callPackage ../development/libraries/gpgme {
@@ -6020,10 +6131,17 @@ let
 
   gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
 
+  gtk3_16 = callPackage ../development/libraries/gtk+/3.16.nix {
+    gettext = gettextWithExpat gettext_0_19;
+  };
+
   gtk = pkgs.gtk2;
 
   gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { };
   gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
+  gtkmm3_16 = callPackage ../development/libraries/gtkmm/3.16.nix {
+    gtk3 = gtk3_16;
+  };
 
   gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp {
     gtksharp = gtk-sharp;
@@ -6178,10 +6296,11 @@ let
     automake = automake111x;
   };
 
-  kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 { });
   kf59 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.9 { });
   kf5_latest = kf59;
-  kf5_stable = kf57;
+  kf5_stable = kf59;
+
+  kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
     openldap = openldap.override {
@@ -6244,6 +6363,8 @@ let
     automake = automake112x; # fails with 13 and 14
   };
 
+  libasyncns = callPackage ../development/libraries/libasyncns { };
+
   libatomic_ops = callPackage ../development/libraries/libatomic_ops {};
 
   libav = libav_11; # branch 11 is API-compatible with branch 10
@@ -6293,6 +6414,10 @@ let
 
   libcli = callPackage ../development/libraries/libcli { };
 
+  libclthreads = callPackage ../development/libraries/libclthreads  { };
+
+  libclxclient = callPackage ../development/libraries/libclxclient  { };
+
   libcm = callPackage ../development/libraries/libcm { };
 
   inherit (gnome3) libcroco;
@@ -6314,12 +6439,12 @@ let
   libdbi = callPackage ../development/libraries/libdbi { };
 
   libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {
-    mysql = null;
+    libmysql = null;
     sqlite = null;
   };
 
   libdbiDrivers = libdbiDriversBase.override {
-    inherit sqlite mysql;
+    inherit sqlite libmysql;
   };
 
   libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
@@ -6443,9 +6568,7 @@ let
 
   libfixposix = callPackage ../development/libraries/libfixposix {};
 
-  libffcall = builderDefsPackage (import ../development/libraries/libffcall) {
-    inherit fetchcvs;
-  };
+  libffcall = callPackage ../development/libraries/libffcall { };
 
   libffi = callPackage ../development/libraries/libffi { };
 
@@ -6748,6 +6871,10 @@ let
 
   librsync = callPackage ../development/libraries/librsync { };
 
+  librsync_0_9 = callPackage ../development/libraries/librsync/0.9.nix { };
+
+  libs3 = callPackage ../development/libraries/libs3 { };
+
   libsearpc = callPackage ../development/libraries/libsearpc { };
 
   libsigcxx = callPackage ../development/libraries/libsigcxx { };
@@ -6840,6 +6967,8 @@ let
 
   libusb1 = callPackage ../development/libraries/libusb1 { };
 
+  libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
+
   libunwind = if stdenv.isDarwin
     then callPackage ../development/libraries/libunwind/native.nix {}
     else callPackage ../development/libraries/libunwind { };
@@ -6873,7 +7002,7 @@ let
 
   libviper = callPackage ../development/libraries/libviper { };
 
-  libvpx = if stdenv.isDarwin then libvpx-git else callPackage ../development/libraries/libvpx { };
+  libvpx = callPackage ../development/libraries/libvpx { };
   libvpx-git = callPackage ../development/libraries/libvpx/git.nix { };
 
   libvterm = callPackage ../development/libraries/libvterm { };
@@ -6907,11 +7036,11 @@ let
   libxmi = callPackage ../development/libraries/libxmi { };
 
   libxml2 = callPackage ../development/libraries/libxml2 {
-    pythonSupport = false;
+    python = null;
   };
 
   libxml2Python = lowPrio (libxml2.override {
-    pythonSupport = true;
+    inherit python;
   });
 
   libxmlxx = callPackage ../development/libraries/libxmlxx { };
@@ -7083,6 +7212,8 @@ let
     texinfo = texinfo4;
   };
 
+  mueval = callPackage ../development/tools/haskell/mueval { };
+
   muparser = callPackage ../development/libraries/muparser { };
 
   mygpoclient = callPackage ../development/python-modules/mygpoclient { };
@@ -7220,6 +7351,8 @@ let
 
   pangoxsl = callPackage ../development/libraries/pangoxsl { };
 
+  pcg_c = callPackage ../development/libraries/pcg-c { };
+
   pcl = callPackage ../development/libraries/pcl {
     vtk = vtkWithQt4;
   };
@@ -7396,8 +7529,12 @@ let
 
   qwt6 = callPackage ../development/libraries/qwt/6.nix { };
 
+  qxt = callPackage ../development/libraries/qxt {};
+
   rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {};
 
+  rabbitmq-c_0_4 = callPackage ../development/libraries/rabbitmq-c/0.4.nix {};
+
   rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
 
   raul = callPackage ../development/libraries/audio/raul { };
@@ -7413,6 +7550,12 @@ let
 
   readosm = callPackage ../development/libraries/readosm { };
 
+  lambdabot = callPackage ../development/tools/haskell/lambdabot { };
+
+  leksah = callPackage ../development/tools/haskell/leksah {
+    inherit (haskellngPackages) ghcWithPackages;
+  };
+
   librdf_raptor = callPackage ../development/libraries/librdf/raptor.nix { };
 
   librdf_raptor2 = callPackage ../development/libraries/librdf/raptor2.nix { };
@@ -7442,6 +7585,8 @@ let
 
   rlog = callPackage ../development/libraries/rlog { };
 
+  rocksdb = callPackage ../development/libraries/rocksdb { };
+
   rubberband = callPackage ../development/libraries/rubberband {
     fftw = fftwSinglePrec;
     inherit (vamp) vampSDK;
@@ -7505,7 +7650,7 @@ let
 
   simgear = callPackage ../development/libraries/simgear { };
 
-  sfml_git = callPackage ../development/libraries/sfml { };
+  sfml = callPackage ../development/libraries/sfml { };
 
   skalibs = callPackage ../development/libraries/skalibs { };
 
@@ -7546,7 +7691,13 @@ let
 
   speech_tools = callPackage ../development/libraries/speech-tools {};
 
-  speex = callPackage ../development/libraries/speex { };
+  speex = callPackage ../development/libraries/speex {
+    fftw = fftwFloat;
+  };
+
+  speexdsp = callPackage ../development/libraries/speexdsp {
+    fftw = fftwFloat;
+  };
 
   sphinxbase = callPackage ../development/libraries/sphinxbase { };
 
@@ -7748,7 +7899,7 @@ let
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
 
-  webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.6.nix {
+  webkitgtk24x = callPackage ../development/libraries/webkitgtk/2.4.nix {
     harfbuzz = harfbuzz-icu;
     gst-plugins-base = gst_all_1.gst-plugins-base;
   };
@@ -7760,6 +7911,8 @@ let
 
   websocketpp = callPackage ../development/libraries/websocket++ { };
 
+  webrtc-audio-processing = callPackage ../development/libraries/webrtc-audio-processing { };
+
   wildmidi = callPackage ../development/libraries/wildmidi { };
 
   wiredtiger = callPackage ../development/libraries/wiredtiger { };
@@ -7789,8 +7942,6 @@ let
 
   x265 = callPackage ../development/libraries/x265 { };
 
-  x265-hg = callPackage ../development/libraries/x265/hg.nix { };
-
   xapian = callPackage ../development/libraries/xapian { };
 
   xapianBindings = callPackage ../development/libraries/xapian/bindings {  # TODO perl php Java, tcl, C#, python
@@ -7871,6 +8022,8 @@ let
 
   czmq = callPackage ../development/libraries/czmq { };
 
+  zita-alsa-pcmi = callPackage ../development/libraries/zita-alsa-pcmi { };
+
   zziplib = callPackage ../development/libraries/zziplib { };
 
   ### DEVELOPMENT / LIBRARIES / AGDA
@@ -7878,7 +8031,7 @@ let
   agda = callPackage ../build-support/agda {
     glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null;
     extension = self : super : { };
-    inherit (haskellngPackages) Agda;
+    inherit (haskell-ng.packages.ghc784) Agda;
     inherit writeScriptBin;
   };
 
@@ -7987,7 +8140,9 @@ let
     go = go_1_3;
     buildGoPackage = import ../development/go-modules/generic {
       go = go_1_3;
-    };
+      govers = go13Packages.govers;
+      inherit lib;
+   };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   });
 
@@ -7995,6 +8150,8 @@ let
     go = go_1_4;
     buildGoPackage = import ../development/go-modules/generic {
       go = go_1_4;
+      govers = go14Packages.govers;
+      inherit lib;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   });
@@ -8227,6 +8384,8 @@ let
 
   apcupsd = callPackage ../servers/apcupsd { };
 
+  asterisk = callPackage ../servers/asterisk { };
+
   sabnzbd = callPackage ../servers/sabnzbd { };
 
   bind = callPackage ../servers/dns/bind { };
@@ -8346,7 +8505,10 @@ let
 
   mpd = callPackage ../servers/mpd {
     aacSupport    = config.mpd.aacSupport or true;
+    clientSupport = config.mpd.clientSupport or false;
     ffmpegSupport = config.mpd.ffmpegSupport or true;
+    opusSupport   = config.mpd.opusSupport or true;
+
   };
 
   mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { };
@@ -8399,21 +8561,31 @@ let
 
   pshs = callPackage ../servers/http/pshs { };
 
-  pulseaudio = callPackage ../servers/pulseaudio {
-    gconf = gnome.GConf;
+  libpulseaudio = pulseaudioFull.override {
+    prefix = "lib";
+  };
+
+  pulseaudio = pulseaudioFull.override {
     # The following are disabled in the default build, because if this
     # functionality is desired, they are only needed in the PulseAudio
     # server.
-    bluez = null;
+    xlibs = null;
+    coreaudio = null;
+    esound = null;
+    libjack2 = null;
     avahi = null;
+    lirc = null;
+    bluez5 = null;
+    tdb = null;
+    gdbm = null;
   };
 
-  pulseaudioFull = pulseaudio.override {
-    bluez = bluez5;
-    avahi = avahi;
-    jackaudioSupport = true;
-    x11Support = true;
-    useSystemd = stdenv.isLinux;
+  pulseaudioFull = callPackage ../servers/pulseaudio {
+    gconf = gnome3.gconf;
+    fftw = fftwFloat;
+
+    # Disabled unless debugging
+    valgrind = null;
   };
 
   tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { };
@@ -8448,6 +8620,7 @@ let
   mysql55 = callPackage ../servers/sql/mysql/5.5.x.nix { };
 
   mysql = mariadb;
+  libmysql = mysql.lib;
 
   mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
 
@@ -8566,10 +8739,11 @@ let
     pythonPackages = python2Packages;
     kerberos = heimdal;
     libgcrypt = libgcrypt_1_6;
+    gnutls = gnutls33;
     cups = if stdenv.isDarwin then null else cups;
     pam = if stdenv.isDarwin then null else pam;
     libaio = if stdenv.isDarwin then null else libaio;
-    ceph = if stdenv.isDarwin then null else ceph;
+    libceph = if stdenv.isDarwin then null else libceph;
     glusterfs = if stdenv.isDarwin then null else glusterfs;
     dbus = if stdenv.isLinux then dbus else null;
     libibverbs = if stdenv.isLinux then libibverbs else null;
@@ -8603,7 +8777,7 @@ let
     acl = null;
     libaio = null;
     fam = null;
-    ceph = null;
+    libceph = null;
     glusterfs = null;
 
     # buildtools/wafsamba/wscript optionals
@@ -8693,7 +8867,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libpng zlib perl mesa_drivers spice_protocol
-      dbus libuuid openssl gperf m4 libevdev tradcpp libinput
+      dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper
       autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman;
     bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null;
     mesa = mesa_noglu;
@@ -8741,9 +8915,7 @@ let
 
   alsaLib = callPackage ../os-specific/linux/alsa-lib { };
 
-  alsaPlugins = callPackage ../os-specific/linux/alsa-plugins {
-    jack2 = null;
-  };
+  alsaPlugins = callPackage ../os-specific/linux/alsa-plugins { };
 
   alsaPluginWrapper = callPackage ../os-specific/linux/alsa-plugins/wrapper.nix { };
 
@@ -8773,6 +8945,8 @@ let
 
   b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
 
+  b43Firmware_6_30_163_46 = callPackage ../os-specific/linux/firmware/b43-firmware/6.30.163.46.nix { };
+
   b43FirmwareCutter = callPackage ../os-specific/linux/firmware/b43-firmware-cutter { };
 
   batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
@@ -8916,6 +9090,7 @@ let
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
   ffado = callPackage ../os-specific/linux/ffado { };
+  libffado = ffado.override { prefix = "lib"; };
 
   fbterm = callPackage ../os-specific/linux/fbterm { };
 
@@ -8925,6 +9100,8 @@ let
 
   fuse = callPackage ../os-specific/linux/fuse { };
 
+  fusionio-util = callPackage ../os-specific/linux/fusionio/util.nix { };
+
   fxload = callPackage ../os-specific/linux/fxload { };
 
   gfxtablet = callPackage ../os-specific/linux/gfxtablet {};
@@ -9095,6 +9272,16 @@ let
       ];
   };
 
+  linux_4_0 = makeOverridable (import ../os-specific/linux/kernel/linux-4.0.nix) {
+    inherit fetchurl stdenv perl buildLinux;
+    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
     inherit fetchurl stdenv perl buildLinux;
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
@@ -9148,6 +9335,8 @@ let
   linuxPackagesFor = kernel: self: let callPackage = newScope self; in rec {
     inherit kernel;
 
+    accelio = callPackage ../development/libraries/accelio { };
+
     acpi_call = callPackage ../os-specific/linux/acpi-call {};
 
     batman_adv = callPackage ../os-specific/linux/batman-adv {};
@@ -9168,6 +9357,8 @@ let
 
     frandom = callPackage ../os-specific/linux/frandom { };
 
+    fusionio-vsl = callPackage ../os-specific/linux/fusionio/vsl.nix { };
+
     ktap = callPackage ../os-specific/linux/ktap { };
 
     lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
@@ -9255,7 +9446,7 @@ let
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = pkgs.linuxPackages_3_19;
+  linuxPackages_latest = pkgs.linuxPackages_4_0;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -9268,6 +9459,7 @@ let
   linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
   linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19);
+  linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
   linuxPackages_custom = {version, src, configfile}:
                            let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile;
@@ -9451,6 +9643,10 @@ let
 
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
+  sassc = callPackage ../development/tools/sassc { };
+
+  schedtool = callPackage ../os-specific/linux/schedtool { };
+
   sdparm = callPackage ../os-specific/linux/sdparm { };
 
   sepolgen = callPackage ../os-specific/linux/sepolgen { };
@@ -9526,6 +9722,8 @@ let
     guile = guile_1_8;
   };
 
+  trinity = callPackage ../os-specific/linux/trinity { };
+
   tunctl = callPackage ../os-specific/linux/tunctl { };
 
   ubootChooser = name : if name == "upstream" then ubootUpstream
@@ -9768,6 +9966,8 @@ let
 
   fira = callPackage ../data/fonts/fira { };
 
+  fira-mono = callPackage ../data/fonts/fira-mono { };
+
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
   freepats = callPackage ../data/misc/freepats { };
@@ -9844,6 +10044,8 @@ let
 
   posix_man_pages = callPackage ../data/documentation/man-pages-posix { };
 
+  powerline-fonts = callPackage ../data/fonts/powerline-fonts { };
+
   proggyfonts = callPackage ../data/fonts/proggyfonts { };
 
   pthreadmanpages = callPackage ../data/documentation/pthread-man-pages {
@@ -9970,8 +10172,12 @@ let
 
   alock = callPackage ../misc/screensavers/alock { };
 
-  alpine = callPackage ../applications/networking/mailreaders/alpine {};
-  realpine = callPackage ../applications/networking/mailreaders/realpine {};
+  alpine = callPackage ../applications/networking/mailreaders/alpine {
+    tcl = tcl-8_5;
+  };
+  realpine = callPackage ../applications/networking/mailreaders/realpine {
+    tcl = tcl-8_5;
+  };
 
   ams-lv2 = callPackage ../applications/audio/ams-lv2 { };
 
@@ -10046,6 +10252,8 @@ let
 
   backintime = backintime-qt4;
 
+  bandwidth = callPackage ../tools/misc/bandwidth { };
+
   bar = callPackage ../applications/window-managers/bar { };
 
   baresip = callPackage ../applications/networking/instant-messengers/baresip {
@@ -10228,6 +10436,8 @@ let
     inherit (gnome) GConf libglade;
   };
 
+  dbvisualizer = callPackage ../applications/misc/dbvisualizer {};
+
   dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
 
   deadbeef = callPackage ../applications/audio/deadbeef {
@@ -10240,6 +10450,8 @@ let
 
   diffuse = callPackage ../applications/version-management/diffuse { };
 
+  dirt = callPackage ../applications/audio/dirt {};
+
   distrho = callPackage ../applications/audio/distrho {};
 
   djvulibre = callPackage ../applications/misc/djvulibre { };
@@ -10320,6 +10532,8 @@ let
 
   emacs24-nox = lowPrio (appendToName "nox" (emacs24.override {
     withX = false;
+    withGTK2 = false;
+    withGTK3 = false;
   }));
 
   emacs24Macport_24_3 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.3.nix {
@@ -10328,7 +10542,10 @@ let
   emacs24Macport_24_4 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.4.nix {
     stdenv = pkgs.clangStdenv;
   });
-  emacs24Macport = self.emacs24Macport_24_4;
+  emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix {
+    stdenv = pkgs.clangStdenv;
+  });
+  emacs24Macport = self.emacs24Macport_24_5;
 
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;
@@ -10501,12 +10718,17 @@ let
     };
 
     external = {
-      inherit (haskellngPackages) ghc-mod structured-haskell-mode Agda;
+      # FIXME: revert when Agda and ghc-mod are fixed on 7.10
+      inherit (haskell-ng.packages.ghc784) ghc-mod Agda;
+      inherit (haskellngPackages) structured-haskell-mode;
     };
   };
 
   emacs24PackagesNg = recurseIntoAttrs (emacsPackagesNgGen emacs24);
 
+  emacsWithPackages = callPackage ../build-support/emacs/wrapper.nix { };
+  emacs24WithPackages = emacsWithPackages.override { emacs = emacs24; };
+
   inherit (gnome3) empathy;
 
   enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { };
@@ -10653,6 +10875,11 @@ let
       libXfixes libXinerama libXrender libXt;
   };
 
+  firestr = callPackage ../applications/networking/p2p/firestr
+    { boost = boost155;
+      inherit (xlibs) libXScrnSaver;
+    };
+
   flac = callPackage ../applications/audio/flac { };
 
   flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
@@ -11042,15 +11269,10 @@ let
     boost = boost155;
   };
 
-  kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
-    kf5 = kf57;
-    kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
-  });
   kdeApps_15_04 = recurseIntoAttrs (callPackage ../applications/kde-apps-15.04 {
     kf5 = kf59;
-    kde4 = kde4.override { inherit (kdeApps_14_12) kdelibs; };
   });
-  kdeApps_stable = kdeApps_14_12;
+  kdeApps_stable = kdeApps_15_04;
   kdeApps_latest = kdeApps_15_04;
 
   keepnote = callPackage ../applications/office/keepnote {
@@ -11557,8 +11779,14 @@ let
 
   pidginwindowmerge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { };
 
+  purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };
+
   toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl { };
 
+  pithos = callPackage ../applications/audio/pithos {
+    pythonPackages = python34Packages;
+  };
+
   pinfo = callPackage ../applications/misc/pinfo { };
 
   pinpoint = callPackage ../applications/office/pinpoint {};
@@ -11571,7 +11799,7 @@ let
     inherit (xorg) libXpm;
   };
 
-  pond = callPackage ../applications/networking/pond { goPackages = go13Packages; };
+  pond = callPackage ../applications/networking/pond { goPackages = go14Packages; };
 
   potrace = callPackage ../applications/graphics/potrace {};
 
@@ -11707,6 +11935,8 @@ let
 
   rtl-sdr = callPackage ../applications/misc/rtl-sdr { };
 
+  rtv = callPackage ../applications/misc/rtv { };
+
   rubyripper = callPackage ../applications/audio/rubyripper {};
 
   rxvt = callPackage ../applications/misc/rxvt { };
@@ -11787,6 +12017,8 @@ let
 
   ssvnc = callPackage ../applications/networking/remote/ssvnc { };
 
+  viber = callPackage ../applications/networking/instant-messengers/viber { };
+
   st = callPackage ../applications/misc/st {
     conf = config.st.conf or null;
   };
@@ -11980,7 +12212,7 @@ let
 
   termite = callPackage ../applications/misc/termite {
     gtk = gtk3;
-    vte = gnome3_12.vte-select-text;
+    vte = gnome3_16.vte-select-text;
    };
 
   tesseract = callPackage ../applications/graphics/tesseract { };
@@ -12308,7 +12540,8 @@ let
           ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
          );
       libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false)
-             (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]);
+             (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
+             ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash;
       gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ];
       gtk_modules = [ libcanberra ];
     };
@@ -12422,6 +12655,8 @@ let
 
   compton = callPackage ../applications/window-managers/compton { };
 
+  compton-git = callPackage ../applications/window-managers/compton/git.nix { };
+
   xdaliclock = callPackage ../tools/misc/xdaliclock {};
 
   xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
@@ -13005,6 +13240,11 @@ let
     callPackage = pkgs.newScope pkgs.gnome3_12;
   });
 
+  gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 {
+    callPackage = pkgs.newScope pkgs.gnome3_16;
+    self = pkgs.gnome3_16;
+  });
+
   gnome3 = gnome3_12;
 
   gnome = recurseIntoAttrs gnome2;
@@ -13244,11 +13484,11 @@ let
 
   numix-gtk-theme = callPackage ../misc/themes/gtk3/numix-gtk-theme { };
 
-  plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
+  plasma53 = recurseIntoAttrs (callPackage ../desktops/plasma-5.3 {
     kf5 = kf59;
   });
-  plasma5_latest = plasma52;
-  plasma5_stable = plasma52;
+  plasma5_latest = plasma53;
+  plasma5_stable = plasma53;
 
   kde5 = kf5_stable // plasma5_stable // kdeApps_stable;
 
@@ -13332,16 +13572,9 @@ let
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
-  # julia is pinned to specific versions of openblas, so keep old versions
-  # until they aren't needed. The un-versioned attribute may continue to track
-  # upstream development.
   openblas = callPackage ../development/libraries/science/math/openblas {
     liblapack = liblapack_3_5_0;
   };
-  openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix {
-    liblapack = liblapack_3_5_0;
-  };
-  openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { };
 
   mathematica = callPackage ../applications/science/math/mathematica { };
   mathematica9 = callPackage ../applications/science/math/mathematica/9.nix { };
@@ -13369,6 +13602,8 @@ let
 
   ### SCIENCE/PROGRAMMING
 
+  kframework = callPackage ../applications/science/programming/kframework { };
+
   plm = callPackage ../applications/science/programming/plm { };
 
   ### SCIENCE/LOGIC
@@ -13389,6 +13624,11 @@ let
     camlp5 = ocamlPackages.camlp5_transitional;
   };
 
+  coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix {
+    inherit (ocamlPackages) findlib lablgtk;
+    camlp5 = ocamlPackages.camlp5_transitional;
+  };
+
   coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix {
     inherit (ocamlPackages_3_12_1) ocaml findlib;
     camlp5 = ocamlPackages_3_12_1.camlp5_transitional;
@@ -13435,7 +13675,21 @@ let
 
   };
 
+  mkCoqPackages_8_5 = self: let callPackage = newScope self; in rec {
+
+    mathcomp = callPackage ../development/coq-modules/mathcomp/1.5.nix {
+      coq = coq_8_5;
+      ssreflect = ssreflect;
+    };
+
+    ssreflect = callPackage ../development/coq-modules/ssreflect/1.5.nix {
+      coq = coq_8_5;
+    };
+
+  };
+
   coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages);
+  coqPackages_8_5 = recurseIntoAttrs (mkCoqPackages_8_5 coqPackages);
 
   cvc3 = callPackage ../applications/science/logic/cvc3 {};
   cvc4 = callPackage ../applications/science/logic/cvc4 {};
@@ -13760,7 +14014,7 @@ let
 
   guix = callPackage ../tools/package-management/guix { };
 
-  gxemul = callPackage ../misc/gxemul { };
+  gxemul = callPackage ../misc/emulators/gxemul { };
 
   hatari = callPackage ../misc/emulators/hatari { };
 
@@ -13771,7 +14025,10 @@ let
   # using the new configuration style proposal which is unstable
   jack1 = callPackage ../misc/jackaudio/jack1.nix { };
 
-  jack2 = callPackage ../misc/jackaudio { };
+  jack2 = callPackage ../misc/jackaudio {
+    libopus = libopus.override { withCustomModes = true; };
+  };
+  libjack2 = jack2.override { prefix = "lib"; };
 
   keynav = callPackage ../tools/X11/keynav { };
 
@@ -14015,9 +14272,7 @@ let
     inherit texLive;
   };
 
-  texLivePGF = builderDefsPackage (import ../tools/typesetting/tex/texlive/pgf.nix) {
-    inherit texLiveLatexXColor texLive;
-  };
+  texLivePGF = pgf3;
 
   texLiveBeamer = builderDefsPackage (import ../tools/typesetting/tex/texlive/beamer.nix) {
     inherit texLiveLatexXColor texLivePGF texLive;
@@ -14088,6 +14343,12 @@ let
 
   wine = wineStable;
 
+  wineStaging = callPackage_i686 ../misc/emulators/wine/staging.nix {
+    wine = pkgsi686Linux.wineUnstable;
+    # Patent issues
+    libtxc_dxtn = pkgsi686Linux.libtxc_dxtn_s2tc;
+  };
+
   winetricks = callPackage ../misc/emulators/wine/winetricks.nix {
     inherit (gnome2) zenity;
   };
@@ -14188,6 +14449,7 @@ let
   youtubeDL = youtube-dl;  # added 2014-10-26
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   htmlTidy = html-tidy;  # added 2014-12-06
+  libtidy = html-tidy;  # added 2014-12-21
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   nfsUtils = nfs-utils;  # added 2014-12-06
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index a4f5310ab95..bc557a67597 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -227,6 +227,22 @@ let self = _self // overrides;
     };
   };
 
+  button-lock = melpaBuild rec {
+    pname   = "button-lock";
+    version = "1.0.2";
+    src = fetchFromGitHub {
+      owner  = "rolandwalker";
+      repo   = pname;
+      rev    = "v${version}";
+      sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
+    };
+    meta = {
+      description = "Mouseable text in Emacs";
+      homepage = "https://github.com/rolandwalker/button-lock";
+      license  = bsd2;
+    };
+  };
+
   caml = melpaBuild rec {
     pname   = "caml";
     version = "4.2.1"; # TODO: emacs doesn't seem to like 02 as a version component..
@@ -874,12 +890,12 @@ let self = _self // overrides;
 
   popup = melpaBuild rec {
     pname   = "popup";
-    version = "0.5.0";
+    version = "0.5.2";
     src = fetchFromGitHub {
       owner  = "auto-complete";
       repo   = "${pname}-el";
       rev    = "v${version}";
-      sha256 = "0836ayyz1syvd9ry97ya06l8mpr88c6xbgb4d98szj6iwbypcj7b";
+      sha256 = "0aazkczrzpp75793bpi0pz0cs7vinhdrpxfdlzi0cr39njird2yj";
     };
     meta = { license = gpl3Plus; };
   };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 5a63be2e9c6..8c2f090e0c1 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -192,15 +192,45 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  confd = buildGoPackage rec {
+    rev = "v0.9.0";
+    name = "confd-${rev}";
+    goPackagePath = "github.com/kelseyhightower/confd";
+    preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "kelseyhightower";
+      repo = "confd";
+      sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr";
+    };
+    subPackages = [ "./" ];
+  };
+
+  dbus = buildGoPackage rec {
+    rev = "88765d85c0fdadcd98a54e30694fa4e4f5b51133";
+    name = "dbus-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/godbus/dbus";
+    preBuild = ''
+      cd "go/src/$goPackagePath"
+      rm -r _examples
+    '';
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "godbus";
+      repo = "dbus";
+      sha256 = "0k80wzdx8091y3012nd4giwgc08n1pj6lcr9i44dsapcjnb80jkn";
+    };
+  };
+
   dns = buildGoPackage rec {
-    rev = "0bd3fb7026404936cf18204ea527d27f067923cf";
+    rev = "fd694e564b3ceaf34a8bbe9ef18f65c64df8ed03";
     name = "dns-${stdenv.lib.strings.substring 0 7 rev}";
     goPackagePath = "github.com/miekg/dns";
     src = fetchFromGitHub {
       inherit rev;
       owner = "miekg";
       repo = "dns";
-      sha256 = "1hv2ikpd9gr9idf7zh8nyqgdbnnffs057wsdpd7m44mllbmzhdxn";
+      sha256 = "1g15l00jypjac0fd2j39lifw1j3md49vk6fq35mv8kc8ighhvxaq";
     };
   };
 
@@ -418,7 +448,7 @@ let self = _self // overrides; _self = with self; {
 
     meta = with stdenv.lib; {
       homepage    = "https://github.com/jteeuwen/go-bindata";
-      description = "A small utility which generates Go code from any file. Useful for embedding binary data in a Go program.";
+      description = "A small utility which generates Go code from any file, useful for embedding binary data in a Go program";
       maintainers = with maintainers; [ cstrahan ];
       license     = licenses.cc0 ;
       platforms   = platforms.all;
@@ -437,6 +467,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  go-etcd = buildGoPackage rec {
+    rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8";
+    name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/coreos/go-etcd";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "coreos";
+      repo = "go-etcd";
+      sha256 = "0zqr7mzd5kq0rnxj3zx5x5wwbmjkg365farwv72hzrsvq6g8zczr";
+    };
+    buildInputs = [ pkgs.etcd ];
+  };
+
   go-fuse = buildGoPackage rec {
     rev = "5d16aa11eef4643de2d91e88a64dcb6138705d58";
     name = "go-fuse-${stdenv.lib.strings.substring 0 7 rev}";
@@ -486,6 +529,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  go-log = buildGoPackage rec {
+    rev = "70d039bee4b0e389e5be560491d8291708506f59";
+    name = "go-log-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/coreos/go-log";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "coreos";
+      repo = "go-log";
+      sha256 = "1s95xmmhcgw4ascf4zr8c4ij2n4s3mr881nxcpmc61g0gb722b13";
+    };
+    buildInputs = [ go-systemd osext ];
+  };
+
   rcrowley.go-metrics = buildGoPackage rec {
     rev = "f770e6f5e91a8770cecee02d5d3f7c00b023b4df";
     name = "rcrowley.go-metrics-${stdenv.lib.strings.substring 0 7 rev}";
@@ -597,7 +653,21 @@ let self = _self // overrides; _self = with self; {
       sha256 = "1r9s1gsa4azcs05gx1179ixk7qvrkrik3v92wr4s8gwm00m0gf81";
     };
   };
- 
+
+  go-systemd = buildGoPackage rec {
+    rev = "2d21675230a81a503f4363f4aa3490af06d52bb8";
+    name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}";
+    goPackagePath = "github.com/coreos/go-systemd";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "coreos";
+      repo = "go-systemd";
+      sha256 = "07g5c8khlcjnr86gniw3zr7l8jwrb9fhrj18zm5n6ccj24nidwam";
+    };
+    subPackages = [ "activation" "daemon" "dbus" "journal" "login1" ];
+    buildInputs = [ dbus ];
+  };
+
   go-update = buildGoPackage rec {
     rev = "c1385108bc3a016f1c88b75ea7d2e2a356a1571d";
     name = "go-update-${stdenv.lib.strings.substring 0 7 rev}";
@@ -625,6 +695,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  grafana = buildGoPackage rec {
+    version = "2.0.0-beta1";
+    name = "grafana-v${version}";
+    goPackagePath = "github.com/grafana/grafana";
+    preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
+    src = fetchFromGitHub {
+      rev = "v${version}";
+      owner = "grafana";
+      repo = "grafana";
+      sha256 = "1b263qj7n72xc5qn0hhrlivqrd0zc8746c9ic11kdxyf81nx4lza";
+    };
+    subPackages = [ "./" ];
+  };
+
   hologram = buildGoPackage rec {
     rev  = "2bf08f0edee49297358bd06a0c9bf44ba9051e9c";
     name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
@@ -781,7 +865,7 @@ let self = _self // overrides; _self = with self; {
 
   mgo = buildGoPackage rec {
     rev = "2";
-    name = "mgo-${rev}"; 
+    name = "mgo-${rev}";
     goPackagePath = "launchpad.net/mgo";
     src = fetchbzr {
       inherit rev;
@@ -1121,6 +1205,20 @@ let self = _self // overrides; _self = with self; {
     buildInputs = [ pkgconfig libusb ];
   };
 
+  vulcand = buildGoPackage rec {
+    rev = "v0.8.0-beta.3";
+    name = "vulcand-${rev}";
+    goPackagePath = "github.com/mailgun/vulcand";
+    preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
+    src = fetchFromGitHub {
+      inherit rev;
+      owner = "mailgun";
+      repo = "vulcand";
+      sha256 = "08mal9prwlsav63r972q344zpwqfql6qw6v4ixbn1h3h32kk3ic6";
+    };
+    subPackages = [ "./" ];
+  };
+
   websocket = buildGoPackage rec {
     rev = "f4076986b69612ecb8bc7ce06d742eda6286200d";
     name = "websocket-${stdenv.lib.strings.substring 0 7 rev}";
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index f4d513c0c68..7540244b9bc 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -44,7 +44,6 @@
     attoparsec = self.attoparsec_0_11_3_1;
     binaryConduit = super.binaryConduit.override { binary = self.binary_0_7_2_2; };
     bson = super.bson.override { dataBinaryIeee754 = self.dataBinaryIeee754.override { binary = self.binary_0_7_2_2; }; };
-    cabal2nix = super.cabal2nix.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_18_1_3; }; };
     cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2.override {
       HTTP = self.HTTP.override { network = self.network_2_5_0_0; };
       network = self.network_2_5_0_0;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b2cebf63fff..512d4b74dfb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3139,14 +3139,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   wordTrie = callPackage ../development/libraries/haskell/word-trie {};
 
-  # This is an unwrapped version of Yi, it will not behave well (no
-  # M-x or reload). Use ‘yiCustom’ instead.
+  # This is an unwrapped version of Yi, it will not behave well. Use
+  # ‘yi’ from all-packages.nix instead.
   yi = callPackage ../applications/editors/yi/yi.nix { };
 
-  yiCustom = callPackage ../applications/editors/yi/yi-custom.nix {
-    extraPackages = pkgs: [];
-  };
-
   yiFuzzyOpen = callPackage ../development/libraries/haskell/yi-fuzzy-open {};
 
   yiMonokai = callPackage ../development/libraries/haskell/yi-monokai {};
@@ -3161,7 +3157,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   cabalDb = callPackage ../development/tools/haskell/cabal-db {};
 
-  cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
+  cabal2nix = pkgs.cabal2nix;
 
   # Build a cabal package given a local .cabal file
   buildLocalCabalWithArgs = { src
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 766ff90d5b7..773ddd29521 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -74,7 +74,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = http://luaforge.net/projects/luaevent/;
-      description = "Binding of libevent to Lua.";
+      description = "Binding of libevent to Lua";
       license = licenses.mit;
       maintainers = [ maintainers.koral ];
     };
diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index dd0614b3145..bf72bbd8dcc 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -93,7 +93,28 @@
       sha1 = "44959bdd94e3641858e7f2147d93c732f3505b1c";
     };
     deps = {
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."JSONStream"."^0.8.4" =
+    self.by-version."JSONStream"."0.8.4";
+  by-version."JSONStream"."0.8.4" = self.buildNodePackage {
+    name = "JSONStream-0.8.4";
+    version = "0.8.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
+      name = "JSONStream-0.8.4.tgz";
+      sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
+    };
+    deps = {
+      "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -114,7 +135,7 @@
     };
     deps = {
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -156,7 +177,7 @@
     };
     deps = {
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -166,25 +187,6 @@
   };
   by-spec."JSONStream"."~0.8.3" =
     self.by-version."JSONStream"."0.8.4";
-  by-version."JSONStream"."0.8.4" = self.buildNodePackage {
-    name = "JSONStream-0.8.4";
-    version = "0.8.4";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
-      name = "JSONStream-0.8.4.tgz";
-      sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
-    };
-    deps = {
-      "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."JSONStream"."~0.8.4" =
     self.by-version."JSONStream"."0.8.4";
   by-spec."abbrev"."1" =
@@ -208,10 +210,34 @@
   };
   by-spec."abbrev"."1.0.x" =
     self.by-version."abbrev"."1.0.5";
+  by-spec."abbrev"."^1.0.5" =
+    self.by-version."abbrev"."1.0.5";
   by-spec."abbrev"."~1.0.4" =
     self.by-version."abbrev"."1.0.5";
   by-spec."abbrev"."~1.0.5" =
     self.by-version."abbrev"."1.0.5";
+  by-spec."abstract-leveldown"."~0.12.1" =
+    self.by-version."abstract-leveldown"."0.12.4";
+  by-version."abstract-leveldown"."0.12.4" = self.buildNodePackage {
+    name = "abstract-leveldown-0.12.4";
+    version = "0.12.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz";
+      name = "abstract-leveldown-0.12.4.tgz";
+      sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
+    };
+    deps = {
+      "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."abstract-leveldown"."~0.12.2" =
+    self.by-version."abstract-leveldown"."0.12.4";
   by-spec."accepts"."~1.0.4" =
     self.by-version."accepts"."1.0.7";
   by-version."accepts"."1.0.7" = self.buildNodePackage {
@@ -247,7 +273,7 @@
       sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
     };
     deps = {
-      "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
       "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
     };
     optionalDependencies = {
@@ -260,21 +286,19 @@
     self.by-version."accepts"."1.1.4";
   by-spec."accepts"."~1.1.3" =
     self.by-version."accepts"."1.1.4";
-  by-spec."accepts"."~1.1.4" =
-    self.by-version."accepts"."1.1.4";
-  by-spec."accepts"."~1.2.4" =
-    self.by-version."accepts"."1.2.4";
-  by-version."accepts"."1.2.4" = self.buildNodePackage {
-    name = "accepts-1.2.4";
-    version = "1.2.4";
+  by-spec."accepts"."~1.2.5" =
+    self.by-version."accepts"."1.2.5";
+  by-version."accepts"."1.2.5" = self.buildNodePackage {
+    name = "accepts-1.2.5";
+    version = "1.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.4.tgz";
-      name = "accepts-1.2.4.tgz";
-      sha1 = "f4e6c66f4faf69c76bd7a63a1ffc5bd2dacfb2ac";
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz";
+      name = "accepts-1.2.5.tgz";
+      sha1 = "bb07dc52c141ae562611a836ff433bcec8871ce9";
     };
     deps = {
-      "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
       "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1";
     };
     optionalDependencies = {
@@ -283,16 +307,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."acorn"."^0.11.0" =
-    self.by-version."acorn"."0.11.0";
-  by-version."acorn"."0.11.0" = self.buildNodePackage {
-    name = "acorn-0.11.0";
-    version = "0.11.0";
+  by-spec."acorn"."^1.0.1" =
+    self.by-version."acorn"."1.0.3";
+  by-version."acorn"."1.0.3" = self.buildNodePackage {
+    name = "acorn-1.0.3";
+    version = "1.0.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/acorn/-/acorn-0.11.0.tgz";
-      name = "acorn-0.11.0.tgz";
-      sha1 = "6e95f0253ad161ff0127db32983e5e2e5352d59a";
+      url = "http://registry.npmjs.org/acorn/-/acorn-1.0.3.tgz";
+      name = "acorn-1.0.3.tgz";
+      sha1 = "6f4cd7c4de8f43a92708ecd8180fe4aca36baff0";
     };
     deps = {
     };
@@ -322,18 +346,18 @@
     cpu = [ ];
   };
   by-spec."acorn-globals"."^1.0.0" =
-    self.by-version."acorn-globals"."1.0.2";
-  by-version."acorn-globals"."1.0.2" = self.buildNodePackage {
-    name = "acorn-globals-1.0.2";
-    version = "1.0.2";
+    self.by-version."acorn-globals"."1.0.4";
+  by-version."acorn-globals"."1.0.4" = self.buildNodePackage {
+    name = "acorn-globals-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.2.tgz";
-      name = "acorn-globals-1.0.2.tgz";
-      sha1 = "f90bf21844405e649d00add61a688fc6a3462158";
+      url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.4.tgz";
+      name = "acorn-globals-1.0.4.tgz";
+      sha1 = "4e8528e724b4fa24ba553ad479c4c78589afbfcf";
     };
     deps = {
-      "acorn-0.11.0" = self.by-version."acorn"."0.11.0";
+      "acorn-1.0.3" = self.by-version."acorn"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -341,8 +365,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."acorn-globals"."^1.0.1" =
-    self.by-version."acorn-globals"."1.0.2";
+  by-spec."acorn-globals"."^1.0.3" =
+    self.by-version."acorn-globals"."1.0.4";
   by-spec."active-x-obfuscator"."0.0.1" =
     self.by-version."active-x-obfuscator"."0.0.1";
   by-version."active-x-obfuscator"."0.0.1" = self.buildNodePackage {
@@ -364,15 +388,15 @@
     cpu = [ ];
   };
   by-spec."addr-to-ip-port"."^1.0.0" =
-    self.by-version."addr-to-ip-port"."1.4.0";
-  by-version."addr-to-ip-port"."1.4.0" = self.buildNodePackage {
-    name = "addr-to-ip-port-1.4.0";
-    version = "1.4.0";
+    self.by-version."addr-to-ip-port"."1.4.1";
+  by-version."addr-to-ip-port"."1.4.1" = self.buildNodePackage {
+    name = "addr-to-ip-port-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.0.tgz";
-      name = "addr-to-ip-port-1.4.0.tgz";
-      sha1 = "9b784874d8a6a284c64d453f2c0f6430f201a8db";
+      url = "http://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.1.tgz";
+      name = "addr-to-ip-port-1.4.1.tgz";
+      sha1 = "19d0d3c813ac44c352b5df2f096c6d8f44117a86";
     };
     deps = {
     };
@@ -383,8 +407,8 @@
     cpu = [ ];
   };
   by-spec."addr-to-ip-port"."^1.0.1" =
-    self.by-version."addr-to-ip-port"."1.4.0";
-  by-spec."addressparser"."^0.3.1" =
+    self.by-version."addr-to-ip-port"."1.4.1";
+  by-spec."addressparser"."^0.3.2" =
     self.by-version."addressparser"."0.3.2";
   by-version."addressparser"."0.3.2" = self.buildNodePackage {
     name = "addressparser-0.3.2";
@@ -483,6 +507,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."after"."^0.8.1" =
+    self.by-version."after"."0.8.1";
   by-spec."agent-base"."~1.0.1" =
     self.by-version."agent-base"."1.0.1";
   by-version."agent-base"."1.0.1" = self.buildNodePackage {
@@ -503,18 +529,18 @@
     cpu = [ ];
   };
   by-spec."airplay-js"."^0.2.5" =
-    self.by-version."airplay-js"."0.2.12";
-  by-version."airplay-js"."0.2.12" = self.buildNodePackage {
-    name = "airplay-js-0.2.12";
-    version = "0.2.12";
+    self.by-version."airplay-js"."0.2.13";
+  by-version."airplay-js"."0.2.13" = self.buildNodePackage {
+    name = "airplay-js-0.2.13";
+    version = "0.2.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.12.tgz";
-      name = "airplay-js-0.2.12.tgz";
-      sha1 = "fcc1ea106b5541982c34367ac674ce3bfa8a99ec";
+      url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.13.tgz";
+      name = "airplay-js-0.2.13.tgz";
+      sha1 = "301837c6e1c40fe8f6657d3205da148a48261885";
     };
     deps = {
-      "mdns-js-0.2.5" = self.by-version."mdns-js"."0.2.5";
+      "mdns-js-0.3.1" = self.by-version."mdns-js"."0.3.1";
       "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1";
     };
     optionalDependencies = {
@@ -543,15 +569,15 @@
     cpu = [ ];
   };
   by-spec."almond"."*" =
-    self.by-version."almond"."0.3.0";
-  by-version."almond"."0.3.0" = self.buildNodePackage {
-    name = "almond-0.3.0";
-    version = "0.3.0";
+    self.by-version."almond"."0.3.1";
+  by-version."almond"."0.3.1" = self.buildNodePackage {
+    name = "almond-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/almond/-/almond-0.3.0.tgz";
-      name = "almond-0.3.0.tgz";
-      sha1 = "701510c31038354f85ea31410b89ff3392058014";
+      url = "http://registry.npmjs.org/almond/-/almond-0.3.1.tgz";
+      name = "almond-0.3.1.tgz";
+      sha1 = "ea2440ab1e2157f73e0e42a9a888ec8d148e7e15";
     };
     deps = {
     };
@@ -561,7 +587,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "almond" = self.by-version."almond"."0.3.0";
+  "almond" = self.by-version."almond"."0.3.1";
   by-spec."alter"."~0.2.0" =
     self.by-version."alter"."0.2.0";
   by-version."alter"."0.2.0" = self.buildNodePackage {
@@ -605,15 +631,15 @@
   by-spec."amdefine".">=0.0.4" =
     self.by-version."amdefine"."0.1.0";
   by-spec."amqp".">=0.1.3" =
-    self.by-version."amqp"."0.2.3";
-  by-version."amqp"."0.2.3" = self.buildNodePackage {
-    name = "amqp-0.2.3";
-    version = "0.2.3";
+    self.by-version."amqp"."0.2.4";
+  by-version."amqp"."0.2.4" = self.buildNodePackage {
+    name = "amqp-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/amqp/-/amqp-0.2.3.tgz";
-      name = "amqp-0.2.3.tgz";
-      sha1 = "25afbd851ad784f8e606f22bfe34c5f83e4fe75c";
+      url = "http://registry.npmjs.org/amqp/-/amqp-0.2.4.tgz";
+      name = "amqp-0.2.4.tgz";
+      sha1 = "b47e9f5b01f292ab18a8097ff0e72a54b4d03a89";
     };
     deps = {
       "lodash-1.3.1" = self.by-version."lodash"."1.3.1";
@@ -643,18 +669,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ansi"."~0.3.0" =
-    self.by-version."ansi"."0.3.0";
-  by-spec."ansi-color"."0.2.1" =
-    self.by-version."ansi-color"."0.2.1";
-  by-version."ansi-color"."0.2.1" = self.buildNodePackage {
-    name = "ansi-color-0.2.1";
-    version = "0.2.1";
-    bin = false;
+  by-spec."ansi"."~0.1.2" =
+    self.by-version."ansi"."0.1.2";
+  by-version."ansi"."0.1.2" = self.buildNodePackage {
+    name = "ansi-0.1.2";
+    version = "0.1.2";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz";
-      name = "ansi-color-0.2.1.tgz";
-      sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a";
+      url = "http://registry.npmjs.org/ansi/-/ansi-0.1.2.tgz";
+      name = "ansi-0.1.2.tgz";
+      sha1 = "2627e29498f06e2a1c2ece9c21e28fd494430827";
     };
     deps = {
     };
@@ -664,16 +688,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ansi-regex"."^0.1.0" =
-    self.by-version."ansi-regex"."0.1.0";
-  by-version."ansi-regex"."0.1.0" = self.buildNodePackage {
-    name = "ansi-regex-0.1.0";
-    version = "0.1.0";
+  by-spec."ansi"."~0.3.0" =
+    self.by-version."ansi"."0.3.0";
+  by-spec."ansi-color"."0.2.1" =
+    self.by-version."ansi-color"."0.2.1";
+  by-version."ansi-color"."0.2.1" = self.buildNodePackage {
+    name = "ansi-color-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz";
-      name = "ansi-regex-0.1.0.tgz";
-      sha1 = "55ca60db6900857c423ae9297980026f941ed903";
+      url = "http://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz";
+      name = "ansi-color-0.2.1.tgz";
+      sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a";
     };
     deps = {
     };
@@ -725,6 +751,10 @@
   };
   by-spec."ansi-regex"."^1.1.0" =
     self.by-version."ansi-regex"."1.1.1";
+  by-spec."ansi-regex"."^1.1.1" =
+    self.by-version."ansi-regex"."1.1.1";
+  by-spec."ansi-regex"."~1.1.1" =
+    self.by-version."ansi-regex"."1.1.1";
   by-spec."ansi-remover"."*" =
     self.by-version."ansi-remover"."0.0.2";
   by-version."ansi-remover"."0.0.2" = self.buildNodePackage {
@@ -764,6 +794,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ansi-styles"."^2.0.1" =
+    self.by-version."ansi-styles"."2.0.1";
+  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
+    name = "ansi-styles-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
+      name = "ansi-styles-2.0.1.tgz";
+      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ansicolors"."~0.2.1" =
+    self.by-version."ansicolors"."0.2.1";
+  by-version."ansicolors"."0.2.1" = self.buildNodePackage {
+    name = "ansicolors-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz";
+      name = "ansicolors-0.2.1.tgz";
+      sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ansicolors"."~0.3.2" =
     self.by-version."ansicolors"."0.3.2";
   by-version."ansicolors"."0.3.2" = self.buildNodePackage {
@@ -803,18 +871,19 @@
     cpu = [ ];
   };
   by-spec."anymatch"."^1.1.0" =
-    self.by-version."anymatch"."1.1.0";
-  by-version."anymatch"."1.1.0" = self.buildNodePackage {
-    name = "anymatch-1.1.0";
-    version = "1.1.0";
+    self.by-version."anymatch"."1.2.1";
+  by-version."anymatch"."1.2.1" = self.buildNodePackage {
+    name = "anymatch-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/anymatch/-/anymatch-1.1.0.tgz";
-      name = "anymatch-1.1.0.tgz";
-      sha1 = "ebc63275cee368a96b300f31623bf9f228d428e3";
+      url = "http://registry.npmjs.org/anymatch/-/anymatch-1.2.1.tgz";
+      name = "anymatch-1.2.1.tgz";
+      sha1 = "a7d77e8b62bc27cb5309d5ed905915b8da3f210f";
     };
     deps = {
-      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+      "arrify-1.0.0" = self.by-version."arrify"."1.0.0";
+      "micromatch-2.1.6" = self.by-version."micromatch"."2.1.6";
     };
     optionalDependencies = {
     };
@@ -822,16 +891,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."apparatus".">= 0.0.6" =
-    self.by-version."apparatus"."0.0.8";
-  by-version."apparatus"."0.0.8" = self.buildNodePackage {
-    name = "apparatus-0.0.8";
-    version = "0.0.8";
+  by-spec."apparatus".">= 0.0.9" =
+    self.by-version."apparatus"."0.0.9";
+  by-version."apparatus"."0.0.9" = self.buildNodePackage {
+    name = "apparatus-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.8.tgz";
-      name = "apparatus-0.0.8.tgz";
-      sha1 = "14e8aeb84189208b7f8d77f09d9f0307778b079a";
+      url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.9.tgz";
+      name = "apparatus-0.0.9.tgz";
+      sha1 = "37dcd25834ad0b651076596291db823eeb1908bd";
     };
     deps = {
       "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21";
@@ -888,9 +957,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."archy"."0.0.2" =
-    self.by-version."archy"."0.0.2";
-  by-spec."archy"."^1.0.0" =
+  by-spec."archy"."1.0.0" =
     self.by-version."archy"."1.0.0";
   by-version."archy"."1.0.0" = self.buildNodePackage {
     name = "archy-1.0.0";
@@ -909,21 +976,24 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."archy"."^1.0.0" =
+    self.by-version."archy"."1.0.0";
   by-spec."archy"."~1.0.0" =
     self.by-version."archy"."1.0.0";
   by-spec."are-we-there-yet"."~1.0.0" =
-    self.by-version."are-we-there-yet"."1.0.2";
-  by-version."are-we-there-yet"."1.0.2" = self.buildNodePackage {
-    name = "are-we-there-yet-1.0.2";
-    version = "1.0.2";
+    self.by-version."are-we-there-yet"."1.0.4";
+  by-version."are-we-there-yet"."1.0.4" = self.buildNodePackage {
+    name = "are-we-there-yet-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.2.tgz";
-      name = "are-we-there-yet-1.0.2.tgz";
-      sha1 = "b518f4a6ec85862b57ce82df495bbabc76cb5246";
+      url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz";
+      name = "are-we-there-yet-1.0.4.tgz";
+      sha1 = "527fe389f7bcba90806106b99244eaa07e886f85";
     };
     deps = {
       "delegates-0.1.0" = self.by-version."delegates"."0.1.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     optionalDependencies = {
     };
@@ -974,18 +1044,18 @@
     cpu = [ ];
   };
   by-spec."argparse"."~ 1.0.0" =
-    self.by-version."argparse"."1.0.1";
-  by-version."argparse"."1.0.1" = self.buildNodePackage {
-    name = "argparse-1.0.1";
-    version = "1.0.1";
+    self.by-version."argparse"."1.0.2";
+  by-version."argparse"."1.0.2" = self.buildNodePackage {
+    name = "argparse-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/argparse/-/argparse-1.0.1.tgz";
-      name = "argparse-1.0.1.tgz";
-      sha1 = "cb1010b8559920fc8aee521eb9e80e4851790923";
+      url = "http://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz";
+      name = "argparse-1.0.2.tgz";
+      sha1 = "bcfae39059656d1973d0b9e6a1a74154b5a9a136";
     };
     deps = {
-      "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
+      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
       "sprintf-js-1.0.2" = self.by-version."sprintf-js"."1.0.2";
     };
     optionalDependencies = {
@@ -994,6 +1064,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."argparse"."~1.0.0" =
+    self.by-version."argparse"."1.0.2";
+  by-spec."arr-diff"."^1.0.1" =
+    self.by-version."arr-diff"."1.0.1";
+  by-version."arr-diff"."1.0.1" = self.buildNodePackage {
+    name = "arr-diff-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/arr-diff/-/arr-diff-1.0.1.tgz";
+      name = "arr-diff-1.0.1.tgz";
+      sha1 = "0b766ed5b26b242212febe9cbf2024a8d0349f6d";
+    };
+    deps = {
+      "array-slice-0.2.3" = self.by-version."array-slice"."0.2.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."array-differ"."^1.0.0" =
     self.by-version."array-differ"."1.0.0";
   by-version."array-differ"."1.0.0" = self.buildNodePackage {
@@ -1032,6 +1124,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."array-find"."^0.1.1" =
+    self.by-version."array-find"."0.1.1";
+  by-version."array-find"."0.1.1" = self.buildNodePackage {
+    name = "array-find-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-find/-/array-find-0.1.1.tgz";
+      name = "array-find-0.1.1.tgz";
+      sha1 = "dc813845ad5a9afc35cb92b786c878d81b5b82ce";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."array-indexofobject"."~0.0.1" =
     self.by-version."array-indexofobject"."0.0.1";
   by-version."array-indexofobject"."0.0.1" = self.buildNodePackage {
@@ -1108,7 +1219,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."array-uniq"."^1.0.2" =
+  by-spec."array-slice"."^0.2.2" =
+    self.by-version."array-slice"."0.2.3";
+  by-version."array-slice"."0.2.3" = self.buildNodePackage {
+    name = "array-slice-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz";
+      name = "array-slice-0.2.3.tgz";
+      sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-uniq"."^1.0.1" =
     self.by-version."array-uniq"."1.0.2";
   by-version."array-uniq"."1.0.2" = self.buildNodePackage {
     name = "array-uniq-1.0.2";
@@ -1127,6 +1257,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."array-uniq"."^1.0.2" =
+    self.by-version."array-uniq"."1.0.2";
   by-spec."arraybuffer.slice"."0.0.6" =
     self.by-version."arraybuffer.slice"."0.0.6";
   by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage {
@@ -1146,6 +1278,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."arrify"."^1.0.0" =
+    self.by-version."arrify"."1.0.0";
+  by-version."arrify"."1.0.0" = self.buildNodePackage {
+    name = "arrify-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/arrify/-/arrify-1.0.0.tgz";
+      name = "arrify-1.0.0.tgz";
+      sha1 = "d6c361518250802fa2147ea7fb67597128cb8c81";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."asap"."^1.0.0" =
     self.by-version."asap"."1.0.0";
   by-version."asap"."1.0.0" = self.buildNodePackage {
@@ -1166,15 +1317,15 @@
     cpu = [ ];
   };
   by-spec."asap"."^2.0.0" =
-    self.by-version."asap"."2.0.1";
-  by-version."asap"."2.0.1" = self.buildNodePackage {
-    name = "asap-2.0.1";
-    version = "2.0.1";
+    self.by-version."asap"."2.0.2";
+  by-version."asap"."2.0.2" = self.buildNodePackage {
+    name = "asap-2.0.2";
+    version = "2.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asap/-/asap-2.0.1.tgz";
-      name = "asap-2.0.1.tgz";
-      sha1 = "1345eaff39393ba58863177440a424ce59029244";
+      url = "http://registry.npmjs.org/asap/-/asap-2.0.2.tgz";
+      name = "asap-2.0.2.tgz";
+      sha1 = "4a028b746c1a0720151c2650c166c17ca032a2ef";
     };
     deps = {
     };
@@ -1264,16 +1415,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."asn1.js".">=1.0.0 >=1.0.0 <2.0.0" =
-    self.by-version."asn1.js"."1.0.3";
-  by-version."asn1.js"."1.0.3" = self.buildNodePackage {
-    name = "asn1.js-1.0.3";
-    version = "1.0.3";
+  by-spec."asn1.js"."^1.0.0" =
+    self.by-version."asn1.js"."1.0.4";
+  by-version."asn1.js"."1.0.4" = self.buildNodePackage {
+    name = "asn1.js-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.3.tgz";
-      name = "asn1.js-1.0.3.tgz";
-      sha1 = "281ba3ec1f2448fe765f92a4eecf883fe1364b54";
+      url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.4.tgz";
+      name = "asn1.js-1.0.4.tgz";
+      sha1 = "adc547dc24775be40db2ae921d6c990c387b32a8";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -1286,28 +1437,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."asn1.js"."^1.0.0" =
-    self.by-version."asn1.js"."1.0.3";
-  by-spec."asn1.js-rfc3280"."^1.0.0" =
-    self.by-version."asn1.js-rfc3280"."1.0.0";
-  by-version."asn1.js-rfc3280"."1.0.0" = self.buildNodePackage {
-    name = "asn1.js-rfc3280-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/asn1.js-rfc3280/-/asn1.js-rfc3280-1.0.0.tgz";
-      name = "asn1.js-rfc3280-1.0.0.tgz";
-      sha1 = "4bb2013a7c9bdb4930c077b1b60d936186f4f4a7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [
-      self.by-version."asn1.js"."1.0.3"];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."assert"."*" =
     self.by-version."assert"."1.3.0";
   by-version."assert"."1.3.0" = self.buildNodePackage {
@@ -1471,15 +1600,34 @@
     cpu = [ ];
   };
   by-spec."ast-types"."~0.6.1" =
-    self.by-version."ast-types"."0.6.14";
-  by-version."ast-types"."0.6.14" = self.buildNodePackage {
-    name = "ast-types-0.6.14";
-    version = "0.6.14";
+    self.by-version."ast-types"."0.6.16";
+  by-version."ast-types"."0.6.16" = self.buildNodePackage {
+    name = "ast-types-0.6.16";
+    version = "0.6.16";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.14.tgz";
-      name = "ast-types-0.6.14.tgz";
-      sha1 = "ee2da2c2bdd4cb5c95d29c24d394f7a769a03efd";
+      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.16.tgz";
+      name = "ast-types-0.6.16.tgz";
+      sha1 = "04205b72eddd195a8feaa081f11d0294a24ded93";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ast-types"."~0.7.0" =
+    self.by-version."ast-types"."0.7.6";
+  by-version."ast-types"."0.7.6" = self.buildNodePackage {
+    name = "ast-types-0.7.6";
+    version = "0.7.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.7.6.tgz";
+      name = "ast-types-0.7.6.tgz";
+      sha1 = "e37945547f5d4ea954abf9400bc1b01ce79e47a5";
     };
     deps = {
     };
@@ -1489,8 +1637,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ast-types"."~0.6.12" =
-    self.by-version."ast-types"."0.6.14";
   by-spec."astw"."~0.0.0" =
     self.by-version."astw"."0.0.0";
   by-version."astw"."0.0.0" = self.buildNodePackage {
@@ -1655,6 +1801,8 @@
     self.by-version."async"."0.9.0";
   by-spec."async".">=0.2.9" =
     self.by-version."async"."0.9.0";
+  by-spec."async".">=0.9.0 <1.0.0-0" =
+    self.by-version."async"."0.9.0";
   by-spec."async"."^0.9.0" =
     self.by-version."async"."0.9.0";
   by-spec."async"."~0.1.22" =
@@ -1694,8 +1842,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."async-each"."~0.1.5" =
-    self.by-version."async-each"."0.1.6";
   by-spec."async-some"."~1.0.1" =
     self.by-version."async-some"."1.0.1";
   by-version."async-some"."1.0.1" = self.buildNodePackage {
@@ -1717,18 +1863,19 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.1.13";
-  by-version."aws-sdk"."2.1.13" = self.buildNodePackage {
-    name = "aws-sdk-2.1.13";
-    version = "2.1.13";
+    self.by-version."aws-sdk"."2.1.24";
+  by-version."aws-sdk"."2.1.24" = self.buildNodePackage {
+    name = "aws-sdk-2.1.24";
+    version = "2.1.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.13.tgz";
-      name = "aws-sdk-2.1.13.tgz";
-      sha1 = "7ffbe7fa2a3fa97bd4a9924ca58e4220e92250f9";
+      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.24.tgz";
+      name = "aws-sdk-2.1.24.tgz";
+      sha1 = "06b7ae2fe05c7a862666af2fe86bb611d959770e";
     };
     deps = {
-      "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6";
+      "sax-0.5.3" = self.by-version."sax"."0.5.3";
+      "xml2js-0.2.8" = self.by-version."xml2js"."0.2.8";
       "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
     };
     optionalDependencies = {
@@ -1737,7 +1884,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.1.13";
+  "aws-sdk" = self.by-version."aws-sdk"."2.1.24";
   by-spec."aws-sdk"."2.0.5" =
     self.by-version."aws-sdk"."2.0.5";
   by-version."aws-sdk"."2.0.5" = self.buildNodePackage {
@@ -1760,6 +1907,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."aws-sdk"."2.x" =
+    self.by-version."aws-sdk"."2.1.24";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = self.buildNodePackage {
@@ -1781,6 +1930,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."aws-sdk".">=2.0.0 >=2.0.17 <2.1.0" =
+    self.by-version."aws-sdk"."2.0.31";
+  by-version."aws-sdk"."2.0.31" = self.buildNodePackage {
+    name = "aws-sdk-2.0.31";
+    version = "2.0.31";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.31.tgz";
+      name = "aws-sdk-2.0.31.tgz";
+      sha1 = "e72cf1fdc69015bd9fd2bdf3d3b88c16507d268e";
+    };
+    deps = {
+      "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6";
+      "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."aws-sdk"."~2.0.17" =
+    self.by-version."aws-sdk"."2.0.31";
   by-spec."aws-sdk-apis"."3.x" =
     self.by-version."aws-sdk-apis"."3.1.10";
   by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage {
@@ -1869,7 +2041,7 @@
       sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d";
     };
     deps = {
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
     };
     optionalDependencies = {
     };
@@ -1878,16 +2050,16 @@
     cpu = [ ];
   };
   "backbone" = self.by-version."backbone"."1.1.2";
-  by-spec."backoff"."2.1.0" =
-    self.by-version."backoff"."2.1.0";
-  by-version."backoff"."2.1.0" = self.buildNodePackage {
-    name = "backoff-2.1.0";
-    version = "2.1.0";
+  by-spec."backo2"."1.0.2" =
+    self.by-version."backo2"."1.0.2";
+  by-version."backo2"."1.0.2" = self.buildNodePackage {
+    name = "backo2-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/backoff/-/backoff-2.1.0.tgz";
-      name = "backoff-2.1.0.tgz";
-      sha1 = "19b4e9f9fb75c122ad7bb1c6c376d6085d43ea09";
+      url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
+      name = "backo2-1.0.2.tgz";
+      sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
     };
     deps = {
     };
@@ -1897,6 +2069,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."backoff"."^2.4.0" =
+    self.by-version."backoff"."2.4.1";
+  by-version."backoff"."2.4.1" = self.buildNodePackage {
+    name = "backoff-2.4.1";
+    version = "2.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz";
+      name = "backoff-2.4.1.tgz";
+      sha1 = "2f68c50e0dd789dbefe24200a62efb04d2456d68";
+    };
+    deps = {
+      "precond-0.2.3" = self.by-version."precond"."0.2.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."backoff"."~2.3.0" =
     self.by-version."backoff"."2.3.0";
   by-version."backoff"."2.3.0" = self.buildNodePackage {
@@ -1992,16 +2184,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-js"."0.0.6" =
-    self.by-version."base64-js"."0.0.6";
-  by-version."base64-js"."0.0.6" = self.buildNodePackage {
-    name = "base64-js-0.0.6";
-    version = "0.0.6";
+  by-spec."base64-js"."0.0.2" =
+    self.by-version."base64-js"."0.0.2";
+  by-version."base64-js"."0.0.2" = self.buildNodePackage {
+    name = "base64-js-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
-      name = "base64-js-0.0.6.tgz";
-      sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
+      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz";
+      name = "base64-js-0.0.2.tgz";
+      sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784";
     };
     deps = {
     };
@@ -2011,16 +2203,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-js"."0.0.7" =
-    self.by-version."base64-js"."0.0.7";
-  by-version."base64-js"."0.0.7" = self.buildNodePackage {
-    name = "base64-js-0.0.7";
-    version = "0.0.7";
+  by-spec."base64-js"."0.0.6" =
+    self.by-version."base64-js"."0.0.6";
+  by-version."base64-js"."0.0.6" = self.buildNodePackage {
+    name = "base64-js-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.7.tgz";
-      name = "base64-js-0.0.7.tgz";
-      sha1 = "54400dc91d696cec32a8a47902f971522fee8f48";
+      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
+      name = "base64-js-0.0.6.tgz";
+      sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
     };
     deps = {
     };
@@ -2151,6 +2343,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."basic-auth"."^1.0.0" =
+    self.by-version."basic-auth"."1.0.0";
   by-spec."basic-auth-connect"."1.0.0" =
     self.by-version."basic-auth-connect"."1.0.0";
   by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage {
@@ -2248,6 +2442,28 @@
     cpu = [ ];
   };
   by-spec."bcrypt"."*" =
+    self.by-version."bcrypt"."0.8.2";
+  by-version."bcrypt"."0.8.2" = self.buildNodePackage {
+    name = "bcrypt-0.8.2";
+    version = "0.8.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.2.tgz";
+      name = "bcrypt-0.8.2.tgz";
+      sha1 = "4732f0ddd1e0fb066dcd8ad9472d3d300fd96824";
+    };
+    deps = {
+      "bindings-1.2.0" = self.by-version."bindings"."1.2.0";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "bcrypt" = self.by-version."bcrypt"."0.8.2";
+  by-spec."bcrypt"."0.8.1" =
     self.by-version."bcrypt"."0.8.1";
   by-version."bcrypt"."0.8.1" = self.buildNodePackage {
     name = "bcrypt-0.8.1";
@@ -2268,9 +2484,8 @@
     os = [ ];
     cpu = [ ];
   };
-  "bcrypt" = self.by-version."bcrypt"."0.8.1";
   by-spec."bcrypt".">=0.5.0" =
-    self.by-version."bcrypt"."0.8.1";
+    self.by-version."bcrypt"."0.8.2";
   by-spec."bcryptjs"."2.1.0" =
     self.by-version."bcryptjs"."2.1.0";
   by-version."bcryptjs"."2.1.0" = self.buildNodePackage {
@@ -2309,6 +2524,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."benchmark"."1.0.0" =
+    self.by-version."benchmark"."1.0.0";
+  by-version."benchmark"."1.0.0" = self.buildNodePackage {
+    name = "benchmark-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
+      name = "benchmark-1.0.0.tgz";
+      sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."bencode"."^0.6.0" =
     self.by-version."bencode"."0.6.0";
   by-version."bencode"."0.6.0" = self.buildNodePackage {
@@ -2328,6 +2562,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."bencode"."^0.7.0" =
+    self.by-version."bencode"."0.7.0";
+  by-version."bencode"."0.7.0" = self.buildNodePackage {
+    name = "bencode-0.7.0";
+    version = "0.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz";
+      name = "bencode-0.7.0.tgz";
+      sha1 = "811ed647c0118945e41bb4bbbdea9a2c78a17083";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."better-assert"."~1.0.0" =
     self.by-version."better-assert"."1.0.2";
   by-version."better-assert"."1.0.2" = self.buildNodePackage {
@@ -2349,20 +2602,20 @@
     cpu = [ ];
   };
   by-spec."biased-opener"."~0.2.2" =
-    self.by-version."biased-opener"."0.2.2";
-  by-version."biased-opener"."0.2.2" = self.buildNodePackage {
-    name = "biased-opener-0.2.2";
-    version = "0.2.2";
+    self.by-version."biased-opener"."0.2.5";
+  by-version."biased-opener"."0.2.5" = self.buildNodePackage {
+    name = "biased-opener-0.2.5";
+    version = "0.2.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/biased-opener/-/biased-opener-0.2.2.tgz";
-      name = "biased-opener-0.2.2.tgz";
-      sha1 = "e02a8eb20a07b1e1b555a3bf1e56f51b43465d98";
+      url = "http://registry.npmjs.org/biased-opener/-/biased-opener-0.2.5.tgz";
+      name = "biased-opener-0.2.5.tgz";
+      sha1 = "2a57fe55c6209ea5e178e13ba64bddac72c8f7c0";
     };
     deps = {
-      "browser-launcher2-0.4.4" = self.by-version."browser-launcher2"."0.4.4";
+      "browser-launcher2-0.4.5" = self.by-version."browser-launcher2"."0.4.5";
       "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
-      "opener-1.4.0" = self.by-version."opener"."1.4.0";
+      "opener-1.4.1" = self.by-version."opener"."1.4.1";
       "x-default-browser-0.3.0" = self.by-version."x-default-browser"."0.3.0";
     };
     optionalDependencies = {
@@ -2409,7 +2662,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."binary"."~0.3.0" =
+  by-spec."binary"."^0.3.0" =
     self.by-version."binary"."0.3.0";
   by-version."binary"."0.3.0" = self.buildNodePackage {
     name = "binary-0.3.0";
@@ -2506,25 +2759,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bindings"."1.1.0" =
-    self.by-version."bindings"."1.1.0";
-  by-version."bindings"."1.1.0" = self.buildNodePackage {
-    name = "bindings-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bindings/-/bindings-1.1.0.tgz";
-      name = "bindings-1.1.0.tgz";
-      sha1 = "f3cc4deec19fe31f255864eb1e6ffad857266ef0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."bindings"."1.1.1" =
     self.by-version."bindings"."1.1.1";
   by-version."bindings"."1.1.1" = self.buildNodePackage {
@@ -2576,30 +2810,30 @@
   by-spec."bindings"."~1.2.1" =
     self.by-version."bindings"."1.2.1";
   by-spec."bip-pod".">=0.0.1" =
-    self.by-version."bip-pod"."0.3.8";
-  by-version."bip-pod"."0.3.8" = self.buildNodePackage {
-    name = "bip-pod-0.3.8";
-    version = "0.3.8";
+    self.by-version."bip-pod"."0.3.16";
+  by-version."bip-pod"."0.3.16" = self.buildNodePackage {
+    name = "bip-pod-0.3.16";
+    version = "0.3.16";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod/-/bip-pod-0.3.8.tgz";
-      name = "bip-pod-0.3.8.tgz";
-      sha1 = "0c1d60c473fa6a9ae7c8ba5b56150aecb3af6b7b";
+      url = "http://registry.npmjs.org/bip-pod/-/bip-pod-0.3.16.tgz";
+      name = "bip-pod-0.3.16.tgz";
+      sha1 = "eb7ba65721db3feeb57d9974960f55820cf5a6f7";
     };
     deps = {
       "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0";
-      "cron-1.0.6" = self.by-version."cron"."1.0.6";
+      "cron-1.0.9" = self.by-version."cron"."1.0.9";
       "dns-0.2.2" = self.by-version."dns"."0.2.2";
       "extend-2.0.0" = self.by-version."extend"."2.0.0";
-      "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
+      "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "moment-2.9.0" = self.by-version."moment"."2.9.0";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "moment-2.10.2" = self.by-version."moment"."2.10.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "passport-0.2.1" = self.by-version."passport"."0.2.1";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
-      "tldtools-0.0.23" = self.by-version."tldtools"."0.0.23";
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "tldtools-0.0.24" = self.by-version."tldtools"."0.0.24";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
     };
     optionalDependencies = {
@@ -2609,18 +2843,18 @@
     cpu = [ ];
   };
   by-spec."bip-pod-alchemy"."*" =
-    self.by-version."bip-pod-alchemy"."0.3.0";
-  by-version."bip-pod-alchemy"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-alchemy-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-alchemy"."0.3.3";
+  by-version."bip-pod-alchemy"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-alchemy-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-alchemy/-/bip-pod-alchemy-0.3.0.tgz";
-      name = "bip-pod-alchemy-0.3.0.tgz";
-      sha1 = "b0f75ec915bd890d56b47864de3e883787f55a9d";
+      url = "http://registry.npmjs.org/bip-pod-alchemy/-/bip-pod-alchemy-0.3.3.tgz";
+      name = "bip-pod-alchemy-0.3.3.tgz";
+      sha1 = "408ab1d2e776790528e3d8de52ae0375610067aa";
     };
     deps = {
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -2628,17 +2862,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-alchemy" = self.by-version."bip-pod-alchemy"."0.3.0";
+  "bip-pod-alchemy" = self.by-version."bip-pod-alchemy"."0.3.3";
   by-spec."bip-pod-bitly"."*" =
-    self.by-version."bip-pod-bitly"."0.3.0";
-  by-version."bip-pod-bitly"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-bitly-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-bitly"."0.3.4";
+  by-version."bip-pod-bitly"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-bitly-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-bitly/-/bip-pod-bitly-0.3.0.tgz";
-      name = "bip-pod-bitly-0.3.0.tgz";
-      sha1 = "3d08cc7aec108e3df6d32c5d9aa5760b8ecd9165";
+      url = "http://registry.npmjs.org/bip-pod-bitly/-/bip-pod-bitly-0.3.4.tgz";
+      name = "bip-pod-bitly-0.3.4.tgz";
+      sha1 = "15690871c9349e549d77656205bf7906ef6a5ec7";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
@@ -2651,17 +2885,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-bitly" = self.by-version."bip-pod-bitly"."0.3.0";
+  "bip-pod-bitly" = self.by-version."bip-pod-bitly"."0.3.4";
   by-spec."bip-pod-chain"."*" =
-    self.by-version."bip-pod-chain"."0.3.0";
-  by-version."bip-pod-chain"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-chain-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-chain"."0.3.3";
+  by-version."bip-pod-chain"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-chain-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-chain/-/bip-pod-chain-0.3.0.tgz";
-      name = "bip-pod-chain-0.3.0.tgz";
-      sha1 = "4acd59449ae8c4e5449f6eef66cc442fc5f4821e";
+      url = "http://registry.npmjs.org/bip-pod-chain/-/bip-pod-chain-0.3.3.tgz";
+      name = "bip-pod-chain-0.3.3.tgz";
+      sha1 = "91c707e90af87bee3cbeed7376fc2aa5f13a6e92";
     };
     deps = {
       "chain-node-3.1.0" = self.by-version."chain-node"."3.1.0";
@@ -2672,17 +2906,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-chain" = self.by-version."bip-pod-chain"."0.3.0";
+  "bip-pod-chain" = self.by-version."bip-pod-chain"."0.3.3";
   by-spec."bip-pod-circonus"."*" =
-    self.by-version."bip-pod-circonus"."0.3.0";
-  by-version."bip-pod-circonus"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-circonus-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-circonus"."0.3.2";
+  by-version."bip-pod-circonus"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-circonus-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-circonus/-/bip-pod-circonus-0.3.0.tgz";
-      name = "bip-pod-circonus-0.3.0.tgz";
-      sha1 = "7a8a26f9e04f1e84c76083da65b657e2aee6319d";
+      url = "http://registry.npmjs.org/bip-pod-circonus/-/bip-pod-circonus-0.3.2.tgz";
+      name = "bip-pod-circonus-0.3.2.tgz";
+      sha1 = "5c14d13f73a184323d7209558caba794e2e6ca46";
     };
     deps = {
     };
@@ -2692,17 +2926,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-circonus" = self.by-version."bip-pod-circonus"."0.3.0";
+  "bip-pod-circonus" = self.by-version."bip-pod-circonus"."0.3.2";
   by-spec."bip-pod-coindesk"."*" =
-    self.by-version."bip-pod-coindesk"."0.3.0";
-  by-version."bip-pod-coindesk"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-coindesk-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-coindesk"."0.3.2";
+  by-version."bip-pod-coindesk"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-coindesk-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-coindesk/-/bip-pod-coindesk-0.3.0.tgz";
-      name = "bip-pod-coindesk-0.3.0.tgz";
-      sha1 = "51e0a6973da016968f5da988f5505d57009caa1f";
+      url = "http://registry.npmjs.org/bip-pod-coindesk/-/bip-pod-coindesk-0.3.2.tgz";
+      name = "bip-pod-coindesk-0.3.2.tgz";
+      sha1 = "de1073a7521cd70f33648c3ed89f2e1f14226f89";
     };
     deps = {
     };
@@ -2712,20 +2946,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-coindesk" = self.by-version."bip-pod-coindesk"."0.3.0";
+  "bip-pod-coindesk" = self.by-version."bip-pod-coindesk"."0.3.2";
   by-spec."bip-pod-craigslist"."*" =
-    self.by-version."bip-pod-craigslist"."0.3.0";
-  by-version."bip-pod-craigslist"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-craigslist-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-craigslist"."0.3.3";
+  by-version."bip-pod-craigslist"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-craigslist-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-craigslist/-/bip-pod-craigslist-0.3.0.tgz";
-      name = "bip-pod-craigslist-0.3.0.tgz";
-      sha1 = "755021eeb9bf04ddeed804eaa6dd8e9c7d6c8927";
+      url = "http://registry.npmjs.org/bip-pod-craigslist/-/bip-pod-craigslist-0.3.3.tgz";
+      name = "bip-pod-craigslist-0.3.3.tgz";
+      sha1 = "e92becd2ad4ba05cd4895a2734ca270b7a850b4f";
     };
     deps = {
-      "node-craigslist-0.1.7" = self.by-version."node-craigslist"."0.1.7";
+      "node-craigslist-0.1.8" = self.by-version."node-craigslist"."0.1.8";
     };
     optionalDependencies = {
     };
@@ -2733,17 +2967,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-craigslist" = self.by-version."bip-pod-craigslist"."0.3.0";
+  "bip-pod-craigslist" = self.by-version."bip-pod-craigslist"."0.3.3";
   by-spec."bip-pod-crypto"."*" =
-    self.by-version."bip-pod-crypto"."0.3.0";
-  by-version."bip-pod-crypto"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-crypto-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-crypto"."0.3.3";
+  by-version."bip-pod-crypto"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-crypto-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-crypto/-/bip-pod-crypto-0.3.0.tgz";
-      name = "bip-pod-crypto-0.3.0.tgz";
-      sha1 = "94b9e7e0f48b104921d61594897e219184c9297e";
+      url = "http://registry.npmjs.org/bip-pod-crypto/-/bip-pod-crypto-0.3.3.tgz";
+      name = "bip-pod-crypto-0.3.3.tgz";
+      sha1 = "b2e7e41af687ab4b4100c669039c816bc1ba887e";
     };
     deps = {
     };
@@ -2753,19 +2987,19 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-crypto" = self.by-version."bip-pod-crypto"."0.3.0";
+  "bip-pod-crypto" = self.by-version."bip-pod-crypto"."0.3.3";
   by-spec."bip-pod-crypto".">=0.0.1" =
-    self.by-version."bip-pod-crypto"."0.3.0";
+    self.by-version."bip-pod-crypto"."0.3.3";
   by-spec."bip-pod-dropbox"."*" =
-    self.by-version."bip-pod-dropbox"."0.3.0";
-  by-version."bip-pod-dropbox"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-dropbox-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-dropbox"."0.3.4";
+  by-version."bip-pod-dropbox"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-dropbox-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-dropbox/-/bip-pod-dropbox-0.3.0.tgz";
-      name = "bip-pod-dropbox-0.3.0.tgz";
-      sha1 = "2913f96f1aaa797fa3ba6edf7adc8314e5807c3b";
+      url = "http://registry.npmjs.org/bip-pod-dropbox/-/bip-pod-dropbox-0.3.4.tgz";
+      name = "bip-pod-dropbox-0.3.4.tgz";
+      sha1 = "953528362ba46d42268fefc923c51624b78c0a0e";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
@@ -2779,17 +3013,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-dropbox" = self.by-version."bip-pod-dropbox"."0.3.0";
+  "bip-pod-dropbox" = self.by-version."bip-pod-dropbox"."0.3.4";
   by-spec."bip-pod-email".">=0.0.1" =
-    self.by-version."bip-pod-email"."0.3.3";
-  by-version."bip-pod-email"."0.3.3" = self.buildNodePackage {
-    name = "bip-pod-email-0.3.3";
-    version = "0.3.3";
+    self.by-version."bip-pod-email"."0.3.9";
+  by-version."bip-pod-email"."0.3.9" = self.buildNodePackage {
+    name = "bip-pod-email-0.3.9";
+    version = "0.3.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-email/-/bip-pod-email-0.3.3.tgz";
-      name = "bip-pod-email-0.3.3.tgz";
-      sha1 = "192ee1789e540761bb8d9b27b35ce3a80bd2fa69";
+      url = "http://registry.npmjs.org/bip-pod-email/-/bip-pod-email-0.3.9.tgz";
+      name = "bip-pod-email-0.3.9.tgz";
+      sha1 = "1d53e66b87873cedca5e0813de4ef5ce413df67e";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
@@ -2804,15 +3038,15 @@
     cpu = [ ];
   };
   by-spec."bip-pod-embedly"."*" =
-    self.by-version."bip-pod-embedly"."0.3.0";
-  by-version."bip-pod-embedly"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-embedly-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-embedly"."0.3.3";
+  by-version."bip-pod-embedly"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-embedly-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-embedly/-/bip-pod-embedly-0.3.0.tgz";
-      name = "bip-pod-embedly-0.3.0.tgz";
-      sha1 = "02c7f1c60157f5f5aa880d77acbcdaabf1661ea8";
+      url = "http://registry.npmjs.org/bip-pod-embedly/-/bip-pod-embedly-0.3.3.tgz";
+      name = "bip-pod-embedly-0.3.3.tgz";
+      sha1 = "b28dbec6f95a3ce868476f8ace7129b5675e84bb";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
@@ -2824,17 +3058,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-embedly" = self.by-version."bip-pod-embedly"."0.3.0";
+  "bip-pod-embedly" = self.by-version."bip-pod-embedly"."0.3.3";
   by-spec."bip-pod-evernote"."*" =
-    self.by-version."bip-pod-evernote"."0.3.1";
-  by-version."bip-pod-evernote"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-evernote-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-evernote"."0.3.5";
+  by-version."bip-pod-evernote"."0.3.5" = self.buildNodePackage {
+    name = "bip-pod-evernote-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-evernote/-/bip-pod-evernote-0.3.1.tgz";
-      name = "bip-pod-evernote-0.3.1.tgz";
-      sha1 = "8b68235df6cad374b45bd456b2358a21a6bafd73";
+      url = "http://registry.npmjs.org/bip-pod-evernote/-/bip-pod-evernote-0.3.5.tgz";
+      name = "bip-pod-evernote-0.3.5.tgz";
+      sha1 = "81cc6d8d9c339410f97cb3eff8d82036b8f8d3ab";
     };
     deps = {
       "evernote-1.25.4" = self.by-version."evernote"."1.25.4";
@@ -2848,24 +3082,24 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-evernote" = self.by-version."bip-pod-evernote"."0.3.1";
+  "bip-pod-evernote" = self.by-version."bip-pod-evernote"."0.3.5";
   by-spec."bip-pod-facebook"."*" =
-    self.by-version."bip-pod-facebook"."0.3.0";
-  by-version."bip-pod-facebook"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-facebook-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-facebook"."0.3.6";
+  by-version."bip-pod-facebook"."0.3.6" = self.buildNodePackage {
+    name = "bip-pod-facebook-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-facebook/-/bip-pod-facebook-0.3.0.tgz";
-      name = "bip-pod-facebook-0.3.0.tgz";
-      sha1 = "ee81bf9e12ed54831d0c4aa69bab4d19308c6f45";
+      url = "http://registry.npmjs.org/bip-pod-facebook/-/bip-pod-facebook-0.3.6.tgz";
+      name = "bip-pod-facebook-0.3.6.tgz";
+      sha1 = "3958520db3c94f4e5ac21c66f90c572b3354e125";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "async-0.1.18" = self.by-version."async"."0.1.18";
       "fb-0.7.0" = self.by-version."fb"."0.7.0";
-      "passport-facebook-1.0.3" = self.by-version."passport-facebook"."1.0.3";
+      "passport-facebook-2.0.0" = self.by-version."passport-facebook"."2.0.0";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
     };
     optionalDependencies = {
@@ -2874,17 +3108,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-facebook" = self.by-version."bip-pod-facebook"."0.3.0";
+  "bip-pod-facebook" = self.by-version."bip-pod-facebook"."0.3.6";
   by-spec."bip-pod-flickr"."*" =
-    self.by-version."bip-pod-flickr"."0.3.1";
-  by-version."bip-pod-flickr"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-flickr-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-flickr"."0.3.4";
+  by-version."bip-pod-flickr"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-flickr-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-flickr/-/bip-pod-flickr-0.3.1.tgz";
-      name = "bip-pod-flickr-0.3.1.tgz";
-      sha1 = "10f17538e2d7431957b8b0dc69b2945c4e2fce8c";
+      url = "http://registry.npmjs.org/bip-pod-flickr/-/bip-pod-flickr-0.3.4.tgz";
+      name = "bip-pod-flickr-0.3.4.tgz";
+      sha1 = "9e4aaa7ff3ef3a0d1cf78c1821342dd0d2168403";
     };
     deps = {
       "passport-flickr-0.2.0" = self.by-version."passport-flickr"."0.2.0";
@@ -2896,24 +3130,24 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-flickr" = self.by-version."bip-pod-flickr"."0.3.1";
+  "bip-pod-flickr" = self.by-version."bip-pod-flickr"."0.3.4";
   by-spec."bip-pod-flow".">=0.0.1" =
-    self.by-version."bip-pod-flow"."0.3.1";
-  by-version."bip-pod-flow"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-flow-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-flow"."0.3.8";
+  by-version."bip-pod-flow"."0.3.8" = self.buildNodePackage {
+    name = "bip-pod-flow-0.3.8";
+    version = "0.3.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.1.tgz";
-      name = "bip-pod-flow-0.3.1.tgz";
-      sha1 = "69cae3cf582dc02434c416f10a88febc9955cfb5";
+      url = "http://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.8.tgz";
+      name = "bip-pod-flow-0.3.8.tgz";
+      sha1 = "cb935479cfcf2e8e3bd486258ee1499b04b32d41";
     };
     deps = {
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "xml2json-0.6.1" = self.by-version."xml2json"."0.6.1";
+      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "safe-regex-0.0.1" = self.by-version."safe-regex"."0.0.1";
+      "xml2json-0.6.1" = self.by-version."xml2json"."0.6.1";
     };
     optionalDependencies = {
     };
@@ -2922,15 +3156,15 @@
     cpu = [ ];
   };
   by-spec."bip-pod-github"."*" =
-    self.by-version."bip-pod-github"."0.3.1";
-  by-version."bip-pod-github"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-github-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-github"."0.3.2";
+  by-version."bip-pod-github"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-github-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-github/-/bip-pod-github-0.3.1.tgz";
-      name = "bip-pod-github-0.3.1.tgz";
-      sha1 = "8605c36790e3a26f4b881a9dcd8a1b179b875369";
+      url = "http://registry.npmjs.org/bip-pod-github/-/bip-pod-github-0.3.2.tgz";
+      name = "bip-pod-github-0.3.2.tgz";
+      sha1 = "b949895d120bf57a6af77bb02a177eb94dc55a15";
     };
     deps = {
       "passport-github-0.1.5" = self.by-version."passport-github"."0.1.5";
@@ -2941,21 +3175,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-github" = self.by-version."bip-pod-github"."0.3.1";
+  "bip-pod-github" = self.by-version."bip-pod-github"."0.3.2";
   by-spec."bip-pod-gmail"."*" =
-    self.by-version."bip-pod-gmail"."0.3.1";
-  by-version."bip-pod-gmail"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-gmail-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-gmail"."0.3.4";
+  by-version."bip-pod-gmail"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-gmail-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.1.tgz";
-      name = "bip-pod-gmail-0.3.1.tgz";
-      sha1 = "01e615d9dfa96bb1bc6ebf99f00fdf43bf34bc5f";
+      url = "http://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.4.tgz";
+      name = "bip-pod-gmail-0.3.4.tgz";
+      sha1 = "55aa29401865b048ed7864bff3e7cfdaabfd8e9e";
     };
     deps = {
-      "googleapis-1.1.3" = self.by-version."googleapis"."1.1.3";
-      "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
+      "googleapis-1.1.5" = self.by-version."googleapis"."1.1.5";
+      "passport-google-oauth-0.2.0" = self.by-version."passport-google-oauth"."0.2.0";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
     };
     optionalDependencies = {
@@ -2964,21 +3198,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.1";
+  "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.4";
   by-spec."bip-pod-google"."*" =
-    self.by-version."bip-pod-google"."0.3.0";
-  by-version."bip-pod-google"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-google-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-google"."0.3.1";
+  by-version."bip-pod-google"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-google-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-google/-/bip-pod-google-0.3.0.tgz";
-      name = "bip-pod-google-0.3.0.tgz";
-      sha1 = "75712cc9a5ed0e78d01fafef879ff9ccd717b07b";
+      url = "http://registry.npmjs.org/bip-pod-google/-/bip-pod-google-0.3.1.tgz";
+      name = "bip-pod-google-0.3.1.tgz";
+      sha1 = "f9b8b3265944614e6187aa66338930def55340c5";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
+      "passport-google-oauth-0.2.0" = self.by-version."passport-google-oauth"."0.2.0";
       "googleapis-0.8.0" = self.by-version."googleapis"."0.8.0";
     };
     optionalDependencies = {
@@ -2987,21 +3221,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-google" = self.by-version."bip-pod-google"."0.3.0";
+  "bip-pod-google" = self.by-version."bip-pod-google"."0.3.1";
   by-spec."bip-pod-google-drive"."*" =
-    self.by-version."bip-pod-google-drive"."0.3.0";
-  by-version."bip-pod-google-drive"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-google-drive-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-google-drive"."0.3.1";
+  by-version."bip-pod-google-drive"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-google-drive-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-google-drive/-/bip-pod-google-drive-0.3.0.tgz";
-      name = "bip-pod-google-drive-0.3.0.tgz";
-      sha1 = "d34617def8d9216f0a08e2c0a36bfc0e9d491021";
+      url = "http://registry.npmjs.org/bip-pod-google-drive/-/bip-pod-google-drive-0.3.1.tgz";
+      name = "bip-pod-google-drive-0.3.1.tgz";
+      sha1 = "337d723a780d76472d4e93e16a333a731611515b";
     };
     deps = {
-      "googleapis-1.1.3" = self.by-version."googleapis"."1.1.3";
-      "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
+      "googleapis-1.1.5" = self.by-version."googleapis"."1.1.5";
+      "passport-google-oauth-0.2.0" = self.by-version."passport-google-oauth"."0.2.0";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
     };
     optionalDependencies = {
@@ -3010,17 +3244,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-google-drive" = self.by-version."bip-pod-google-drive"."0.3.0";
+  "bip-pod-google-drive" = self.by-version."bip-pod-google-drive"."0.3.1";
   by-spec."bip-pod-html".">=0.0.1" =
-    self.by-version."bip-pod-html"."0.3.1";
-  by-version."bip-pod-html"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-html-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-html"."0.3.3";
+  by-version."bip-pod-html"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-html-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.1.tgz";
-      name = "bip-pod-html-0.3.1.tgz";
-      sha1 = "a784af5cb9d9be8b18c714351e2f21782ec9c588";
+      url = "http://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.3.tgz";
+      name = "bip-pod-html-0.3.3.tgz";
+      sha1 = "2f1c6c8ac4ab8fa954e8321948d22e5967cc78cd";
     };
     deps = {
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
@@ -3033,18 +3267,18 @@
     cpu = [ ];
   };
   by-spec."bip-pod-http".">=0.0.1" =
-    self.by-version."bip-pod-http"."0.3.0";
-  by-version."bip-pod-http"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-http-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-http"."0.3.3";
+  by-version."bip-pod-http"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-http-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-http/-/bip-pod-http-0.3.0.tgz";
-      name = "bip-pod-http-0.3.0.tgz";
-      sha1 = "311f42fdfca0e013390650ac2149740cb7a34afe";
+      url = "http://registry.npmjs.org/bip-pod-http/-/bip-pod-http-0.3.3.tgz";
+      name = "bip-pod-http-0.3.3.tgz";
+      sha1 = "f1a6ada9c882407c7a370bf0ec5b6c5f2780fadb";
     };
     deps = {
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -3053,20 +3287,20 @@
     cpu = [ ];
   };
   by-spec."bip-pod-imgur"."*" =
-    self.by-version."bip-pod-imgur"."0.3.0";
-  by-version."bip-pod-imgur"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-imgur-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-imgur"."0.3.1";
+  by-version."bip-pod-imgur"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-imgur-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-imgur/-/bip-pod-imgur-0.3.0.tgz";
-      name = "bip-pod-imgur-0.3.0.tgz";
-      sha1 = "a3f7e3ded575bc9d77358e32f888634abe2fd50e";
+      url = "http://registry.npmjs.org/bip-pod-imgur/-/bip-pod-imgur-0.3.1.tgz";
+      name = "bip-pod-imgur-0.3.1.tgz";
+      sha1 = "b5d297900e46eb331d7af1c5608b82db65be243d";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "passport-imgur-0.0.2" = self.by-version."passport-imgur"."0.0.2";
     };
     optionalDependencies = {
@@ -3075,22 +3309,22 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-imgur" = self.by-version."bip-pod-imgur"."0.3.0";
+  "bip-pod-imgur" = self.by-version."bip-pod-imgur"."0.3.1";
   by-spec."bip-pod-instagram"."*" =
-    self.by-version."bip-pod-instagram"."0.3.0";
-  by-version."bip-pod-instagram"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-instagram-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-instagram"."0.3.1";
+  by-version."bip-pod-instagram"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-instagram-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-instagram/-/bip-pod-instagram-0.3.0.tgz";
-      name = "bip-pod-instagram-0.3.0.tgz";
-      sha1 = "fd4c8dfe2968d89020957ac29334abb256b8b4ba";
+      url = "http://registry.npmjs.org/bip-pod-instagram/-/bip-pod-instagram-0.3.1.tgz";
+      name = "bip-pod-instagram-0.3.1.tgz";
+      sha1 = "558cc28fe3bc54d0e4f02746fe0b5c55f392576b";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-instagram-0.1.2" = self.by-version."passport-instagram"."0.1.2";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -3098,17 +3332,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-instagram" = self.by-version."bip-pod-instagram"."0.3.0";
+  "bip-pod-instagram" = self.by-version."bip-pod-instagram"."0.3.1";
   by-spec."bip-pod-kato"."*" =
-    self.by-version."bip-pod-kato"."0.3.0";
-  by-version."bip-pod-kato"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-kato-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-kato"."0.3.1";
+  by-version."bip-pod-kato"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-kato-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-kato/-/bip-pod-kato-0.3.0.tgz";
-      name = "bip-pod-kato-0.3.0.tgz";
-      sha1 = "4b6b384c84535923a351a2f18c691a105d403dd1";
+      url = "http://registry.npmjs.org/bip-pod-kato/-/bip-pod-kato-0.3.1.tgz";
+      name = "bip-pod-kato-0.3.1.tgz";
+      sha1 = "e98c12e71ee00c8ff5dd6ed3919371474e67134a";
     };
     deps = {
     };
@@ -3118,17 +3352,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-kato" = self.by-version."bip-pod-kato"."0.3.0";
+  "bip-pod-kato" = self.by-version."bip-pod-kato"."0.3.1";
   by-spec."bip-pod-keenio"."*" =
-    self.by-version."bip-pod-keenio"."0.3.0";
-  by-version."bip-pod-keenio"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-keenio-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-keenio"."0.3.2";
+  by-version."bip-pod-keenio"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-keenio-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-keenio/-/bip-pod-keenio-0.3.0.tgz";
-      name = "bip-pod-keenio-0.3.0.tgz";
-      sha1 = "4888228bd2535e0423680ea9d3028152c531ee38";
+      url = "http://registry.npmjs.org/bip-pod-keenio/-/bip-pod-keenio-0.3.2.tgz";
+      name = "bip-pod-keenio-0.3.2.tgz";
+      sha1 = "61d54edd0e181c35d29285d6677feec60250d277";
     };
     deps = {
       "keen.io-0.1.3" = self.by-version."keen.io"."0.1.3";
@@ -3139,17 +3373,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-keenio" = self.by-version."bip-pod-keenio"."0.3.0";
+  "bip-pod-keenio" = self.by-version."bip-pod-keenio"."0.3.2";
   by-spec."bip-pod-mailchimp"."*" =
-    self.by-version."bip-pod-mailchimp"."0.3.1";
-  by-version."bip-pod-mailchimp"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-mailchimp-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-mailchimp"."0.3.3";
+  by-version."bip-pod-mailchimp"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-mailchimp-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.1.tgz";
-      name = "bip-pod-mailchimp-0.3.1.tgz";
-      sha1 = "a0fa3f9920dab70a76c98df0edc10a1c3d5f8485";
+      url = "http://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.3.tgz";
+      name = "bip-pod-mailchimp-0.3.3.tgz";
+      sha1 = "a6f74c075983882bec25d8a72a85193bbaaf5001";
     };
     deps = {
       "passport-mailchimp-0.0.1" = self.by-version."passport-mailchimp"."0.0.1";
@@ -3161,20 +3395,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.1";
+  "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.3";
   by-spec."bip-pod-mailgun"."*" =
-    self.by-version."bip-pod-mailgun"."0.3.0";
-  by-version."bip-pod-mailgun"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-mailgun-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-mailgun"."0.3.1";
+  by-version."bip-pod-mailgun"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-mailgun-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-mailgun/-/bip-pod-mailgun-0.3.0.tgz";
-      name = "bip-pod-mailgun-0.3.0.tgz";
-      sha1 = "34a4a921ad790a00c8b6a5b9fba30bbc935e9a35";
+      url = "http://registry.npmjs.org/bip-pod-mailgun/-/bip-pod-mailgun-0.3.1.tgz";
+      name = "bip-pod-mailgun-0.3.1.tgz";
+      sha1 = "5621de6a5f6824e00f9c7d7c2052bdfb3065afcb";
     };
     deps = {
-      "mailgun-js-0.6.8" = self.by-version."mailgun-js"."0.6.8";
+      "mailgun-js-0.6.9" = self.by-version."mailgun-js"."0.6.9";
     };
     optionalDependencies = {
     };
@@ -3182,17 +3416,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-mailgun" = self.by-version."bip-pod-mailgun"."0.3.0";
+  "bip-pod-mailgun" = self.by-version."bip-pod-mailgun"."0.3.1";
   by-spec."bip-pod-math".">=0.0.1" =
-    self.by-version."bip-pod-math"."0.3.2";
-  by-version."bip-pod-math"."0.3.2" = self.buildNodePackage {
-    name = "bip-pod-math-0.3.2";
-    version = "0.3.2";
+    self.by-version."bip-pod-math"."0.3.6";
+  by-version."bip-pod-math"."0.3.6" = self.buildNodePackage {
+    name = "bip-pod-math-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-math/-/bip-pod-math-0.3.2.tgz";
-      name = "bip-pod-math-0.3.2.tgz";
-      sha1 = "b8de2c25dbf25449c86c2eca2a5738c80c6b96d8";
+      url = "http://registry.npmjs.org/bip-pod-math/-/bip-pod-math-0.3.6.tgz";
+      name = "bip-pod-math-0.3.6.tgz";
+      sha1 = "542fe249c8be8c22de09109a2a1f11484e5710e0";
     };
     deps = {
       "mathjs-0.19.0" = self.by-version."mathjs"."0.19.0";
@@ -3204,20 +3438,20 @@
     cpu = [ ];
   };
   by-spec."bip-pod-mixcloud"."*" =
-    self.by-version."bip-pod-mixcloud"."0.3.0";
-  by-version."bip-pod-mixcloud"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-mixcloud-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-mixcloud"."0.3.1";
+  by-version."bip-pod-mixcloud"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-mixcloud-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-mixcloud/-/bip-pod-mixcloud-0.3.0.tgz";
-      name = "bip-pod-mixcloud-0.3.0.tgz";
-      sha1 = "a218a84e84329b4972509de2449ef99744b809ea";
+      url = "http://registry.npmjs.org/bip-pod-mixcloud/-/bip-pod-mixcloud-0.3.1.tgz";
+      name = "bip-pod-mixcloud-0.3.1.tgz";
+      sha1 = "becc444edef870491704a6865ff26b8f476bfcfe";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -3225,20 +3459,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-mixcloud" = self.by-version."bip-pod-mixcloud"."0.3.0";
+  "bip-pod-mixcloud" = self.by-version."bip-pod-mixcloud"."0.3.1";
   by-spec."bip-pod-mongodb"."*" =
-    self.by-version."bip-pod-mongodb"."0.3.1";
-  by-version."bip-pod-mongodb"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-mongodb-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-mongodb"."0.3.4";
+  by-version."bip-pod-mongodb"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-mongodb-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.1.tgz";
-      name = "bip-pod-mongodb-0.3.1.tgz";
-      sha1 = "3eb25f1255f5cef8fa5e7f14378f1e6c7a93908a";
+      url = "http://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.4.tgz";
+      name = "bip-pod-mongodb-0.3.4.tgz";
+      sha1 = "4df550d5d461b77796f17f0c5feadb6eb3c46e66";
     };
     deps = {
-      "mongodb-2.0.16" = self.by-version."mongodb"."2.0.16";
+      "mongodb-2.0.27" = self.by-version."mongodb"."2.0.27";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
     };
     optionalDependencies = {
@@ -3247,17 +3481,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-mongodb" = self.by-version."bip-pod-mongodb"."0.3.1";
+  "bip-pod-mongodb" = self.by-version."bip-pod-mongodb"."0.3.4";
   by-spec."bip-pod-numerous"."*" =
-    self.by-version."bip-pod-numerous"."0.3.0";
-  by-version."bip-pod-numerous"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-numerous-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-numerous"."0.3.1";
+  by-version."bip-pod-numerous"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-numerous-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-numerous/-/bip-pod-numerous-0.3.0.tgz";
-      name = "bip-pod-numerous-0.3.0.tgz";
-      sha1 = "f2abbe029b380c637e55c62382caff9e3c7bc154";
+      url = "http://registry.npmjs.org/bip-pod-numerous/-/bip-pod-numerous-0.3.1.tgz";
+      name = "bip-pod-numerous-0.3.1.tgz";
+      sha1 = "c4ab3790cc1ec424bd16dd0826c3239be34b049c";
     };
     deps = {
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
@@ -3268,17 +3502,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-numerous" = self.by-version."bip-pod-numerous"."0.3.0";
+  "bip-pod-numerous" = self.by-version."bip-pod-numerous"."0.3.1";
   by-spec."bip-pod-pushbullet"."*" =
-    self.by-version."bip-pod-pushbullet"."0.3.0";
-  by-version."bip-pod-pushbullet"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-pushbullet-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-pushbullet"."0.3.1";
+  by-version."bip-pod-pushbullet"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-pushbullet-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-pushbullet/-/bip-pod-pushbullet-0.3.0.tgz";
-      name = "bip-pod-pushbullet-0.3.0.tgz";
-      sha1 = "da4f43cdc68ecaf267df8fe74c65f5206f65d657";
+      url = "http://registry.npmjs.org/bip-pod-pushbullet/-/bip-pod-pushbullet-0.3.1.tgz";
+      name = "bip-pod-pushbullet-0.3.1.tgz";
+      sha1 = "fb5770dc678c4d5e9d04079f7b589ab258472223";
     };
     deps = {
     };
@@ -3288,17 +3522,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-pushbullet" = self.by-version."bip-pod-pushbullet"."0.3.0";
+  "bip-pod-pushbullet" = self.by-version."bip-pod-pushbullet"."0.3.1";
   by-spec."bip-pod-pusher"."*" =
-    self.by-version."bip-pod-pusher"."0.3.0";
-  by-version."bip-pod-pusher"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-pusher-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-pusher"."0.3.2";
+  by-version."bip-pod-pusher"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-pusher-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-pusher/-/bip-pod-pusher-0.3.0.tgz";
-      name = "bip-pod-pusher-0.3.0.tgz";
-      sha1 = "c23247a9532d9913938d547e6278c7466634a0d8";
+      url = "http://registry.npmjs.org/bip-pod-pusher/-/bip-pod-pusher-0.3.2.tgz";
+      name = "bip-pod-pusher-0.3.2.tgz";
+      sha1 = "8cc71c54d9b0f9bd0c39069f8007020be1fdf26f";
     };
     deps = {
       "pusher-1.0.4" = self.by-version."pusher"."1.0.4";
@@ -3309,22 +3543,22 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-pusher" = self.by-version."bip-pod-pusher"."0.3.0";
+  "bip-pod-pusher" = self.by-version."bip-pod-pusher"."0.3.2";
   by-spec."bip-pod-soundcloud"."*" =
-    self.by-version."bip-pod-soundcloud"."0.3.0";
-  by-version."bip-pod-soundcloud"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-soundcloud-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-soundcloud"."0.3.1";
+  by-version."bip-pod-soundcloud"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-soundcloud-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-soundcloud/-/bip-pod-soundcloud-0.3.0.tgz";
-      name = "bip-pod-soundcloud-0.3.0.tgz";
-      sha1 = "3f35efdf27e684ae3f05019bfe83798c36fe0f19";
+      url = "http://registry.npmjs.org/bip-pod-soundcloud/-/bip-pod-soundcloud-0.3.1.tgz";
+      name = "bip-pod-soundcloud-0.3.1.tgz";
+      sha1 = "71c28498ea2872dd8b8d2dabd8ee2e741cb0001e";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-soundcloud-0.1.2" = self.by-version."passport-soundcloud"."0.1.2";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -3332,17 +3566,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-soundcloud" = self.by-version."bip-pod-soundcloud"."0.3.0";
+  "bip-pod-soundcloud" = self.by-version."bip-pod-soundcloud"."0.3.1";
   by-spec."bip-pod-statuscake"."*" =
-    self.by-version."bip-pod-statuscake"."0.3.0";
-  by-version."bip-pod-statuscake"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-statuscake-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-statuscake"."0.3.1";
+  by-version."bip-pod-statuscake"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-statuscake-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-statuscake/-/bip-pod-statuscake-0.3.0.tgz";
-      name = "bip-pod-statuscake-0.3.0.tgz";
-      sha1 = "3cc042c336739248d98609aaf6ea0dd881796dc8";
+      url = "http://registry.npmjs.org/bip-pod-statuscake/-/bip-pod-statuscake-0.3.1.tgz";
+      name = "bip-pod-statuscake-0.3.1.tgz";
+      sha1 = "1cd5df2002c80f19acc54f473fd92dfe53b31e66";
     };
     deps = {
     };
@@ -3352,31 +3586,30 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-statuscake" = self.by-version."bip-pod-statuscake"."0.3.0";
+  "bip-pod-statuscake" = self.by-version."bip-pod-statuscake"."0.3.1";
   by-spec."bip-pod-syndication".">=0.0.1" =
-    self.by-version."bip-pod-syndication"."0.3.5";
-  by-version."bip-pod-syndication"."0.3.5" = self.buildNodePackage {
-    name = "bip-pod-syndication-0.3.5";
-    version = "0.3.5";
+    self.by-version."bip-pod-syndication"."0.3.11";
+  by-version."bip-pod-syndication"."0.3.11" = self.buildNodePackage {
+    name = "bip-pod-syndication-0.3.11";
+    version = "0.3.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.3.5.tgz";
-      name = "bip-pod-syndication-0.3.5.tgz";
-      sha1 = "21874326672a82a56bc40702efabfb3cbfa66d49";
+      url = "http://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.3.11.tgz";
+      name = "bip-pod-syndication-0.3.11.tgz";
+      sha1 = "bc0491a5791bb9bdf8a88f3694c904128c7482ec";
     };
     deps = {
       "ejs-2.3.1" = self.by-version."ejs"."2.3.1";
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
-      "feedparser-0.19.2" = self.by-version."feedparser"."0.19.2";
+      "feedparser-1.0.1" = self.by-version."feedparser"."1.0.1";
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
       "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3";
-      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+      "moment-2.10.2" = self.by-version."moment"."2.10.2";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "rss-1.1.1" = self.by-version."rss"."1.1.1";
       "send-0.9.3" = self.by-version."send"."0.9.3";
-      "validator-1.5.1" = self.by-version."validator"."1.5.1";
     };
     optionalDependencies = {
     };
@@ -3385,15 +3618,15 @@
     cpu = [ ];
   };
   by-spec."bip-pod-templater".">=0.0.1" =
-    self.by-version."bip-pod-templater"."0.3.0";
-  by-version."bip-pod-templater"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-templater-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-templater"."0.3.2";
+  by-version."bip-pod-templater"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-templater-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-templater/-/bip-pod-templater-0.3.0.tgz";
-      name = "bip-pod-templater-0.3.0.tgz";
-      sha1 = "37e06e747d3fe6efc324ff5a32bd7c797353f719";
+      url = "http://registry.npmjs.org/bip-pod-templater/-/bip-pod-templater-0.3.2.tgz";
+      name = "bip-pod-templater-0.3.2.tgz";
+      sha1 = "8ccd67dc61b6a42edf1285a3f0417a6b08f6528a";
     };
     deps = {
       "html-md-3.0.2" = self.by-version."html-md"."3.0.2";
@@ -3408,15 +3641,15 @@
     cpu = [ ];
   };
   by-spec."bip-pod-time".">=0.0.1" =
-    self.by-version."bip-pod-time"."0.3.1";
-  by-version."bip-pod-time"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-time-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-time"."0.3.3";
+  by-version."bip-pod-time"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-time-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.1.tgz";
-      name = "bip-pod-time-0.3.1.tgz";
-      sha1 = "97dae8e0b997ba22f43a8d8c7ff13f965883a735";
+      url = "http://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.3.tgz";
+      name = "bip-pod-time-0.3.3.tgz";
+      sha1 = "bfb67d85c65e3c4bad66e98050ecbda99d3971ab";
     };
     deps = {
       "moment-2.5.1" = self.by-version."moment"."2.5.1";
@@ -3430,15 +3663,15 @@
     cpu = [ ];
   };
   by-spec."bip-pod-todoist"."*" =
-    self.by-version."bip-pod-todoist"."0.3.0";
-  by-version."bip-pod-todoist"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-todoist-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-todoist"."0.3.2";
+  by-version."bip-pod-todoist"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-todoist-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-todoist/-/bip-pod-todoist-0.3.0.tgz";
-      name = "bip-pod-todoist-0.3.0.tgz";
-      sha1 = "d5d7e92ffa609c44c3bcb12db24f57686c3b5a2c";
+      url = "http://registry.npmjs.org/bip-pod-todoist/-/bip-pod-todoist-0.3.2.tgz";
+      name = "bip-pod-todoist-0.3.2.tgz";
+      sha1 = "93878ef2a4360fa219dbab1367efe63caded66ce";
     };
     deps = {
     };
@@ -3448,17 +3681,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-todoist" = self.by-version."bip-pod-todoist"."0.3.0";
+  "bip-pod-todoist" = self.by-version."bip-pod-todoist"."0.3.2";
   by-spec."bip-pod-trello"."*" =
-    self.by-version."bip-pod-trello"."0.3.0";
-  by-version."bip-pod-trello"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-trello-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-trello"."0.3.1";
+  by-version."bip-pod-trello"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-trello-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-trello/-/bip-pod-trello-0.3.0.tgz";
-      name = "bip-pod-trello-0.3.0.tgz";
-      sha1 = "52fc0731a0c3a357a21b79b3a7d5902cb2f80408";
+      url = "http://registry.npmjs.org/bip-pod-trello/-/bip-pod-trello-0.3.1.tgz";
+      name = "bip-pod-trello-0.3.1.tgz";
+      sha1 = "8e6f74c3c06cf1caeae94322a5a6033431f71b49";
     };
     deps = {
       "passport-trello-0.1.4" = self.by-version."passport-trello"."0.1.4";
@@ -3470,22 +3703,22 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-trello" = self.by-version."bip-pod-trello"."0.3.0";
+  "bip-pod-trello" = self.by-version."bip-pod-trello"."0.3.1";
   by-spec."bip-pod-twilio"."*" =
-    self.by-version."bip-pod-twilio"."0.3.1";
-  by-version."bip-pod-twilio"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-twilio-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-twilio"."0.3.4";
+  by-version."bip-pod-twilio"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-twilio-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-twilio/-/bip-pod-twilio-0.3.1.tgz";
-      name = "bip-pod-twilio-0.3.1.tgz";
-      sha1 = "44160bf0df0fd0f4b6ce879383434044081c01b7";
+      url = "http://registry.npmjs.org/bip-pod-twilio/-/bip-pod-twilio-0.3.4.tgz";
+      name = "bip-pod-twilio-0.3.4.tgz";
+      sha1 = "25e272d6808df5d4ed4461a8a1c70cf563df92e3";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "twilio-1.11.0" = self.by-version."twilio"."1.11.0";
+      "twilio-2.0.0" = self.by-version."twilio"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -3493,23 +3726,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-twilio" = self.by-version."bip-pod-twilio"."0.3.1";
+  "bip-pod-twilio" = self.by-version."bip-pod-twilio"."0.3.4";
   by-spec."bip-pod-twitter"."*" =
-    self.by-version."bip-pod-twitter"."0.3.4";
-  by-version."bip-pod-twitter"."0.3.4" = self.buildNodePackage {
-    name = "bip-pod-twitter-0.3.4";
-    version = "0.3.4";
+    self.by-version."bip-pod-twitter"."0.3.7";
+  by-version."bip-pod-twitter"."0.3.7" = self.buildNodePackage {
+    name = "bip-pod-twitter-0.3.7";
+    version = "0.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.4.tgz";
-      name = "bip-pod-twitter-0.3.4.tgz";
-      sha1 = "77ce4dbf50a787c22bd2dfe73028d967c0948973";
+      url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.7.tgz";
+      name = "bip-pod-twitter-0.3.7.tgz";
+      sha1 = "4573eb279cd371ecd34d98bfe79eba36523a224c";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "ntwitter-0.5.0" = self.by-version."ntwitter"."0.5.0";
-      "passport-twitter-1.0.2" = self.by-version."passport-twitter"."1.0.2";
+      "passport-twitter-1.0.3" = self.by-version."passport-twitter"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -3517,17 +3750,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.4";
+  "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.7";
   by-spec."bip-pod-witai"."*" =
-    self.by-version."bip-pod-witai"."0.3.0";
-  by-version."bip-pod-witai"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-witai-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-witai"."0.3.1";
+  by-version."bip-pod-witai"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-witai-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-witai/-/bip-pod-witai-0.3.0.tgz";
-      name = "bip-pod-witai-0.3.0.tgz";
-      sha1 = "5fa089155895fe375fc32262fe734ff980ef455d";
+      url = "http://registry.npmjs.org/bip-pod-witai/-/bip-pod-witai-0.3.1.tgz";
+      name = "bip-pod-witai-0.3.1.tgz";
+      sha1 = "e98cce9202b765c252424fac0c25982e0d57eb27";
     };
     deps = {
     };
@@ -3537,17 +3770,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-witai" = self.by-version."bip-pod-witai"."0.3.0";
+  "bip-pod-witai" = self.by-version."bip-pod-witai"."0.3.1";
   by-spec."bip-pod-wordpress"."*" =
-    self.by-version."bip-pod-wordpress"."0.3.0";
-  by-version."bip-pod-wordpress"."0.3.0" = self.buildNodePackage {
-    name = "bip-pod-wordpress-0.3.0";
-    version = "0.3.0";
+    self.by-version."bip-pod-wordpress"."0.3.1";
+  by-version."bip-pod-wordpress"."0.3.1" = self.buildNodePackage {
+    name = "bip-pod-wordpress-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-wordpress/-/bip-pod-wordpress-0.3.0.tgz";
-      name = "bip-pod-wordpress-0.3.0.tgz";
-      sha1 = "5a4f863de9a5fae3aea7f9fd76ef5c0f9b46172a";
+      url = "http://registry.npmjs.org/bip-pod-wordpress/-/bip-pod-wordpress-0.3.1.tgz";
+      name = "bip-pod-wordpress-0.3.1.tgz";
+      sha1 = "e5b2335a4459892d7aae4363456a946ca398bf4e";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
@@ -3560,7 +3793,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-wordpress" = self.by-version."bip-pod-wordpress"."0.3.0";
+  "bip-pod-wordpress" = self.by-version."bip-pod-wordpress"."0.3.1";
   by-spec."bip-pod-zoho"."*" =
     self.by-version."bip-pod-zoho"."0.3.1";
   by-version."bip-pod-zoho"."0.3.1" = self.buildNodePackage {
@@ -3585,81 +3818,84 @@
   };
   "bip-pod-zoho" = self.by-version."bip-pod-zoho"."0.3.1";
   by-spec."bipio"."*" =
-    self.by-version."bipio"."0.3.24";
-  by-version."bipio"."0.3.24" = self.buildNodePackage {
-    name = "bipio-0.3.24";
-    version = "0.3.24";
+    self.by-version."bipio"."0.3.41";
+  by-version."bipio"."0.3.41" = self.buildNodePackage {
+    name = "bipio-0.3.41";
+    version = "0.3.41";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bipio/-/bipio-0.3.24.tgz";
-      name = "bipio-0.3.24.tgz";
-      sha1 = "cd828183d7e54ba488a9ffdf164ddc1327e21c3d";
+      url = "http://registry.npmjs.org/bipio/-/bipio-0.3.41.tgz";
+      name = "bipio-0.3.41.tgz";
+      sha1 = "8f2a1497f7ce8ce3d6b8bafa8bb6e2d2de27b5b3";
     };
     deps = {
       "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0";
-      "amqp-0.2.3" = self.by-version."amqp"."0.2.3";
+      "amqp-0.2.4" = self.by-version."amqp"."0.2.4";
       "async-0.1.18" = self.by-version."async"."0.1.18";
       "base-converter-1.1.2" = self.by-version."base-converter"."1.1.2";
-      "bcrypt-0.8.1" = self.by-version."bcrypt"."0.8.1";
-      "bip-pod-0.3.8" = self.by-version."bip-pod"."0.3.8";
-      "bip-pod-crypto-0.3.0" = self.by-version."bip-pod-crypto"."0.3.0";
-      "bip-pod-email-0.3.3" = self.by-version."bip-pod-email"."0.3.3";
-      "bip-pod-flow-0.3.1" = self.by-version."bip-pod-flow"."0.3.1";
-      "bip-pod-html-0.3.1" = self.by-version."bip-pod-html"."0.3.1";
-      "bip-pod-http-0.3.0" = self.by-version."bip-pod-http"."0.3.0";
-      "bip-pod-math-0.3.2" = self.by-version."bip-pod-math"."0.3.2";
-      "bip-pod-syndication-0.3.5" = self.by-version."bip-pod-syndication"."0.3.5";
-      "bip-pod-templater-0.3.0" = self.by-version."bip-pod-templater"."0.3.0";
-      "bip-pod-time-0.3.1" = self.by-version."bip-pod-time"."0.3.1";
-      "body-parser-1.12.0" = self.by-version."body-parser"."1.12.0";
-      "clone-1.0.0" = self.by-version."clone"."1.0.0";
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "bcrypt-0.8.2" = self.by-version."bcrypt"."0.8.2";
+      "bip-pod-0.3.16" = self.by-version."bip-pod"."0.3.16";
+      "bip-pod-crypto-0.3.3" = self.by-version."bip-pod-crypto"."0.3.3";
+      "bip-pod-email-0.3.9" = self.by-version."bip-pod-email"."0.3.9";
+      "bip-pod-flow-0.3.8" = self.by-version."bip-pod-flow"."0.3.8";
+      "bip-pod-html-0.3.3" = self.by-version."bip-pod-html"."0.3.3";
+      "bip-pod-http-0.3.3" = self.by-version."bip-pod-http"."0.3.3";
+      "bip-pod-math-0.3.6" = self.by-version."bip-pod-math"."0.3.6";
+      "bip-pod-syndication-0.3.11" = self.by-version."bip-pod-syndication"."0.3.11";
+      "bip-pod-templater-0.3.2" = self.by-version."bip-pod-templater"."0.3.2";
+      "bip-pod-time-0.3.3" = self.by-version."bip-pod-time"."0.3.3";
+      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
+      "commander-2.8.0" = self.by-version."commander"."2.8.0";
       "config-0.4.36" = self.by-version."config"."0.4.36";
-      "connect-2.29.0" = self.by-version."connect"."2.29.0";
-      "connect-mongo-0.7.0" = self.by-version."connect-mongo"."0.7.0";
+      "connect-2.29.1" = self.by-version."connect"."2.29.1";
+      "connect-mongo-0.8.0" = self.by-version."connect-mongo"."0.8.0";
       "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
-      "cron-1.0.6" = self.by-version."cron"."1.0.6";
+      "cron-1.0.9" = self.by-version."cron"."1.0.9";
       "dateformat-1.0.7-1.2.3" = self.by-version."dateformat"."1.0.7-1.2.3";
       "datejs-0.0.2" = self.by-version."datejs"."0.0.2";
-      "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4";
+      "errorhandler-1.3.5" = self.by-version."errorhandler"."1.3.5";
       "execSync-1.0.2" = self.by-version."execSync"."1.0.2";
-      "express-4.12.0" = self.by-version."express"."4.12.0";
-      "express-session-1.10.3" = self.by-version."express-session"."1.10.3";
+      "express-4.12.3" = self.by-version."express"."4.12.3";
+      "express-session-1.11.1" = self.by-version."express-session"."1.11.1";
       "extend-2.0.0" = self.by-version."extend"."2.0.0";
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
       "heapdump-0.2.10" = self.by-version."heapdump"."0.2.10";
       "html-md-3.0.2" = self.by-version."html-md"."3.0.2";
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
       "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3";
-      "inquirer-0.8.0" = self.by-version."inquirer"."0.8.0";
-      "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
+      "inquirer-0.8.2" = self.by-version."inquirer"."0.8.2";
+      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
       "json-middleware-1.0.2" = self.by-version."json-middleware"."1.0.2";
       "jsonwebtoken-1.3.0" = self.by-version."jsonwebtoken"."1.3.0";
       "ldapjs-0.7.1" = self.by-version."ldapjs"."0.7.1";
-      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
+      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
       "marked-0.3.3" = self.by-version."marked"."0.3.3";
       "memwatch-0.2.2" = self.by-version."memwatch"."0.2.2";
       "method-override-1.0.2" = self.by-version."method-override"."1.0.2";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+      "moment-2.10.2" = self.by-version."moment"."2.10.2";
+      "moment-timezone-0.3.1" = self.by-version."moment-timezone"."0.3.1";
       "mongoose-3.9.7" = self.by-version."mongoose"."3.9.7";
       "multer-0.1.8" = self.by-version."multer"."0.1.8";
       "node-fs-0.1.7" = self.by-version."node-fs"."0.1.7";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "pkgcloud-1.1.0" = self.by-version."pkgcloud"."1.1.0";
       "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0";
       "q-1.2.0" = self.by-version."q"."1.2.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "rrecur-2.0.0" = self.by-version."rrecur"."2.0.0";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
       "sleep-1.2.0" = self.by-version."sleep"."1.2.0";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
-      "ssl-root-cas-1.1.7" = self.by-version."ssl-root-cas"."1.1.7";
+      "ssl-root-cas-1.1.10" = self.by-version."ssl-root-cas"."1.1.10";
       "sugar-1.4.1" = self.by-version."sugar"."1.4.1";
       "temp-0.8.1" = self.by-version."temp"."0.8.1";
-      "time-0.11.1" = self.by-version."time"."0.11.1";
-      "tldtools-0.0.23" = self.by-version."tldtools"."0.0.23";
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "time-0.11.2" = self.by-version."time"."0.11.2";
+      "tldtools-0.0.24" = self.by-version."tldtools"."0.0.24";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
       "webkit-devtools-agent-0.2.5" = self.by-version."webkit-devtools-agent"."0.2.5";
       "winston-0.5.1" = self.by-version."winston"."0.5.1";
@@ -3670,7 +3906,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "bipio" = self.by-version."bipio"."0.3.24";
+  "bipio" = self.by-version."bipio"."0.3.41";
   by-spec."bitcoinjs-lib"."1.2.0" =
     self.by-version."bitcoinjs-lib"."1.2.0";
   by-version."bitcoinjs-lib"."1.2.0" = self.buildNodePackage {
@@ -3685,7 +3921,7 @@
     deps = {
       "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
       "bs58check-1.0.3" = self.by-version."bs58check"."1.0.3";
-      "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12";
+      "crypto-browserify-3.9.14" = self.by-version."crypto-browserify"."3.9.14";
       "ecurve-1.0.0" = self.by-version."ecurve"."1.0.0";
     };
     optionalDependencies = {
@@ -3753,7 +3989,7 @@
       "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2";
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1";
-      "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0";
+      "run-parallel-1.1.0" = self.by-version."run-parallel"."1.1.0";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
     };
     optionalDependencies = {
@@ -3762,30 +3998,33 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bittorrent-dht"."^2.6.4" =
-    self.by-version."bittorrent-dht"."2.6.4";
-  by-version."bittorrent-dht"."2.6.4" = self.buildNodePackage {
-    name = "bittorrent-dht-2.6.4";
-    version = "2.6.4";
+  by-spec."bittorrent-dht"."^3.0.0" =
+    self.by-version."bittorrent-dht"."3.0.8";
+  by-version."bittorrent-dht"."3.0.8" = self.buildNodePackage {
+    name = "bittorrent-dht-3.0.8";
+    version = "3.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-2.6.4.tgz";
-      name = "bittorrent-dht-2.6.4.tgz";
-      sha1 = "af090c6576f6228596fdd5c538d3439aaf50577b";
+      url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-3.0.8.tgz";
+      name = "bittorrent-dht-3.0.8.tgz";
+      sha1 = "73cb8cbf7b6a9be53fba0cf0dc689f8edf6c28dd";
     };
     deps = {
-      "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0";
-      "bencode-0.6.0" = self.by-version."bencode"."0.6.0";
+      "addr-to-ip-port-1.4.1" = self.by-version."addr-to-ip-port"."1.4.1";
+      "bencode-0.7.0" = self.by-version."bencode"."0.7.0";
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "is-ip-1.0.0" = self.by-version."is-ip"."1.0.0";
       "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2";
+      "network-address-1.0.0" = self.by-version."network-address"."1.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
-      "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0";
+      "run-parallel-1.1.0" = self.by-version."run-parallel"."1.1.0";
+      "simple-get-1.3.3" = self.by-version."simple-get"."1.3.3";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
+      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -3809,15 +4048,15 @@
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "extend.js-0.0.2" = self.by-version."extend.js"."0.0.2";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "ip-0.3.2" = self.by-version."ip"."0.3.2";
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "portfinder-0.3.0" = self.by-version."portfinder"."0.3.0";
-      "run-series-1.0.2" = self.by-version."run-series"."1.0.2";
-      "simple-get-1.3.0" = self.by-version."simple-get"."1.3.0";
+      "run-series-1.1.0" = self.by-version."run-series"."1.1.0";
+      "simple-get-1.3.3" = self.by-version."simple-get"."1.3.3";
       "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
     };
     optionalDependencies = {
@@ -3848,6 +4087,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."bl"."~0.8.1" =
+    self.by-version."bl"."0.8.2";
+  by-version."bl"."0.8.2" = self.buildNodePackage {
+    name = "bl-0.8.2";
+    version = "0.8.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
+      name = "bl-0.8.2.tgz";
+      sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
+    };
+    deps = {
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."bl"."~0.9.0" =
     self.by-version."bl"."0.9.4";
   by-spec."blob"."0.0.2" =
@@ -3891,16 +4150,35 @@
   };
   by-spec."block-stream"."0.0.7" =
     self.by-version."block-stream"."0.0.7";
-  by-spec."bluebird".">= 2.3.2" =
-    self.by-version."bluebird"."2.9.12";
-  by-version."bluebird"."2.9.12" = self.buildNodePackage {
-    name = "bluebird-2.9.12";
-    version = "2.9.12";
+  by-spec."bluebird"."2.3.2" =
+    self.by-version."bluebird"."2.3.2";
+  by-version."bluebird"."2.3.2" = self.buildNodePackage {
+    name = "bluebird-2.3.2";
+    version = "2.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.2.tgz";
+      name = "bluebird-2.3.2.tgz";
+      sha1 = "7475ac7ca0c1674077ac3dd4092ddb80233cf26b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird".">= 2.3.2 < 3" =
+    self.by-version."bluebird"."2.9.24";
+  by-version."bluebird"."2.9.24" = self.buildNodePackage {
+    name = "bluebird-2.9.24";
+    version = "2.9.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.12.tgz";
-      name = "bluebird-2.9.12.tgz";
-      sha1 = "b108b6d659a7bb0b88d08a8079c91bcfc43e15a6";
+      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.24.tgz";
+      name = "bluebird-2.9.24.tgz";
+      sha1 = "14a2e75f0548323dc35aa440d92007ca154e967c";
     };
     deps = {
     };
@@ -3910,6 +4188,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."bluebird"."^2.9.21" =
+    self.by-version."bluebird"."2.9.24";
   by-spec."blueimp-md5"."~1.1.0" =
     self.by-version."blueimp-md5"."1.1.0";
   by-version."blueimp-md5"."1.1.0" = self.buildNodePackage {
@@ -4012,27 +4292,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."body-parser"."^1.0.2" =
-    self.by-version."body-parser"."1.12.0";
-  by-version."body-parser"."1.12.0" = self.buildNodePackage {
-    name = "body-parser-1.12.0";
-    version = "1.12.0";
+  by-spec."body-parser".">=1.9.2 <2.0.0-0" =
+    self.by-version."body-parser"."1.12.3";
+  by-version."body-parser"."1.12.3" = self.buildNodePackage {
+    name = "body-parser-1.12.3";
+    version = "1.12.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.0.tgz";
-      name = "body-parser-1.12.0.tgz";
-      sha1 = "9750fc3cc1080b34a13d18c79840cd559979fce5";
+      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.3.tgz";
+      name = "body-parser-1.12.3.tgz";
+      sha1 = "5f40bf17e7823be6895d4d35582752e36cf97f71";
     };
     deps = {
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "raw-body-1.3.3" = self.by-version."raw-body"."1.3.3";
-      "type-is-1.6.0" = self.by-version."type-is"."1.6.0";
+      "qs-2.4.1" = self.by-version."qs"."2.4.1";
+      "raw-body-1.3.4" = self.by-version."raw-body"."1.3.4";
+      "type-is-1.6.1" = self.by-version."type-is"."1.6.1";
     };
     optionalDependencies = {
     };
@@ -4040,8 +4320,12 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."body-parser"."~1.12.0" =
-    self.by-version."body-parser"."1.12.0";
+  by-spec."body-parser"."^1.0.2" =
+    self.by-version."body-parser"."1.12.3";
+  by-spec."body-parser"."^1.12.2" =
+    self.by-version."body-parser"."1.12.3";
+  by-spec."body-parser"."~1.12.2" =
+    self.by-version."body-parser"."1.12.3";
   by-spec."body-parser"."~1.8.2" =
     self.by-version."body-parser"."1.8.4";
   by-version."body-parser"."1.8.4" = self.buildNodePackage {
@@ -4071,33 +4355,6 @@
   };
   by-spec."body-parser"."~1.8.4" =
     self.by-version."body-parser"."1.8.4";
-  by-spec."body-parser"."~1.9.3" =
-    self.by-version."body-parser"."1.9.3";
-  by-version."body-parser"."1.9.3" = self.buildNodePackage {
-    name = "body-parser-1.9.3";
-    version = "1.9.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.3.tgz";
-      name = "body-parser-1.9.3.tgz";
-      sha1 = "edfacd4fcfad87dfe74f861a5cc712900aef2623";
-    };
-    deps = {
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."boom"."0.3.x" =
     self.by-version."boom"."0.3.8";
   by-version."boom"."0.3.8" = self.buildNodePackage {
@@ -4139,18 +4396,39 @@
     cpu = [ ];
   };
   by-spec."boom"."2.x.x" =
-    self.by-version."boom"."2.6.1";
-  by-version."boom"."2.6.1" = self.buildNodePackage {
-    name = "boom-2.6.1";
-    version = "2.6.1";
+    self.by-version."boom"."2.7.1";
+  by-version."boom"."2.7.1" = self.buildNodePackage {
+    name = "boom-2.7.1";
+    version = "2.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-2.6.1.tgz";
-      name = "boom-2.6.1.tgz";
-      sha1 = "4dc8ef9b6dfad9c43bbbfbe71fa4c21419f22753";
+      url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz";
+      name = "boom-2.7.1.tgz";
+      sha1 = "fb165c348d337977c61d4363c21e9e1abf526705";
     };
     deps = {
-      "hoek-2.11.0" = self.by-version."hoek"."2.11.0";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bops"."~0.1.0" =
+    self.by-version."bops"."0.1.1";
+  by-version."bops"."0.1.1" = self.buildNodePackage {
+    name = "bops-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bops/-/bops-0.1.1.tgz";
+      name = "bops-0.1.1.tgz";
+      sha1 = "062e02a8daa801fa10f2e5dbe6740cff801fe17e";
+    };
+    deps = {
+      "base64-js-0.0.2" = self.by-version."base64-js"."0.0.2";
+      "to-utf8-0.0.1" = self.by-version."to-utf8"."0.0.1";
     };
     optionalDependencies = {
     };
@@ -4159,58 +4437,60 @@
     cpu = [ ];
   };
   by-spec."bower"."*" =
-    self.by-version."bower"."1.3.12";
-  by-version."bower"."1.3.12" = self.buildNodePackage {
-    name = "bower-1.3.12";
-    version = "1.3.12";
+    self.by-version."bower"."1.4.1";
+  by-version."bower"."1.4.1" = self.buildNodePackage {
+    name = "bower-1.4.1";
+    version = "1.4.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bower/-/bower-1.3.12.tgz";
-      name = "bower-1.3.12.tgz";
-      sha1 = "37de0edb3904baf90aee13384a1a379a05ee214c";
+      url = "http://registry.npmjs.org/bower/-/bower-1.4.1.tgz";
+      name = "bower-1.4.1.tgz";
+      sha1 = "a18be39d030792754f30f1c5b32d37b0156ba8dd";
     };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
-      "archy-0.0.2" = self.by-version."archy"."0.0.2";
-      "bower-config-0.5.2" = self.by-version."bower-config"."0.5.2";
+      "archy-1.0.0" = self.by-version."archy"."1.0.0";
+      "bower-config-0.6.1" = self.by-version."bower-config"."0.6.1";
       "bower-endpoint-parser-0.2.2" = self.by-version."bower-endpoint-parser"."0.2.2";
       "bower-json-0.4.0" = self.by-version."bower-json"."0.4.0";
       "bower-logger-0.2.2" = self.by-version."bower-logger"."0.2.2";
-      "bower-registry-client-0.2.3" = self.by-version."bower-registry-client"."0.2.3";
-      "cardinal-0.4.0" = self.by-version."cardinal"."0.4.0";
-      "chalk-0.5.0" = self.by-version."chalk"."0.5.0";
+      "bower-registry-client-0.3.0" = self.by-version."bower-registry-client"."0.3.0";
+      "cardinal-0.4.4" = self.by-version."cardinal"."0.4.4";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
       "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
-      "decompress-zip-0.0.8" = self.by-version."decompress-zip"."0.0.8";
+      "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
+      "decompress-zip-0.1.0" = self.by-version."decompress-zip"."0.1.0";
       "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
-      "glob-4.0.6" = self.by-version."glob"."4.0.6";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "github-0.2.4" = self.by-version."github"."0.2.4";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0";
-      "inquirer-0.7.1" = self.by-version."inquirer"."0.7.1";
-      "insight-0.4.3" = self.by-version."insight"."0.4.3";
+      "inquirer-0.8.0" = self.by-version."inquirer"."0.8.0";
+      "insight-0.5.3" = self.by-version."insight"."0.5.3";
       "is-root-1.0.0" = self.by-version."is-root"."1.0.0";
       "junk-1.0.1" = self.by-version."junk"."1.0.1";
       "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0";
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "mout-0.9.1" = self.by-version."mout"."0.9.1";
+      "mout-0.11.0" = self.by-version."mout"."0.11.0";
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "opn-1.0.1" = self.by-version."opn"."1.0.1";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "p-throttler-0.1.0" = self.by-version."p-throttler"."0.1.0";
+      "p-throttler-0.1.1" = self.by-version."p-throttler"."0.1.1";
       "promptly-0.2.0" = self.by-version."promptly"."0.2.0";
-      "q-1.0.1" = self.by-version."q"."1.0.1";
-      "request-2.42.0" = self.by-version."request"."2.42.0";
-      "request-progress-0.3.0" = self.by-version."request-progress"."0.3.0";
-      "retry-0.6.0" = self.by-version."retry"."0.6.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "q-1.2.0" = self.by-version."q"."1.2.0";
+      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1";
+      "retry-0.6.1" = self.by-version."retry"."0.6.1";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
-      "shell-quote-1.4.2" = self.by-version."shell-quote"."1.4.2";
-      "stringify-object-1.0.0" = self.by-version."stringify-object"."1.0.0";
-      "tar-fs-0.5.2" = self.by-version."tar-fs"."0.5.2";
-      "tmp-0.0.23" = self.by-version."tmp"."0.0.23";
-      "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "shell-quote-1.4.3" = self.by-version."shell-quote"."1.4.3";
+      "stringify-object-1.0.1" = self.by-version."stringify-object"."1.0.1";
+      "tar-fs-1.5.0" = self.by-version."tar-fs"."1.5.0";
+      "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
+      "update-notifier-0.3.2" = self.by-version."update-notifier"."0.3.2";
+      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
     };
     optionalDependencies = {
     };
@@ -4218,19 +4498,19 @@
     os = [ ];
     cpu = [ ];
   };
-  "bower" = self.by-version."bower"."1.3.12";
+  "bower" = self.by-version."bower"."1.4.1";
   by-spec."bower".">=1.2.8 <2" =
-    self.by-version."bower"."1.3.12";
-  by-spec."bower-config"."~0.5.0" =
-    self.by-version."bower-config"."0.5.2";
-  by-version."bower-config"."0.5.2" = self.buildNodePackage {
-    name = "bower-config-0.5.2";
-    version = "0.5.2";
+    self.by-version."bower"."1.4.1";
+  by-spec."bower-config"."^0.6.1" =
+    self.by-version."bower-config"."0.6.1";
+  by-version."bower-config"."0.6.1" = self.buildNodePackage {
+    name = "bower-config-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bower-config/-/bower-config-0.5.2.tgz";
-      name = "bower-config-0.5.2.tgz";
-      sha1 = "1f7d2e899e99b70c29a613e70d4c64590414b22e";
+      url = "http://registry.npmjs.org/bower-config/-/bower-config-0.6.1.tgz";
+      name = "bower-config-0.6.1.tgz";
+      sha1 = "7093155688bef44079bf4cb32d189312c87ded60";
     };
     deps = {
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
@@ -4244,8 +4524,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bower-config"."~0.5.2" =
-    self.by-version."bower-config"."0.5.2";
+  by-spec."bower-config"."~0.6.1" =
+    self.by-version."bower-config"."0.6.1";
   by-spec."bower-endpoint-parser"."0.2.1" =
     self.by-version."bower-endpoint-parser"."0.2.1";
   by-version."bower-endpoint-parser"."0.2.1" = self.buildNodePackage {
@@ -4265,7 +4545,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bower-endpoint-parser"."~0.2.2" =
+  by-spec."bower-endpoint-parser"."^0.2.2" =
     self.by-version."bower-endpoint-parser"."0.2.2";
   by-version."bower-endpoint-parser"."0.2.2" = self.buildNodePackage {
     name = "bower-endpoint-parser-0.2.2";
@@ -4306,7 +4586,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bower-json"."~0.4.0" =
+  by-spec."bower-json"."^0.4.0" =
     self.by-version."bower-json"."0.4.0";
   by-spec."bower-logger"."0.2.1" =
     self.by-version."bower-logger"."0.2.1";
@@ -4327,7 +4607,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bower-logger"."~0.2.2" =
+  by-spec."bower-logger"."^0.2.2" =
     self.by-version."bower-logger"."0.2.2";
   by-version."bower-logger"."0.2.2" = self.buildNodePackage {
     name = "bower-logger-0.2.2";
@@ -4346,20 +4626,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bower-registry-client"."~0.2.0" =
-    self.by-version."bower-registry-client"."0.2.3";
-  by-version."bower-registry-client"."0.2.3" = self.buildNodePackage {
-    name = "bower-registry-client-0.2.3";
-    version = "0.2.3";
+  by-spec."bower-registry-client"."^0.3.0" =
+    self.by-version."bower-registry-client"."0.3.0";
+  by-version."bower-registry-client"."0.3.0" = self.buildNodePackage {
+    name = "bower-registry-client-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.3.tgz";
-      name = "bower-registry-client-0.2.3.tgz";
-      sha1 = "876e669d4b3eae5fc7e00f7b3da58a4b630b6603";
+      url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.3.0.tgz";
+      name = "bower-registry-client-0.3.0.tgz";
+      sha1 = "f5adcfdeda771a84be088ef1310d9756e58ebe74";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
-      "bower-config-0.5.2" = self.by-version."bower-config"."0.5.2";
+      "bower-config-0.6.1" = self.by-version."bower-config"."0.6.1";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1";
       "request-2.51.0" = self.by-version."request"."2.51.0";
@@ -4390,7 +4670,7 @@
       "bower-json-0.4.0" = self.by-version."bower-json"."0.4.0";
       "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1";
       "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1";
-      "bower-1.3.12" = self.by-version."bower"."1.3.12";
+      "bower-1.4.1" = self.by-version."bower"."1.4.1";
       "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
       "clone-0.1.11" = self.by-version."clone"."0.1.11";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
@@ -4443,6 +4723,48 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."braces"."^0.1.2" =
+    self.by-version."braces"."0.1.5";
+  by-version."braces"."0.1.5" = self.buildNodePackage {
+    name = "braces-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/braces/-/braces-0.1.5.tgz";
+      name = "braces-0.1.5.tgz";
+      sha1 = "c085711085291d8b75fdd74eab0f8597280711e6";
+    };
+    deps = {
+      "expand-range-0.1.1" = self.by-version."expand-range"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."braces"."^1.8.0" =
+    self.by-version."braces"."1.8.0";
+  by-version."braces"."1.8.0" = self.buildNodePackage {
+    name = "braces-1.8.0";
+    version = "1.8.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/braces/-/braces-1.8.0.tgz";
+      name = "braces-1.8.0.tgz";
+      sha1 = "3a4a005aae0391817c17b074dca8f08e6fc9e4c4";
+    };
+    deps = {
+      "expand-range-1.8.1" = self.by-version."expand-range"."1.8.1";
+      "preserve-0.2.0" = self.by-version."preserve"."0.2.0";
+      "repeat-element-1.1.0" = self.by-version."repeat-element"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."breakable"."~1.0.0" =
     self.by-version."breakable"."1.0.0";
   by-version."breakable"."1.0.0" = self.buildNodePackage {
@@ -4484,30 +4806,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."broadway"."0.2.x" =
-    self.by-version."broadway"."0.2.10";
-  by-version."broadway"."0.2.10" = self.buildNodePackage {
-    name = "broadway-0.2.10";
-    version = "0.2.10";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
-      name = "broadway-0.2.10.tgz";
-      sha1 = "0f58532be140426e9000e49a93e242a0d1263238";
-    };
-    deps = {
-      "cliff-0.1.8" = self.by-version."cliff"."0.1.8";
-      "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
-      "nconf-0.6.9" = self.by-version."nconf"."0.6.9";
-      "winston-0.7.2" = self.by-version."winston"."0.7.2";
-      "utile-0.2.1" = self.by-version."utile"."0.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."broadway"."~0.3.2" =
     self.by-version."broadway"."0.3.6";
   by-version."broadway"."0.3.6" = self.buildNodePackage {
@@ -4553,16 +4851,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browser-launcher2"."0.4.4" =
-    self.by-version."browser-launcher2"."0.4.4";
-  by-version."browser-launcher2"."0.4.4" = self.buildNodePackage {
-    name = "browser-launcher2-0.4.4";
-    version = "0.4.4";
+  by-spec."browser-launcher2"."0.4.5" =
+    self.by-version."browser-launcher2"."0.4.5";
+  by-version."browser-launcher2"."0.4.5" = self.buildNodePackage {
+    name = "browser-launcher2-0.4.5";
+    version = "0.4.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.4.tgz";
-      name = "browser-launcher2-0.4.4.tgz";
-      sha1 = "1e2b98ec9bc1c711084174d5b2c82598b5c0d1e4";
+      url = "http://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.5.tgz";
+      name = "browser-launcher2-0.4.5.tgz";
+      sha1 = "9b05fd5ead86a8931d20d5517e253d420882975a";
     };
     deps = {
       "headless-0.1.7" = self.by-version."headless"."0.1.7";
@@ -4570,7 +4868,7 @@
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
       "plist-1.1.0" = self.by-version."plist"."1.1.0";
-      "win-detect-browsers-0.0.2" = self.by-version."win-detect-browsers"."0.0.2";
+      "win-detect-browsers-1.0.1" = self.by-version."win-detect-browsers"."1.0.1";
       "uid-0.0.2" = self.by-version."uid"."0.0.2";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
@@ -4594,7 +4892,7 @@
     deps = {
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
       "umd-2.1.0" = self.by-version."umd"."2.1.0";
@@ -4606,20 +4904,20 @@
     cpu = [ ];
   };
   by-spec."browser-pack"."^4.0.0" =
-    self.by-version."browser-pack"."4.0.0";
-  by-version."browser-pack"."4.0.0" = self.buildNodePackage {
-    name = "browser-pack-4.0.0";
-    version = "4.0.0";
+    self.by-version."browser-pack"."4.0.1";
+  by-version."browser-pack"."4.0.1" = self.buildNodePackage {
+    name = "browser-pack-4.0.1";
+    version = "4.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-pack/-/browser-pack-4.0.0.tgz";
-      name = "browser-pack-4.0.0.tgz";
-      sha1 = "172a63e45a7f5a1df83386cd861ca2d96ace2e77";
+      url = "http://registry.npmjs.org/browser-pack/-/browser-pack-4.0.1.tgz";
+      name = "browser-pack-4.0.1.tgz";
+      sha1 = "7f4ab2b3a11c36a9274141fb7912122fc974e5f6";
     };
     deps = {
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
       "umd-3.0.0" = self.by-version."umd"."3.0.0";
@@ -4643,7 +4941,7 @@
     };
     deps = {
       "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
     };
     optionalDependencies = {
@@ -4674,18 +4972,18 @@
   by-spec."browser-request"."~0.3.1" =
     self.by-version."browser-request"."0.3.3";
   by-spec."browser-resolve"."^1.3.0" =
-    self.by-version."browser-resolve"."1.7.2";
-  by-version."browser-resolve"."1.7.2" = self.buildNodePackage {
-    name = "browser-resolve-1.7.2";
-    version = "1.7.2";
+    self.by-version."browser-resolve"."1.8.2";
+  by-version."browser-resolve"."1.8.2" = self.buildNodePackage {
+    name = "browser-resolve-1.8.2";
+    version = "1.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.7.2.tgz";
-      name = "browser-resolve-1.7.2.tgz";
-      sha1 = "b401695b615697856529389ae2bc1d0fab197bf4";
+      url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.8.2.tgz";
+      name = "browser-resolve-1.8.2.tgz";
+      sha1 = "a00b06c871bee21b50d450ff94c2a423bc787729";
     };
     deps = {
-      "resolve-1.1.5" = self.by-version."resolve"."1.1.5";
+      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
     };
     optionalDependencies = {
     };
@@ -4694,9 +4992,9 @@
     cpu = [ ];
   };
   by-spec."browser-resolve"."^1.7.0" =
-    self.by-version."browser-resolve"."1.7.2";
+    self.by-version."browser-resolve"."1.8.2";
   by-spec."browser-resolve"."^1.7.1" =
-    self.by-version."browser-resolve"."1.7.2";
+    self.by-version."browser-resolve"."1.8.2";
   by-spec."browser-resolve"."~1.2.1" =
     self.by-version."browser-resolve"."1.2.4";
   by-version."browser-resolve"."1.2.4" = self.buildNodePackage {
@@ -4732,8 +5030,8 @@
     };
     deps = {
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "connect-2.29.0" = self.by-version."connect"."2.29.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "connect-2.29.1" = self.by-version."connect"."2.29.1";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0";
     };
     optionalDependencies = {
@@ -4744,52 +5042,53 @@
   };
   "browserchannel" = self.by-version."browserchannel"."2.0.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."9.0.3";
-  by-version."browserify"."9.0.3" = self.buildNodePackage {
-    name = "browserify-9.0.3";
-    version = "9.0.3";
+    self.by-version."browserify"."9.0.8";
+  by-version."browserify"."9.0.8" = self.buildNodePackage {
+    name = "browserify-9.0.8";
+    version = "9.0.8";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify/-/browserify-9.0.3.tgz";
-      name = "browserify-9.0.3.tgz";
-      sha1 = "f2f742b82ec5631c64b8c98a9788db0017c6517c";
+      url = "http://registry.npmjs.org/browserify/-/browserify-9.0.8.tgz";
+      name = "browserify-9.0.8.tgz";
+      sha1 = "91859e9f60384459ead554df89cff03c734f159b";
     };
     deps = {
       "JSONStream-0.10.0" = self.by-version."JSONStream"."0.10.0";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
-      "browser-pack-4.0.0" = self.by-version."browser-pack"."4.0.0";
-      "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2";
+      "browser-pack-4.0.1" = self.by-version."browser-pack"."4.0.1";
+      "browser-resolve-1.8.2" = self.by-version."browser-resolve"."1.8.2";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-3.0.3" = self.by-version."buffer"."3.0.3";
+      "buffer-3.1.2" = self.by-version."buffer"."3.1.2";
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
       "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12";
+      "crypto-browserify-3.9.14" = self.by-version."crypto-browserify"."3.9.14";
       "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5";
       "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "events-1.0.2" = self.by-version."events"."1.0.2";
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
       "has-1.0.0" = self.by-version."has"."1.0.0";
       "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
       "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "insert-module-globals-6.2.0" = self.by-version."insert-module-globals"."6.2.0";
+      "insert-module-globals-6.2.1" = self.by-version."insert-module-globals"."6.2.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2";
-      "module-deps-3.7.2" = self.by-version."module-deps"."3.7.2";
+      "module-deps-3.7.6" = self.by-version."module-deps"."3.7.6";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "process-0.10.0" = self.by-version."process"."0.10.0";
+      "process-0.10.1" = self.by-version."process"."0.10.1";
       "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
+      "read-only-stream-1.1.1" = self.by-version."read-only-stream"."1.1.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "resolve-1.1.5" = self.by-version."resolve"."1.1.5";
+      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
       "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
       "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
@@ -4798,9 +5097,9 @@
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
       "syntax-error-1.1.2" = self.by-version."syntax-error"."1.1.2";
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
-      "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0";
+      "timers-browserify-1.4.0" = self.by-version."timers-browserify"."1.4.0";
       "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "url-0.10.2" = self.by-version."url"."0.10.2";
+      "url-0.10.3" = self.by-version."url"."0.10.3";
       "util-0.10.3" = self.by-version."util"."0.10.3";
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
@@ -4811,7 +5110,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "browserify" = self.by-version."browserify"."9.0.3";
+  "browserify" = self.by-version."browserify"."9.0.8";
   by-spec."browserify"."7.1.0" =
     self.by-version."browserify"."7.1.0";
   by-version."browserify"."7.1.0" = self.buildNodePackage {
@@ -4827,29 +5126,29 @@
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
       "assert-1.1.2" = self.by-version."assert"."1.1.2";
       "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0";
-      "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2";
+      "browser-resolve-1.8.2" = self.by-version."browser-resolve"."1.8.2";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-3.0.3" = self.by-version."buffer"."3.0.3";
+      "buffer-3.1.2" = self.by-version."buffer"."3.1.2";
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
       "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "crypto-browserify-3.9.12" = self.by-version."crypto-browserify"."3.9.12";
+      "crypto-browserify-3.9.14" = self.by-version."crypto-browserify"."3.9.14";
       "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5";
       "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "events-1.0.2" = self.by-version."events"."1.0.2";
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
       "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
       "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "insert-module-globals-6.2.0" = self.by-version."insert-module-globals"."6.2.0";
+      "insert-module-globals-6.2.1" = self.by-version."insert-module-globals"."6.2.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2";
-      "module-deps-3.7.2" = self.by-version."module-deps"."3.7.2";
+      "module-deps-3.7.6" = self.by-version."module-deps"."3.7.6";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
       "parents-0.0.3" = self.by-version."parents"."0.0.3";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
@@ -4866,10 +5165,10 @@
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
       "syntax-error-1.1.2" = self.by-version."syntax-error"."1.1.2";
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
-      "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0";
+      "timers-browserify-1.4.0" = self.by-version."timers-browserify"."1.4.0";
       "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
       "umd-2.1.0" = self.by-version."umd"."2.1.0";
-      "url-0.10.2" = self.by-version."url"."0.10.2";
+      "url-0.10.3" = self.by-version."url"."0.10.3";
       "util-0.10.3" = self.by-version."util"."0.10.3";
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
@@ -4896,10 +5195,10 @@
       "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1";
       "deps-sort-0.1.2" = self.by-version."deps-sort"."0.1.2";
       "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
       "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "insert-module-globals-2.3.4" = self.by-version."insert-module-globals"."2.3.4";
       "syntax-error-0.0.1" = self.by-version."syntax-error"."0.0.1";
       "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4";
@@ -4954,10 +5253,10 @@
       "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1";
       "deps-sort-0.1.2" = self.by-version."deps-sort"."0.1.2";
       "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
       "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "insert-module-globals-3.1.3" = self.by-version."insert-module-globals"."3.1.3";
       "syntax-error-0.1.0" = self.by-version."syntax-error"."0.1.0";
       "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4";
@@ -4999,26 +5298,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browserify-aes"."0.4.0" =
-    self.by-version."browserify-aes"."0.4.0";
-  by-version."browserify-aes"."0.4.0" = self.buildNodePackage {
-    name = "browserify-aes-0.4.0";
-    version = "0.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz";
-      name = "browserify-aes-0.4.0.tgz";
-      sha1 = "067149b668df31c4b58533e02d01e806d8608e2c";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."browserify-aes"."^1.0.0" =
     self.by-version."browserify-aes"."1.0.0";
   by-version."browserify-aes"."1.0.0" = self.buildNodePackage {
@@ -5031,7 +5310,7 @@
       sha1 = "582efc30561166f89855fcdc945b686919848b62";
     };
     deps = {
-      "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0";
+      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -5040,19 +5319,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browserify-rsa"."^1.1.0" =
-    self.by-version."browserify-rsa"."1.1.1";
-  by-version."browserify-rsa"."1.1.1" = self.buildNodePackage {
-    name = "browserify-rsa-1.1.1";
-    version = "1.1.1";
+  by-spec."browserify-rsa"."^2.0.0" =
+    self.by-version."browserify-rsa"."2.0.0";
+  by-version."browserify-rsa"."2.0.0" = self.buildNodePackage {
+    name = "browserify-rsa-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-1.1.1.tgz";
-      name = "browserify-rsa-1.1.1.tgz";
-      sha1 = "d7c952e12e44192680613ea7f3baa83af585c8ad";
+      url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz";
+      name = "browserify-rsa-2.0.0.tgz";
+      sha1 = "b3e4f6d03a07db4408bfd9dbc0fef323bfe1bdcb";
     };
     deps = {
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
+      "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -5060,23 +5340,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browserify-sign"."2.8.0" =
-    self.by-version."browserify-sign"."2.8.0";
-  by-version."browserify-sign"."2.8.0" = self.buildNodePackage {
-    name = "browserify-sign-2.8.0";
-    version = "2.8.0";
+  by-spec."browserify-sign"."^3.0.1" =
+    self.by-version."browserify-sign"."3.0.1";
+  by-version."browserify-sign"."3.0.1" = self.buildNodePackage {
+    name = "browserify-sign-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.8.0.tgz";
-      name = "browserify-sign-2.8.0.tgz";
-      sha1 = "655975c12006d02b59181da9ab73f856c63c9aa4";
+      url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.1.tgz";
+      name = "browserify-sign-3.0.1.tgz";
+      sha1 = "e1bdf7ca50d575d22e57705c60b3033846dc96bf";
     };
     deps = {
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
-      "browserify-rsa-1.1.1" = self.by-version."browserify-rsa"."1.1.1";
+      "browserify-rsa-2.0.0" = self.by-version."browserify-rsa"."2.0.0";
+      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
+      "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3";
       "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0";
+      "parse-asn1-3.0.0" = self.by-version."parse-asn1"."3.0.0";
     };
     optionalDependencies = {
     };
@@ -5096,7 +5378,7 @@
       sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
     };
     deps = {
-      "pako-0.2.5" = self.by-version."pako"."0.2.5";
+      "pako-0.2.6" = self.by-version."pako"."0.2.6";
     };
     optionalDependencies = {
     };
@@ -5166,19 +5448,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bson"."0.2.19" =
-    self.by-version."bson"."0.2.19";
-  by-version."bson"."0.2.19" = self.buildNodePackage {
-    name = "bson-0.2.19";
-    version = "0.2.19";
+  by-spec."bson"."0.2.2" =
+    self.by-version."bson"."0.2.2";
+  by-version."bson"."0.2.2" = self.buildNodePackage {
+    name = "bson-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bson/-/bson-0.2.19.tgz";
-      name = "bson-0.2.19.tgz";
-      sha1 = "b5ad9a5ed3c01354e410ff181cdf70bce838f493";
+      url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
+      name = "bson-0.2.2.tgz";
+      sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
     };
     deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
     optionalDependencies = {
     };
@@ -5186,18 +5467,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bson"."0.2.2" =
-    self.by-version."bson"."0.2.2";
-  by-version."bson"."0.2.2" = self.buildNodePackage {
-    name = "bson-0.2.2";
-    version = "0.2.2";
+  by-spec."bson"."~0.2" =
+    self.by-version."bson"."0.2.21";
+  by-version."bson"."0.2.21" = self.buildNodePackage {
+    name = "bson-0.2.21";
+    version = "0.2.21";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
-      name = "bson-0.2.2.tgz";
-      sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
+      url = "http://registry.npmjs.org/bson/-/bson-0.2.21.tgz";
+      name = "bson-0.2.21.tgz";
+      sha1 = "3755a5de71ac43f0e9a85f699c84d1ab73b0fcb3";
     };
     deps = {
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -5205,23 +5487,40 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bson"."~0.2" =
-    self.by-version."bson"."0.2.19";
-  by-spec."buffer"."^2.3.0" =
-    self.by-version."buffer"."2.8.2";
-  by-version."buffer"."2.8.2" = self.buildNodePackage {
-    name = "buffer-2.8.2";
-    version = "2.8.2";
+  by-spec."bson"."~0.3" =
+    self.by-version."bson"."0.3.1";
+  by-version."bson"."0.3.1" = self.buildNodePackage {
+    name = "bson-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer/-/buffer-2.8.2.tgz";
-      name = "buffer-2.8.2.tgz";
-      sha1 = "d73c214c0334384dc29b04ee0ff5f5527c7974e7";
+      url = "http://registry.npmjs.org/bson/-/bson-0.3.1.tgz";
+      name = "bson-0.3.1.tgz";
+      sha1 = "08882fb3a29ee41738a2bcbff8af7081ad9f35bb";
     };
     deps = {
-      "base64-js-0.0.7" = self.by-version."base64-js"."0.0.7";
-      "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
-      "is-array-1.0.1" = self.by-version."is-array"."1.0.1";
+    };
+    optionalDependencies = {
+      "bson-ext-0.1.1" = self.by-version."bson-ext"."0.1.1";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bson-ext"."~0.1" =
+    self.by-version."bson-ext"."0.1.1";
+  by-version."bson-ext"."0.1.1" = self.buildNodePackage {
+    name = "bson-ext-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bson-ext/-/bson-ext-0.1.1.tgz";
+      name = "bson-ext-0.1.1.tgz";
+      sha1 = "b0406d05097e50d6e0df77bd6127cfee8f7f4e0a";
+    };
+    deps = {
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4";
     };
     optionalDependencies = {
     };
@@ -5230,15 +5529,15 @@
     cpu = [ ];
   };
   by-spec."buffer"."^3.0.0" =
-    self.by-version."buffer"."3.0.3";
-  by-version."buffer"."3.0.3" = self.buildNodePackage {
-    name = "buffer-3.0.3";
-    version = "3.0.3";
+    self.by-version."buffer"."3.1.2";
+  by-version."buffer"."3.1.2" = self.buildNodePackage {
+    name = "buffer-3.1.2";
+    version = "3.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer/-/buffer-3.0.3.tgz";
-      name = "buffer-3.0.3.tgz";
-      sha1 = "93d8a236e8ee37941cdaf801eb8cd4117192ece6";
+      url = "http://registry.npmjs.org/buffer/-/buffer-3.1.2.tgz";
+      name = "buffer-3.1.2.tgz";
+      sha1 = "1c679611b961edf16b9c4daf44fb66beb9daa9f0";
     };
     deps = {
       "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
@@ -5251,6 +5550,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."buffer"."^3.0.3" =
+    self.by-version."buffer"."3.1.2";
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
   by-version."buffer-crc32"."0.1.1" = self.buildNodePackage {
@@ -5450,22 +5751,22 @@
     cpu = [ ];
   };
   by-spec."buildmail"."^1.2.0" =
-    self.by-version."buildmail"."1.2.0";
-  by-version."buildmail"."1.2.0" = self.buildNodePackage {
-    name = "buildmail-1.2.0";
-    version = "1.2.0";
+    self.by-version."buildmail"."1.2.4";
+  by-version."buildmail"."1.2.4" = self.buildNodePackage {
+    name = "buildmail-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buildmail/-/buildmail-1.2.0.tgz";
-      name = "buildmail-1.2.0.tgz";
-      sha1 = "9434eefe177fc496a23e605f51ceb38da3a6cee6";
+      url = "http://registry.npmjs.org/buildmail/-/buildmail-1.2.4.tgz";
+      name = "buildmail-1.2.4.tgz";
+      sha1 = "b59ce7e5e2a5b4d79e397740f8aa66307b758b91";
     };
     deps = {
       "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2";
-      "hyperquest-0.3.0" = self.by-version."hyperquest"."0.3.0";
+      "hyperquest-1.2.0" = self.by-version."hyperquest"."1.2.0";
       "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
-      "libmime-0.1.7" = self.by-version."libmime"."0.1.7";
-      "libqp-0.1.1" = self.by-version."libqp"."0.1.1";
+      "libmime-1.0.0" = self.by-version."libmime"."1.0.0";
+      "libqp-1.0.0" = self.by-version."libqp"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -5473,7 +5774,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."builtins"."~0.0.3" =
+  by-spec."builtins"."0.0.7" =
     self.by-version."builtins"."0.0.7";
   by-version."builtins"."0.0.7" = self.buildNodePackage {
     name = "builtins-0.0.7";
@@ -5492,6 +5793,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."builtins"."~0.0.3" =
+    self.by-version."builtins"."0.0.7";
   by-spec."bunker"."0.1.X" =
     self.by-version."bunker"."0.1.2";
   by-version."bunker"."0.1.2" = self.buildNodePackage {
@@ -5512,16 +5815,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bunyan"."0.21.1" =
-    self.by-version."bunyan"."0.21.1";
-  by-version."bunyan"."0.21.1" = self.buildNodePackage {
-    name = "bunyan-0.21.1";
-    version = "0.21.1";
+  by-spec."bunyan"."0.22.1" =
+    self.by-version."bunyan"."0.22.1";
+  by-version."bunyan"."0.22.1" = self.buildNodePackage {
+    name = "bunyan-0.22.1";
+    version = "0.22.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bunyan/-/bunyan-0.21.1.tgz";
-      name = "bunyan-0.21.1.tgz";
-      sha1 = "ea00a0d5223572e31e1e71efba2237cb1915942a";
+      url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz";
+      name = "bunyan-0.22.1.tgz";
+      sha1 = "020c383bed625af5c6c8834dd8c4aca0dd0f765c";
     };
     deps = {
     };
@@ -5533,27 +5836,52 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bunyan"."0.22.1" =
-    self.by-version."bunyan"."0.22.1";
-  by-version."bunyan"."0.22.1" = self.buildNodePackage {
-    name = "bunyan-0.22.1";
-    version = "0.22.1";
+  by-spec."bunyan"."1.3.4" =
+    self.by-version."bunyan"."1.3.4";
+  by-version."bunyan"."1.3.4" = self.buildNodePackage {
+    name = "bunyan-1.3.4";
+    version = "1.3.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz";
-      name = "bunyan-0.22.1.tgz";
-      sha1 = "020c383bed625af5c6c8834dd8c4aca0dd0f765c";
+      url = "http://registry.npmjs.org/bunyan/-/bunyan-1.3.4.tgz";
+      name = "bunyan-1.3.4.tgz";
+      sha1 = "0ef916d497912896ca4080e0f8764bd408735c8c";
     };
     deps = {
     };
     optionalDependencies = {
-      "mv-0.0.5" = self.by-version."mv"."0.0.5";
-      "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
+      "dtrace-provider-0.4.0" = self.by-version."dtrace-provider"."0.4.0";
+      "mv-2.0.3" = self.by-version."mv"."2.0.3";
+      "safe-json-stringify-1.0.3" = self.by-version."safe-json-stringify"."1.0.3";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bunyan".">=0.22.1 <2.0.0-0" =
+    self.by-version."bunyan"."1.3.5";
+  by-version."bunyan"."1.3.5" = self.buildNodePackage {
+    name = "bunyan-1.3.5";
+    version = "1.3.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bunyan/-/bunyan-1.3.5.tgz";
+      name = "bunyan-1.3.5.tgz";
+      sha1 = "49803cee624667132484b535e1831e7a777791b0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+      "dtrace-provider-0.4.0" = self.by-version."dtrace-provider"."0.4.0";
+      "mv-2.0.3" = self.by-version."mv"."2.0.3";
+      "safe-json-stringify-1.0.3" = self.by-version."safe-json-stringify"."1.0.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
+  by-spec."bunyan"."^1.2.3" =
+    self.by-version."bunyan"."1.3.5";
   by-spec."bunyan"."~1.0.0" =
     self.by-version."bunyan"."1.0.1";
   by-version."bunyan"."1.0.1" = self.buildNodePackage {
@@ -5738,6 +6066,26 @@
     self.by-version."bytes"."0.2.1";
   by-spec."bytes"."~0.3.0" =
     self.by-version."bytes"."0.3.0";
+  by-spec."bytewise"."~0.7.1" =
+    self.by-version."bytewise"."0.7.1";
+  by-version."bytewise"."0.7.1" = self.buildNodePackage {
+    name = "bytewise-0.7.1";
+    version = "0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/bytewise/-/bytewise-0.7.1.tgz";
+      name = "bytewise-0.7.1.tgz";
+      sha1 = "43a479d763c85256d5467c8fe05a734f4f2eac2e";
+    };
+    deps = {
+      "bops-0.1.1" = self.by-version."bops"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."callsite"."1.0.0" =
     self.by-version."callsite"."1.0.0";
   by-version."callsite"."1.0.0" = self.buildNodePackage {
@@ -5778,6 +6126,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."camelcase"."^1.0.2" =
+    self.by-version."camelcase"."1.0.2";
   by-spec."camelcase-keys"."^1.0.0" =
     self.by-version."camelcase-keys"."1.0.0";
   by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
@@ -5799,19 +6149,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cardinal"."0.4.0" =
-    self.by-version."cardinal"."0.4.0";
-  by-version."cardinal"."0.4.0" = self.buildNodePackage {
-    name = "cardinal-0.4.0";
-    version = "0.4.0";
+  by-spec."cardinal"."0.4.4" =
+    self.by-version."cardinal"."0.4.4";
+  by-version."cardinal"."0.4.4" = self.buildNodePackage {
+    name = "cardinal-0.4.4";
+    version = "0.4.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz";
-      name = "cardinal-0.4.0.tgz";
-      sha1 = "7d10aafb20837bde043c45e43a0c8c28cdaae45e";
+      url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.4.tgz";
+      name = "cardinal-0.4.4.tgz";
+      sha1 = "ca5bb68a5b511b90fe93b9acea49bdee5c32bfe2";
     };
     deps = {
       "redeyed-0.4.4" = self.by-version."redeyed"."0.4.4";
+      "ansicolors-0.2.1" = self.by-version."ansicolors"."0.2.1";
     };
     optionalDependencies = {
     };
@@ -5896,39 +6247,39 @@
     cpu = [ ];
   };
   by-spec."castnow"."*" =
-    self.by-version."castnow"."0.4.12";
-  by-version."castnow"."0.4.12" = self.buildNodePackage {
-    name = "castnow-0.4.12";
-    version = "0.4.12";
+    self.by-version."castnow"."0.4.13";
+  by-version."castnow"."0.4.13" = self.buildNodePackage {
+    name = "castnow-0.4.13";
+    version = "0.4.13";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/castnow/-/castnow-0.4.12.tgz";
-      name = "castnow-0.4.12.tgz";
-      sha1 = "048a351420a5e6a68d098d6e8dc6b4abc86d6780";
+      url = "http://registry.npmjs.org/castnow/-/castnow-0.4.13.tgz";
+      name = "castnow-0.4.13.tgz";
+      sha1 = "8bb190fb7bffbfc9918b2d226c78905994200e4b";
     };
     deps = {
       "array-loop-1.0.0" = self.by-version."array-loop"."1.0.0";
       "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8";
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "chromecast-player-0.1.10" = self.by-version."chromecast-player"."0.1.10";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
+      "chromecast-player-0.2.2" = self.by-version."chromecast-player"."0.2.2";
       "debounced-seeker-1.0.0" = self.by-version."debounced-seeker"."1.0.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "fs-extended-0.2.0" = self.by-version."fs-extended"."0.2.0";
       "get-youtube-id-0.1.3" = self.by-version."get-youtube-id"."0.1.3";
       "got-1.2.2" = self.by-version."got"."1.2.2";
       "internal-ip-1.0.0" = self.by-version."internal-ip"."1.0.0";
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
-      "peerflix-0.25.2" = self.by-version."peerflix"."0.25.2";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "peerflix-0.29.2" = self.by-version."peerflix"."0.29.2";
       "playerui-1.2.0" = self.by-version."playerui"."1.2.0";
       "query-string-1.0.0" = self.by-version."query-string"."1.0.0";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "read-torrent-1.2.0" = self.by-version."read-torrent"."1.2.0";
+      "read-torrent-1.3.0" = self.by-version."read-torrent"."1.3.0";
       "router-0.6.2" = self.by-version."router"."0.6.2";
       "srt2vtt-1.2.0" = self.by-version."srt2vtt"."1.2.0";
       "stream-transcoder-0.0.5" = self.by-version."stream-transcoder"."0.0.5";
-      "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
+      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
     optionalDependencies = {
@@ -5937,7 +6288,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "castnow" = self.by-version."castnow"."0.4.12";
+  "castnow" = self.by-version."castnow"."0.4.13";
   by-spec."castv2"."~0.1.4" =
     self.by-version."castv2"."0.1.4";
   by-version."castv2"."0.1.4" = self.buildNodePackage {
@@ -5981,15 +6332,15 @@
     cpu = [ ];
   };
   by-spec."chai"."*" =
-    self.by-version."chai"."2.0.0";
-  by-version."chai"."2.0.0" = self.buildNodePackage {
-    name = "chai-2.0.0";
-    version = "2.0.0";
+    self.by-version."chai"."2.2.0";
+  by-version."chai"."2.2.0" = self.buildNodePackage {
+    name = "chai-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chai/-/chai-2.0.0.tgz";
-      name = "chai-2.0.0.tgz";
-      sha1 = "9cec0eab7d782628f2df51226a41651869a9f894";
+      url = "http://registry.npmjs.org/chai/-/chai-2.2.0.tgz";
+      name = "chai-2.2.0.tgz";
+      sha1 = "d21135623bd393ad4702d94536eca482ad78d01d";
     };
     deps = {
       "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0";
@@ -6001,7 +6352,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "chai" = self.by-version."chai"."2.0.0";
+  "chai" = self.by-version."chai"."2.2.0";
   by-spec."chain-node".">=0.0.17" =
     self.by-version."chain-node"."3.1.0";
   by-version."chain-node"."3.1.0" = self.buildNodePackage {
@@ -6044,23 +6395,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chalk"."0.5.0" =
-    self.by-version."chalk"."0.5.0";
-  by-version."chalk"."0.5.0" = self.buildNodePackage {
-    name = "chalk-0.5.0";
-    version = "0.5.0";
+  by-spec."chalk"."1.0.0" =
+    self.by-version."chalk"."1.0.0";
+  by-version."chalk"."1.0.0" = self.buildNodePackage {
+    name = "chalk-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz";
-      name = "chalk-0.5.0.tgz";
-      sha1 = "375dfccbc21c0a60a8b61bc5b78f3dc2a55c212f";
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
+      name = "chalk-1.0.0.tgz";
+      sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
     };
     deps = {
-      "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0";
+      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
       "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
-      "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0";
-      "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0";
-      "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0";
+      "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
     };
     optionalDependencies = {
     };
@@ -6094,6 +6445,8 @@
   };
   by-spec."chalk"."^0.5.1" =
     self.by-version."chalk"."0.5.1";
+  by-spec."chalk"."^1.0.0" =
+    self.by-version."chalk"."1.0.0";
   by-spec."char-spinner"."~1.0.1" =
     self.by-version."char-spinner"."1.0.1";
   by-version."char-spinner"."1.0.1" = self.buildNodePackage {
@@ -6259,43 +6612,23 @@
   by-spec."chmodr"."~0.1.0" =
     self.by-version."chmodr"."0.1.0";
   by-spec."chokidar".">=0.8.2" =
-    self.by-version."chokidar"."0.12.6";
-  by-version."chokidar"."0.12.6" = self.buildNodePackage {
-    name = "chokidar-0.12.6";
-    version = "0.12.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/chokidar/-/chokidar-0.12.6.tgz";
-      name = "chokidar-0.12.6.tgz";
-      sha1 = "be204f5b9634e009311256e5d6e8e0e508284d2f";
-    };
-    deps = {
-      "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
-      "async-each-0.1.6" = self.by-version."async-each"."0.1.6";
-    };
-    optionalDependencies = {
-      "fsevents-0.3.5" = self.by-version."fsevents"."0.3.5";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."chokidar"."^1.0.0-rc2" =
-    self.by-version."chokidar"."1.0.0-rc3";
-  by-version."chokidar"."1.0.0-rc3" = self.buildNodePackage {
-    name = "chokidar-1.0.0-rc3";
-    version = "1.0.0-rc3";
+    self.by-version."chokidar"."1.0.1";
+  by-version."chokidar"."1.0.1" = self.buildNodePackage {
+    name = "chokidar-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chokidar/-/chokidar-1.0.0-rc3.tgz";
-      name = "chokidar-1.0.0-rc3.tgz";
-      sha1 = "f95d5e60c7d66eb53136c8999c47e9d4f37118f5";
+      url = "http://registry.npmjs.org/chokidar/-/chokidar-1.0.1.tgz";
+      name = "chokidar-1.0.1.tgz";
+      sha1 = "b19e476a071ac0c7a01279cdc936e0d31c6ee06a";
     };
     deps = {
-      "anymatch-1.1.0" = self.by-version."anymatch"."1.1.0";
+      "anymatch-1.2.1" = self.by-version."anymatch"."1.2.1";
+      "arrify-1.0.0" = self.by-version."arrify"."1.0.0";
       "async-each-0.1.6" = self.by-version."async-each"."0.1.6";
-      "glob-parent-1.0.0" = self.by-version."glob-parent"."1.0.0";
+      "glob-parent-1.2.0" = self.by-version."glob-parent"."1.2.0";
       "is-binary-path-1.0.0" = self.by-version."is-binary-path"."1.0.0";
+      "is-glob-1.1.3" = self.by-version."is-glob"."1.1.3";
       "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
     };
     optionalDependencies = {
@@ -6305,6 +6638,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."chokidar"."^1.0.0" =
+    self.by-version."chokidar"."1.0.1";
   by-spec."chownr"."0" =
     self.by-version."chownr"."0.0.1";
   by-version."chownr"."0.0.1" = self.buildNodePackage {
@@ -6324,20 +6659,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chromecast-player"."^0.1.10" =
-    self.by-version."chromecast-player"."0.1.10";
-  by-version."chromecast-player"."0.1.10" = self.buildNodePackage {
-    name = "chromecast-player-0.1.10";
-    version = "0.1.10";
+  by-spec."chromecast-player"."^0.2.2" =
+    self.by-version."chromecast-player"."0.2.2";
+  by-version."chromecast-player"."0.2.2" = self.buildNodePackage {
+    name = "chromecast-player-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.1.10.tgz";
-      name = "chromecast-player-0.1.10.tgz";
-      sha1 = "c5180f693d50119d824f81f388fe55bc2026844f";
+      url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.2.2.tgz";
+      name = "chromecast-player-0.2.2.tgz";
+      sha1 = "a228080e1a49c2881ae5d4ab2f9a0cd2de0ab443";
     };
     deps = {
       "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8";
-      "chromecast-scanner-0.3.0" = self.by-version."chromecast-scanner"."0.3.0";
+      "chromecast-scanner-0.4.3" = self.by-version."chromecast-scanner"."0.4.3";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "mutate.js-0.2.0" = self.by-version."mutate.js"."0.2.0";
       "promiscuous-0.6.0" = self.by-version."promiscuous"."0.6.0";
       "time-line-1.0.1" = self.by-version."time-line"."1.0.1";
@@ -6350,19 +6686,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chromecast-scanner"."0.3.0" =
-    self.by-version."chromecast-scanner"."0.3.0";
-  by-version."chromecast-scanner"."0.3.0" = self.buildNodePackage {
-    name = "chromecast-scanner-0.3.0";
-    version = "0.3.0";
+  by-spec."chromecast-scanner"."^0.4.1" =
+    self.by-version."chromecast-scanner"."0.4.3";
+  by-version."chromecast-scanner"."0.4.3" = self.buildNodePackage {
+    name = "chromecast-scanner-0.4.3";
+    version = "0.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.3.0.tgz";
-      name = "chromecast-scanner-0.3.0.tgz";
-      sha1 = "5e5bab3d8020ab5a8e868f967ebbdca2361c08f9";
+      url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.4.3.tgz";
+      name = "chromecast-scanner-0.4.3.tgz";
+      sha1 = "4b3392195acdc3e82ed6e8f2285cf36e94e62cdb";
     };
     deps = {
-      "mdns-js-0.2.9" = self.by-version."mdns-js"."0.2.9";
+      "array-find-0.1.1" = self.by-version."array-find"."0.1.1";
+      "multicast-dns-2.1.0" = self.by-version."multicast-dns"."2.1.0";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
     optionalDependencies = {
@@ -6391,19 +6728,19 @@
     cpu = [ ];
   };
   by-spec."clean-css"."^3.0.1" =
-    self.by-version."clean-css"."3.0.10";
-  by-version."clean-css"."3.0.10" = self.buildNodePackage {
-    name = "clean-css-3.0.10";
-    version = "3.0.10";
+    self.by-version."clean-css"."3.2.1";
+  by-version."clean-css"."3.2.1" = self.buildNodePackage {
+    name = "clean-css-3.2.1";
+    version = "3.2.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clean-css/-/clean-css-3.0.10.tgz";
-      name = "clean-css-3.0.10.tgz";
-      sha1 = "d477b381baa41f759a829d51f9cb380db90d626e";
+      url = "http://registry.npmjs.org/clean-css/-/clean-css-3.2.1.tgz";
+      name = "clean-css-3.2.1.tgz";
+      sha1 = "748303351495726144d45c4e1ea4677087b65be2";
     };
     deps = {
-      "commander-2.5.1" = self.by-version."commander"."2.5.1";
-      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "commander-2.8.0" = self.by-version."commander"."2.8.0";
+      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
     };
     optionalDependencies = {
     };
@@ -6412,15 +6749,15 @@
     cpu = [ ];
   };
   by-spec."cli"."0.6.x" =
-    self.by-version."cli"."0.6.5";
-  by-version."cli"."0.6.5" = self.buildNodePackage {
-    name = "cli-0.6.5";
-    version = "0.6.5";
+    self.by-version."cli"."0.6.6";
+  by-version."cli"."0.6.6" = self.buildNodePackage {
+    name = "cli-0.6.6";
+    version = "0.6.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cli/-/cli-0.6.5.tgz";
-      name = "cli-0.6.5.tgz";
-      sha1 = "f4edda12dfa8d56d726b43b0b558e089b0d2a85c";
+      url = "http://registry.npmjs.org/cli/-/cli-0.6.6.tgz";
+      name = "cli-0.6.6.tgz";
+      sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3";
     };
     deps = {
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
@@ -6433,15 +6770,15 @@
     cpu = [ ];
   };
   by-spec."cli-color"."~0.3.2" =
-    self.by-version."cli-color"."0.3.2";
-  by-version."cli-color"."0.3.2" = self.buildNodePackage {
-    name = "cli-color-0.3.2";
-    version = "0.3.2";
+    self.by-version."cli-color"."0.3.3";
+  by-version."cli-color"."0.3.3" = self.buildNodePackage {
+    name = "cli-color-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.2.tgz";
-      name = "cli-color-0.3.2.tgz";
-      sha1 = "75fa5f728c308cc4ac594b05e06cc5d80daccd86";
+      url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.3.tgz";
+      name = "cli-color-0.3.3.tgz";
+      sha1 = "12d5bdd158ff8a0b0db401198913c03df069f6f5";
     };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
@@ -6475,21 +6812,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cliff"."0.1.8" =
-    self.by-version."cliff"."0.1.8";
-  by-version."cliff"."0.1.8" = self.buildNodePackage {
-    name = "cliff-0.1.8";
-    version = "0.1.8";
+  by-spec."cli-width"."^1.0.1" =
+    self.by-version."cli-width"."1.0.1";
+  by-version."cli-width"."1.0.1" = self.buildNodePackage {
+    name = "cli-width-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
-      name = "cliff-0.1.8.tgz";
-      sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
+      url = "http://registry.npmjs.org/cli-width/-/cli-width-1.0.1.tgz";
+      name = "cli-width-1.0.1.tgz";
+      sha1 = "14d4f6870234d91e97f7dd81e76be8271410a1ef";
     };
     deps = {
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "winston-0.6.2" = self.by-version."winston"."0.6.2";
     };
     optionalDependencies = {
     };
@@ -6637,15 +6971,15 @@
     cpu = [ ];
   };
   by-spec."clone".">=0.1.0" =
-    self.by-version."clone"."1.0.0";
-  by-version."clone"."1.0.0" = self.buildNodePackage {
-    name = "clone-1.0.0";
-    version = "1.0.0";
+    self.by-version."clone"."1.0.2";
+  by-version."clone"."1.0.2" = self.buildNodePackage {
+    name = "clone-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-1.0.0.tgz";
-      name = "clone-1.0.0.tgz";
-      sha1 = "bde24f2ee7c478a409fc8a118ae2fcd44deb7f9e";
+      url = "http://registry.npmjs.org/clone/-/clone-1.0.2.tgz";
+      name = "clone-1.0.2.tgz";
+      sha1 = "260b7a99ebb1edfe247538175f783243cb19d149";
     };
     deps = {
     };
@@ -6718,16 +7052,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cmd-shim"."2.0.0" =
-    self.by-version."cmd-shim"."2.0.0";
-  by-version."cmd-shim"."2.0.0" = self.buildNodePackage {
-    name = "cmd-shim-2.0.0";
-    version = "2.0.0";
+  by-spec."cmd-shim"."~1.1.0" =
+    self.by-version."cmd-shim"."1.1.2";
+  by-version."cmd-shim"."1.1.2" = self.buildNodePackage {
+    name = "cmd-shim-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.0.tgz";
-      name = "cmd-shim-2.0.0.tgz";
-      sha1 = "34e0cd2ede0505cd8b154667eee9054ee24006b4";
+      url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.2.tgz";
+      name = "cmd-shim-1.1.2.tgz";
+      sha1 = "e4f9198802e361e8eb43b591959ef4dc6cdb6754";
     };
     deps = {
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
@@ -6751,7 +7085,7 @@
       sha1 = "4512a373d2391679aec51ad1d4733559e9b85d4a";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
     };
     optionalDependencies = {
@@ -6834,8 +7168,8 @@
     };
     deps = {
       "voc-0.5.0" = self.by-version."voc"."0.5.0";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
+      "commander-2.8.0" = self.by-version."commander"."2.8.0";
     };
     optionalDependencies = {
     };
@@ -6844,15 +7178,15 @@
     cpu = [ ];
   };
   by-spec."coffee-script"."*" =
-    self.by-version."coffee-script"."1.9.1";
-  by-version."coffee-script"."1.9.1" = self.buildNodePackage {
-    name = "coffee-script-1.9.1";
-    version = "1.9.1";
+    self.by-version."coffee-script"."1.9.2";
+  by-version."coffee-script"."1.9.2" = self.buildNodePackage {
+    name = "coffee-script-1.9.2";
+    version = "1.9.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.9.1.tgz";
-      name = "coffee-script-1.9.1.tgz";
-      sha1 = "c458d02200f460d064a79cb6ab1ee6e2c9ca1c31";
+      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.9.2.tgz";
+      name = "coffee-script-1.9.2.tgz";
+      sha1 = "2da4b663c61c6d1d851788aa31f941fc7b63edf3";
     };
     deps = {
     };
@@ -6862,7 +7196,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "coffee-script" = self.by-version."coffee-script"."1.9.1";
+  "coffee-script" = self.by-version."coffee-script"."1.9.2";
   by-spec."coffee-script"."1.6.3" =
     self.by-version."coffee-script"."1.6.3";
   by-version."coffee-script"."1.6.3" = self.buildNodePackage {
@@ -6883,11 +7217,13 @@
     cpu = [ ];
   };
   by-spec."coffee-script".">= 0.0.1" =
-    self.by-version."coffee-script"."1.9.1";
+    self.by-version."coffee-script"."1.9.2";
   by-spec."coffee-script".">=1.2.0" =
-    self.by-version."coffee-script"."1.9.1";
+    self.by-version."coffee-script"."1.9.2";
   by-spec."coffee-script".">=1.6.2 <2.0.0" =
-    self.by-version."coffee-script"."1.9.1";
+    self.by-version."coffee-script"."1.9.2";
+  by-spec."coffee-script"."^1.9.2" =
+    self.by-version."coffee-script"."1.9.2";
   by-spec."coffee-script"."~1.3.3" =
     self.by-version."coffee-script"."1.3.3";
   by-version."coffee-script"."1.3.3" = self.buildNodePackage {
@@ -6907,40 +7243,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."coffee-script"."~1.8.0" =
-    self.by-version."coffee-script"."1.8.0";
-  by-version."coffee-script"."1.8.0" = self.buildNodePackage {
-    name = "coffee-script-1.8.0";
-    version = "1.8.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz";
-      name = "coffee-script-1.8.0.tgz";
-      sha1 = "9c9f1d2b4a52a000ded15b659791703648263c1d";
-    };
-    deps = {
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."color"."~0.7.3" =
-    self.by-version."color"."0.7.3";
-  by-version."color"."0.7.3" = self.buildNodePackage {
-    name = "color-0.7.3";
-    version = "0.7.3";
+  by-spec."color"."~0.8.0" =
+    self.by-version."color"."0.8.0";
+  by-version."color"."0.8.0" = self.buildNodePackage {
+    name = "color-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/color/-/color-0.7.3.tgz";
-      name = "color-0.7.3.tgz";
-      sha1 = "ab3ae4bc6cb8cfadb5d749c40f34aea088104f89";
+      url = "http://registry.npmjs.org/color/-/color-0.8.0.tgz";
+      name = "color-0.8.0.tgz";
+      sha1 = "890c07c3fd4e649537638911cf691e5458b6fca5";
     };
     deps = {
       "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2";
-      "color-string-0.2.4" = self.by-version."color-string"."0.2.4";
+      "color-string-0.3.0" = self.by-version."color-string"."0.3.0";
     };
     optionalDependencies = {
     };
@@ -6948,7 +7264,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."color-convert"."0.5.x" =
+  by-spec."color-convert"."^0.5.0" =
     self.by-version."color-convert"."0.5.2";
   by-version."color-convert"."0.5.2" = self.buildNodePackage {
     name = "color-convert-0.5.2";
@@ -6967,7 +7283,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."color-name"."1.0.x" =
+  by-spec."color-name"."^1.0.0" =
     self.by-version."color-name"."1.0.0";
   by-version."color-name"."1.0.0" = self.buildNodePackage {
     name = "color-name-1.0.0";
@@ -6986,16 +7302,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."color-string"."0.2.x" =
-    self.by-version."color-string"."0.2.4";
-  by-version."color-string"."0.2.4" = self.buildNodePackage {
-    name = "color-string-0.2.4";
-    version = "0.2.4";
+  by-spec."color-string"."^0.3.0" =
+    self.by-version."color-string"."0.3.0";
+  by-version."color-string"."0.3.0" = self.buildNodePackage {
+    name = "color-string-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/color-string/-/color-string-0.2.4.tgz";
-      name = "color-string-0.2.4.tgz";
-      sha1 = "221ff64234f71aaa3e13bc8c7e8c95f3cdd8f81a";
+      url = "http://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
+      name = "color-string-0.3.0.tgz";
+      sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
     };
     deps = {
       "color-name-1.0.0" = self.by-version."color-name"."1.0.0";
@@ -7090,37 +7406,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."columnify"."~1.2.1" =
-    self.by-version."columnify"."1.2.1";
-  by-version."columnify"."1.2.1" = self.buildNodePackage {
-    name = "columnify-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz";
-      name = "columnify-1.2.1.tgz";
-      sha1 = "921ec51c178f4126d3c07e9acecd67a55c7953e4";
-    };
-    deps = {
-      "strip-ansi-1.0.0" = self.by-version."strip-ansi"."1.0.0";
-      "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."columnify"."~1.4.1" =
-    self.by-version."columnify"."1.4.1";
-  by-version."columnify"."1.4.1" = self.buildNodePackage {
-    name = "columnify-1.4.1";
-    version = "1.4.1";
+  by-spec."columnify"."~1.5.1" =
+    self.by-version."columnify"."1.5.1";
+  by-version."columnify"."1.5.1" = self.buildNodePackage {
+    name = "columnify-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/columnify/-/columnify-1.4.1.tgz";
-      name = "columnify-1.4.1.tgz";
-      sha1 = "30555796379865b016189c228cb0061764270ed0";
+      url = "http://registry.npmjs.org/columnify/-/columnify-1.5.1.tgz";
+      name = "columnify-1.5.1.tgz";
+      sha1 = "15fdda803a3875f87f9d302b3bc828932d664003";
     };
     deps = {
       "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
@@ -7177,17 +7472,18 @@
   by-spec."combined-stream"."~0.0.5" =
     self.by-version."combined-stream"."0.0.7";
   by-spec."commander"."*" =
-    self.by-version."commander"."2.6.0";
-  by-version."commander"."2.6.0" = self.buildNodePackage {
-    name = "commander-2.6.0";
-    version = "2.6.0";
+    self.by-version."commander"."2.8.0";
+  by-version."commander"."2.8.0" = self.buildNodePackage {
+    name = "commander-2.8.0";
+    version = "2.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
-      name = "commander-2.6.0.tgz";
-      sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
+      url = "http://registry.npmjs.org/commander/-/commander-2.8.0.tgz";
+      name = "commander-2.8.0.tgz";
+      sha1 = "117c42659a72338e3364877df20852344095dc11";
     };
     deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -7311,16 +7607,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commander"."2.5.x" =
-    self.by-version."commander"."2.5.1";
-  by-version."commander"."2.5.1" = self.buildNodePackage {
-    name = "commander-2.5.1";
-    version = "2.5.1";
+  by-spec."commander"."2.6.0" =
+    self.by-version."commander"."2.6.0";
+  by-version."commander"."2.6.0" = self.buildNodePackage {
+    name = "commander-2.6.0";
+    version = "2.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz";
-      name = "commander-2.5.1.tgz";
-      sha1 = "23c61f6e47be143cc02e7ad4bb1c47f5cd5a2883";
+      url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
+      name = "commander-2.6.0.tgz";
+      sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
     };
     deps = {
     };
@@ -7330,14 +7626,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commander"."2.6.0" =
-    self.by-version."commander"."2.6.0";
+  by-spec."commander"."2.7.1" =
+    self.by-version."commander"."2.7.1";
+  by-version."commander"."2.7.1" = self.buildNodePackage {
+    name = "commander-2.7.1";
+    version = "2.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.7.1.tgz";
+      name = "commander-2.7.1.tgz";
+      sha1 = "5d419a2bbed2c32ee3e4dca9bb45ab83ecc3065a";
+    };
+    deps = {
+      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."commander"."2.8.x" =
+    self.by-version."commander"."2.8.0";
   by-spec."commander"."2.x" =
-    self.by-version."commander"."2.6.0";
+    self.by-version."commander"."2.8.0";
   by-spec."commander".">=2.0.0" =
-    self.by-version."commander"."2.6.0";
+    self.by-version."commander"."2.8.0";
+  by-spec."commander".">=2.3.0 <3.0.0-0" =
+    self.by-version."commander"."2.8.0";
   by-spec."commander"."^2.6.0" =
-    self.by-version."commander"."2.6.0";
+    self.by-version."commander"."2.8.0";
+  by-spec."commander"."^2.7.1" =
+    self.by-version."commander"."2.8.0";
   by-spec."commander"."~0.6.1" =
     self.by-version."commander"."0.6.1";
   by-spec."commander"."~2.0.0" =
@@ -7346,6 +7666,23 @@
     self.by-version."commander"."2.1.0";
   by-spec."commander"."~2.5.0" =
     self.by-version."commander"."2.5.1";
+  by-version."commander"."2.5.1" = self.buildNodePackage {
+    name = "commander-2.5.1";
+    version = "2.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz";
+      name = "commander-2.5.1.tgz";
+      sha1 = "23c61f6e47be143cc02e7ad4bb1c47f5cd5a2883";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."commander"."~2.6.0" =
     self.by-version."commander"."2.6.0";
   by-spec."commondir"."0.0.1" =
@@ -7368,7 +7705,24 @@
     cpu = [ ];
   };
   by-spec."commondir"."~0.0.1" =
-    self.by-version."commondir"."0.0.1";
+    self.by-version."commondir"."0.0.2";
+  by-version."commondir"."0.0.2" = self.buildNodePackage {
+    name = "commondir-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/commondir/-/commondir-0.0.2.tgz";
+      name = "commondir-0.0.2.tgz";
+      sha1 = "c49c8880c6fe96844bb3525dd2e7314050c389ee";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."commoner"."^0.10.0" =
     self.by-version."commoner"."0.10.1";
   by-version."commoner"."0.10.1" = self.buildNodePackage {
@@ -7384,12 +7738,12 @@
       "q-1.1.2" = self.by-version."q"."1.1.2";
       "recast-0.9.18" = self.by-version."recast"."0.9.18";
       "commander-2.5.1" = self.by-version."commander"."2.5.1";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "glob-4.2.2" = self.by-version."glob"."4.2.2";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "private-0.1.6" = self.by-version."private"."0.1.6";
       "install-0.1.8" = self.by-version."install"."0.1.8";
-      "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
+      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
     };
     optionalDependencies = {
     };
@@ -7411,7 +7765,7 @@
       sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49";
     };
     deps = {
-      "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
+      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -7489,7 +7843,7 @@
     };
     deps = {
       "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
-      "crc32-stream-0.3.2" = self.by-version."crc32-stream"."0.3.2";
+      "crc32-stream-0.3.3" = self.by-version."crc32-stream"."0.3.3";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
     optionalDependencies = {
@@ -7529,7 +7883,7 @@
       sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5";
     };
     deps = {
-      "mime-db-1.7.0" = self.by-version."mime-db"."1.7.0";
+      "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1";
     };
     optionalDependencies = {
     };
@@ -7561,22 +7915,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compression"."~1.1.0" =
-    self.by-version."compression"."1.1.2";
-  by-version."compression"."1.1.2" = self.buildNodePackage {
-    name = "compression-1.1.2";
-    version = "1.1.2";
+  by-spec."compression".">=1.2.0 <2.0.0-0" =
+    self.by-version."compression"."1.4.3";
+  by-version."compression"."1.4.3" = self.buildNodePackage {
+    name = "compression-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compression/-/compression-1.1.2.tgz";
-      name = "compression-1.1.2.tgz";
-      sha1 = "f93fb7fcdb3573ec4c7d5398984caae230e2a8d7";
+      url = "http://registry.npmjs.org/compression/-/compression-1.4.3.tgz";
+      name = "compression-1.4.3.tgz";
+      sha1 = "7161bc0441df629273e5c31dd631b8e41e886b4d";
     };
     deps = {
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
+      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "compressible-2.0.2" = self.by-version."compressible"."2.0.2";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
@@ -7586,24 +7940,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compression"."~1.1.2" =
+  by-spec."compression"."~1.1.0" =
     self.by-version."compression"."1.1.2";
-  by-spec."compression"."~1.4.1" =
-    self.by-version."compression"."1.4.1";
-  by-version."compression"."1.4.1" = self.buildNodePackage {
-    name = "compression-1.4.1";
-    version = "1.4.1";
+  by-version."compression"."1.1.2" = self.buildNodePackage {
+    name = "compression-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compression/-/compression-1.4.1.tgz";
-      name = "compression-1.4.1.tgz";
-      sha1 = "c6f707ac2659e13c7f3e8834321b02cd09338d78";
+      url = "http://registry.npmjs.org/compression/-/compression-1.1.2.tgz";
+      name = "compression-1.1.2.tgz";
+      sha1 = "f93fb7fcdb3573ec4c7d5398984caae230e2a8d7";
     };
     deps = {
-      "accepts-1.2.4" = self.by-version."accepts"."1.2.4";
+      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "compressible-2.0.2" = self.by-version."compressible"."2.0.2";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.0.0" = self.by-version."debug"."2.0.0";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
     };
@@ -7613,6 +7965,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."compression"."~1.1.2" =
+    self.by-version."compression"."1.1.2";
+  by-spec."compression"."~1.4.3" =
+    self.by-version."compression"."1.4.3";
   by-spec."concat-map"."0.0.1" =
     self.by-version."concat-map"."0.0.1";
   by-version."concat-map"."0.0.1" = self.buildNodePackage {
@@ -7633,15 +7989,15 @@
     cpu = [ ];
   };
   by-spec."concat-stream"."*" =
-    self.by-version."concat-stream"."1.4.7";
-  by-version."concat-stream"."1.4.7" = self.buildNodePackage {
-    name = "concat-stream-1.4.7";
-    version = "1.4.7";
+    self.by-version."concat-stream"."1.4.8";
+  by-version."concat-stream"."1.4.8" = self.buildNodePackage {
+    name = "concat-stream-1.4.8";
+    version = "1.4.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.7.tgz";
-      name = "concat-stream-1.4.7.tgz";
-      sha1 = "0ceaa47b87a581d2a7a782b92b81d5020c3f9925";
+      url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.8.tgz";
+      name = "concat-stream-1.4.8.tgz";
+      sha1 = "e8325bb89e55000e52b626d97466fde1a28cfe5d";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -7655,13 +8011,13 @@
     cpu = [ ];
   };
   by-spec."concat-stream"."^1.4.1" =
-    self.by-version."concat-stream"."1.4.7";
+    self.by-version."concat-stream"."1.4.8";
   by-spec."concat-stream"."^1.4.6" =
-    self.by-version."concat-stream"."1.4.7";
+    self.by-version."concat-stream"."1.4.8";
   by-spec."concat-stream"."~1.4.1" =
-    self.by-version."concat-stream"."1.4.7";
+    self.by-version."concat-stream"."1.4.8";
   by-spec."concat-stream"."~1.4.5" =
-    self.by-version."concat-stream"."1.4.7";
+    self.by-version."concat-stream"."1.4.8";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = self.buildNodePackage {
@@ -7675,7 +8031,7 @@
     };
     deps = {
       "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7";
-      "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1";
+      "coffee-script-1.9.2" = self.by-version."coffee-script"."1.9.2";
       "vows-0.8.1" = self.by-version."vows"."0.8.1";
     };
     optionalDependencies = {
@@ -7726,7 +8082,7 @@
   };
   by-spec."config-chain"."~1.1.8" =
     self.by-version."config-chain"."1.1.8";
-  by-spec."configstore"."^0.3.0" =
+  by-spec."configstore"."^0.3.1" =
     self.by-version."configstore"."0.3.2";
   by-version."configstore"."0.3.2" = self.buildNodePackage {
     name = "configstore-0.3.2";
@@ -7738,7 +8094,7 @@
       sha1 = "25e4c16c3768abf75c5a65bc61761f495055b459";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
@@ -7753,7 +8109,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."configstore"."^0.3.1" =
+  by-spec."configstore"."^0.3.2" =
     self.by-version."configstore"."0.3.2";
   by-spec."connect"."1.x" =
     self.by-version."connect"."1.9.2";
@@ -7767,7 +8123,7 @@
       sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807";
     };
     deps = {
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "qs-2.4.1" = self.by-version."qs"."2.4.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
     };
@@ -7798,7 +8154,7 @@
       "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
       "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "methods-0.0.1" = self.by-version."methods"."0.0.1";
       "raw-body-0.0.3" = self.by-version."raw-body"."0.0.3";
       "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
@@ -7900,46 +8256,46 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."connect"."2.29.0" =
-    self.by-version."connect"."2.29.0";
-  by-version."connect"."2.29.0" = self.buildNodePackage {
-    name = "connect-2.29.0";
-    version = "2.29.0";
+  by-spec."connect"."2.29.1" =
+    self.by-version."connect"."2.29.1";
+  by-version."connect"."2.29.1" = self.buildNodePackage {
+    name = "connect-2.29.1";
+    version = "2.29.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.29.0.tgz";
-      name = "connect-2.29.0.tgz";
-      sha1 = "c67514d45cd41c7e3a3eecd8613e2a096151caf8";
+      url = "http://registry.npmjs.org/connect/-/connect-2.29.1.tgz";
+      name = "connect-2.29.1.tgz";
+      sha1 = "e0456742d25ed232b573ce156883dd4e6f208538";
     };
     deps = {
       "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
-      "body-parser-1.12.0" = self.by-version."body-parser"."1.12.0";
+      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "compression-1.4.1" = self.by-version."compression"."1.4.1";
-      "connect-timeout-1.6.0" = self.by-version."connect-timeout"."1.6.0";
+      "compression-1.4.3" = self.by-version."compression"."1.4.3";
+      "connect-timeout-1.6.1" = self.by-version."connect-timeout"."1.6.1";
       "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
       "csurf-1.7.0" = self.by-version."csurf"."1.7.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "errorhandler-1.3.4" = self.by-version."errorhandler"."1.3.4";
-      "express-session-1.10.3" = self.by-version."express-session"."1.10.3";
-      "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "errorhandler-1.3.5" = self.by-version."errorhandler"."1.3.5";
+      "express-session-1.10.4" = self.by-version."express-session"."1.10.4";
+      "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "method-override-2.3.1" = self.by-version."method-override"."2.3.1";
-      "morgan-1.5.1" = self.by-version."morgan"."1.5.1";
+      "method-override-2.3.2" = self.by-version."method-override"."2.3.2";
+      "morgan-1.5.2" = self.by-version."morgan"."1.5.2";
       "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "qs-2.4.1" = self.by-version."qs"."2.4.1";
       "response-time-2.3.0" = self.by-version."response-time"."2.3.0";
       "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
-      "serve-index-1.6.2" = self.by-version."serve-index"."1.6.2";
-      "serve-static-1.9.1" = self.by-version."serve-static"."1.9.1";
-      "type-is-1.6.0" = self.by-version."type-is"."1.6.0";
+      "serve-index-1.6.3" = self.by-version."serve-index"."1.6.3";
+      "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2";
+      "type-is-1.6.1" = self.by-version."type-is"."1.6.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
       "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
@@ -7969,7 +8325,7 @@
       "bytes-0.1.0" = self.by-version."bytes"."0.1.0";
       "send-0.0.3" = self.by-version."send"."0.0.3";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -7998,7 +8354,7 @@
       "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -8027,7 +8383,7 @@
       "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -8059,9 +8415,9 @@
     cpu = [ ];
   };
   by-spec."connect"."^2.14.5" =
-    self.by-version."connect"."2.29.0";
+    self.by-version."connect"."2.29.1";
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.29.0";
+    self.by-version."connect"."2.29.1";
   by-spec."connect"."~2.26.0" =
     self.by-version."connect"."2.26.6";
   by-version."connect"."2.26.6" = self.buildNodePackage {
@@ -8150,15 +8506,15 @@
     cpu = [ ];
   };
   by-spec."connect-jade-static"."*" =
-    self.by-version."connect-jade-static"."0.2.1";
-  by-version."connect-jade-static"."0.2.1" = self.buildNodePackage {
-    name = "connect-jade-static-0.2.1";
-    version = "0.2.1";
+    self.by-version."connect-jade-static"."0.2.2";
+  by-version."connect-jade-static"."0.2.2" = self.buildNodePackage {
+    name = "connect-jade-static-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.2.1.tgz";
-      name = "connect-jade-static-0.2.1.tgz";
-      sha1 = "a4aebd0c4525c3fbd58424e1a09f9a86f4e11a31";
+      url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.2.2.tgz";
+      name = "connect-jade-static-0.2.2.tgz";
+      sha1 = "c1812f6245ee38a6db0e278c4043b53464099f84";
     };
     deps = {
       "jade-1.9.2" = self.by-version."jade"."1.9.2";
@@ -8169,23 +8525,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "connect-jade-static" = self.by-version."connect-jade-static"."0.2.1";
+  "connect-jade-static" = self.by-version."connect-jade-static"."0.2.2";
   by-spec."connect-mongo"."*" =
-    self.by-version."connect-mongo"."0.7.0";
-  by-version."connect-mongo"."0.7.0" = self.buildNodePackage {
-    name = "connect-mongo-0.7.0";
-    version = "0.7.0";
+    self.by-version."connect-mongo"."0.8.0";
+  by-version."connect-mongo"."0.8.0" = self.buildNodePackage {
+    name = "connect-mongo-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.7.0.tgz";
-      name = "connect-mongo-0.7.0.tgz";
-      sha1 = "8870bbebabff6c99aab77c8ad9787abe730b62db";
+      url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.8.0.tgz";
+      name = "connect-mongo-0.8.0.tgz";
+      sha1 = "5775b43a2762e4f39121d4a41a2871c3b42fbd4f";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
-      "mongodb-2.0.16" = self.by-version."mongodb"."2.0.16";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
+      "mongodb-2.0.27" = self.by-version."mongodb"."2.0.27";
     };
     optionalDependencies = {
     };
@@ -8193,9 +8549,9 @@
     os = [ ];
     cpu = [ ];
   };
-  "connect-mongo" = self.by-version."connect-mongo"."0.7.0";
+  "connect-mongo" = self.by-version."connect-mongo"."0.8.0";
   by-spec."connect-mongo".">=0.4.0" =
-    self.by-version."connect-mongo"."0.7.0";
+    self.by-version."connect-mongo"."0.8.0";
   by-spec."connect-multiparty"."^1.2.5" =
     self.by-version."connect-multiparty"."1.2.5";
   by-version."connect-multiparty"."1.2.5" = self.buildNodePackage {
@@ -8220,15 +8576,15 @@
     cpu = [ ];
   };
   by-spec."connect-restreamer"."*" =
-    self.by-version."connect-restreamer"."1.0.1";
-  by-version."connect-restreamer"."1.0.1" = self.buildNodePackage {
-    name = "connect-restreamer-1.0.1";
-    version = "1.0.1";
+    self.by-version."connect-restreamer"."1.0.2";
+  by-version."connect-restreamer"."1.0.2" = self.buildNodePackage {
+    name = "connect-restreamer-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.1.tgz";
-      name = "connect-restreamer-1.0.1.tgz";
-      sha1 = "3eb3093da34094fbfd24720779acdaabb80a4155";
+      url = "http://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.2.tgz";
+      name = "connect-restreamer-1.0.2.tgz";
+      sha1 = "51dcc63860c4320aef1e72b137123f7653bfe397";
     };
     deps = {
     };
@@ -8250,7 +8606,7 @@
       sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -8280,19 +8636,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."connect-timeout"."~1.6.0" =
-    self.by-version."connect-timeout"."1.6.0";
-  by-version."connect-timeout"."1.6.0" = self.buildNodePackage {
-    name = "connect-timeout-1.6.0";
-    version = "1.6.0";
+  by-spec."connect-timeout"."~1.6.1" =
+    self.by-version."connect-timeout"."1.6.1";
+  by-version."connect-timeout"."1.6.1" = self.buildNodePackage {
+    name = "connect-timeout-1.6.1";
+    version = "1.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.0.tgz";
-      name = "connect-timeout-1.6.0.tgz";
-      sha1 = "cd38b4c106d25f4472556f3be98ac4d1c4a8ef3e";
+      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.1.tgz";
+      name = "connect-timeout-1.6.1.tgz";
+      sha1 = "1de3a2b853734820a232080b95742494ba4cd067";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
       "ms-0.7.0" = self.by-version."ms"."0.7.0";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
@@ -8375,7 +8731,7 @@
       sha1 = "0e64747dc836644d3f659247efd95231b48c3e71";
     };
     deps = {
-      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
+      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
     };
     optionalDependencies = {
     };
@@ -8397,7 +8753,7 @@
       sha1 = "1ddf9deac0d14c4367c1d5b3f16fb2763f123108";
     };
     deps = {
-      "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2";
+      "acorn-globals-1.0.4" = self.by-version."acorn-globals"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -8778,6 +9134,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cookie-signature"."^1.0.5" =
+    self.by-version."cookie-signature"."1.0.6";
   by-spec."cookiejar"."2.0.1" =
     self.by-version."cookiejar"."2.0.1";
   by-version."cookiejar"."2.0.1" = self.buildNodePackage {
@@ -8836,19 +9194,21 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cookies".">=0.5.0 <1.0.0-0" =
+    self.by-version."cookies"."0.5.0";
   by-spec."cordova"."*" =
-    self.by-version."cordova"."4.2.0";
-  by-version."cordova"."4.2.0" = self.buildNodePackage {
-    name = "cordova-4.2.0";
-    version = "4.2.0";
+    self.by-version."cordova"."5.0.0";
+  by-version."cordova"."5.0.0" = self.buildNodePackage {
+    name = "cordova-5.0.0";
+    version = "5.0.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cordova/-/cordova-4.2.0.tgz";
-      name = "cordova-4.2.0.tgz";
-      sha1 = "e4519197040b09b1bd131ecebc847716a2a7d7d0";
+      url = "http://registry.npmjs.org/cordova/-/cordova-5.0.0.tgz";
+      name = "cordova-5.0.0.tgz";
+      sha1 = "696907aff7c889beea4422b6c80e57558a905c05";
     };
     deps = {
-      "cordova-lib-4.2.0" = self.by-version."cordova-lib"."4.2.0";
+      "cordova-lib-5.0.0" = self.by-version."cordova-lib"."5.0.0";
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
@@ -8859,22 +9219,41 @@
     os = [ ];
     cpu = [ ];
   };
-  "cordova" = self.by-version."cordova"."4.2.0";
-  by-spec."cordova-js"."3.7.3" =
-    self.by-version."cordova-js"."3.7.3";
-  by-version."cordova-js"."3.7.3" = self.buildNodePackage {
-    name = "cordova-js-3.7.3";
-    version = "3.7.3";
+  "cordova" = self.by-version."cordova"."5.0.0";
+  by-spec."cordova-app-hello-world"."3.9.0" =
+    self.by-version."cordova-app-hello-world"."3.9.0";
+  by-version."cordova-app-hello-world"."3.9.0" = self.buildNodePackage {
+    name = "cordova-app-hello-world-3.9.0";
+    version = "3.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cordova-js/-/cordova-js-3.7.3.tgz";
-      name = "cordova-js-3.7.3.tgz";
-      sha1 = "c7d9bbb7cc2d72183ef64339dc259be6326d0093";
+      url = "http://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz";
+      name = "cordova-app-hello-world-3.9.0.tgz";
+      sha1 = "5866d8fed5582686c68ec59a6d1097c4ec0fcc4b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cordova-js"."3.9.0" =
+    self.by-version."cordova-js"."3.9.0";
+  by-version."cordova-js"."3.9.0" = self.buildNodePackage {
+    name = "cordova-js-3.9.0";
+    version = "3.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cordova-js/-/cordova-js-3.9.0.tgz";
+      name = "cordova-js-3.9.0.tgz";
+      sha1 = "d5e0b7a97e475a6c70a901b49c3ed44637b2b7f2";
     };
     deps = {
       "browserify-7.1.0" = self.by-version."browserify"."7.1.0";
       "through-2.3.4" = self.by-version."through"."2.3.4";
-      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
+      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
     };
     optionalDependencies = {
     };
@@ -8882,24 +9261,29 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cordova-lib"."4.2.0" =
-    self.by-version."cordova-lib"."4.2.0";
-  by-version."cordova-lib"."4.2.0" = self.buildNodePackage {
-    name = "cordova-lib-4.2.0";
-    version = "4.2.0";
+  by-spec."cordova-lib"."5.0.0" =
+    self.by-version."cordova-lib"."5.0.0";
+  by-version."cordova-lib"."5.0.0" = self.buildNodePackage {
+    name = "cordova-lib-5.0.0";
+    version = "5.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cordova-lib/-/cordova-lib-4.2.0.tgz";
-      name = "cordova-lib-4.2.0.tgz";
-      sha1 = "ce4f565ce970bfada900a3161625344e87139e64";
+      url = "http://registry.npmjs.org/cordova-lib/-/cordova-lib-5.0.0.tgz";
+      name = "cordova-lib-5.0.0.tgz";
+      sha1 = "39588131d11b79c92fd1b590549454bea04257c9";
     };
     deps = {
       "bplist-parser-0.0.6" = self.by-version."bplist-parser"."0.0.6";
+      "cordova-app-hello-world-3.9.0" = self.by-version."cordova-app-hello-world"."3.9.0";
+      "cordova-js-3.9.0" = self.by-version."cordova-js"."3.9.0";
+      "cordova-registry-mapper-1.1.0" = self.by-version."cordova-registry-mapper"."1.1.0";
+      "d8-0.4.4" = self.by-version."d8"."0.4.4";
       "dep-graph-1.1.0" = self.by-version."dep-graph"."1.1.0";
       "elementtree-0.1.5" = self.by-version."elementtree"."0.1.5";
       "glob-4.0.6" = self.by-version."glob"."4.0.6";
+      "init-package-json-1.4.1" = self.by-version."init-package-json"."1.4.1";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "npm-1.4.28" = self.by-version."npm"."1.4.28";
+      "npm-1.3.4" = self.by-version."npm"."1.3.4";
       "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16";
       "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
       "plist-1.1.0" = self.by-version."plist"."1.1.0";
@@ -8907,16 +9291,34 @@
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "rc-0.5.2" = self.by-version."rc"."0.5.2";
       "request-2.47.0" = self.by-version."request"."2.47.0";
-      "semver-2.0.11" = self.by-version."semver"."2.0.11";
+      "semver-2.1.0" = self.by-version."semver"."2.1.0";
       "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0";
       "tar-1.0.2" = self.by-version."tar"."1.0.2";
+      "through2-0.6.3" = self.by-version."through2"."0.6.3";
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
-      "xcode-0.6.7" = self.by-version."xcode"."0.6.7";
-      "cordova-js-3.7.3" = self.by-version."cordova-js"."3.7.3";
-      "d8-0.4.4" = self.by-version."d8"."0.4.4";
       "unorm-1.3.3" = self.by-version."unorm"."1.3.3";
       "valid-identifier-0.0.1" = self.by-version."valid-identifier"."0.0.1";
-      "through2-0.6.3" = self.by-version."through2"."0.6.3";
+      "xcode-0.6.7" = self.by-version."xcode"."0.6.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cordova-registry-mapper"."1.x" =
+    self.by-version."cordova-registry-mapper"."1.1.0";
+  by-version."cordova-registry-mapper"."1.1.0" = self.buildNodePackage {
+    name = "cordova-registry-mapper-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.0.tgz";
+      name = "cordova-registry-mapper-1.1.0.tgz";
+      sha1 = "3d4d2283207776960d054d4966a1e31901f0c281";
+    };
+    deps = {
+      "tape-3.5.0" = self.by-version."tape"."3.5.0";
     };
     optionalDependencies = {
     };
@@ -8963,6 +9365,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cors"."^2.4.2" =
+    self.by-version."cors"."2.5.3";
   by-spec."couch-login"."~0.1.15" =
     self.by-version."couch-login"."0.1.20";
   by-version."couch-login"."0.1.20" = self.buildNodePackage {
@@ -8975,7 +9379,7 @@
       sha1 = "007c70ef80089dbae6f59eeeec37480799b39595";
     };
     deps = {
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -8983,6 +9387,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."couch-login"."~0.1.18" =
+    self.by-version."couch-login"."0.1.20";
   by-spec."coveralls"."*" =
     self.by-version."coveralls"."2.11.2";
   by-version."coveralls"."2.11.2" = self.buildNodePackage {
@@ -9065,15 +9471,15 @@
     cpu = [ ];
   };
   by-spec."crc32-stream"."~0.3.1" =
-    self.by-version."crc32-stream"."0.3.2";
-  by-version."crc32-stream"."0.3.2" = self.buildNodePackage {
-    name = "crc32-stream-0.3.2";
-    version = "0.3.2";
+    self.by-version."crc32-stream"."0.3.3";
+  by-version."crc32-stream"."0.3.3" = self.buildNodePackage {
+    name = "crc32-stream-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.2.tgz";
-      name = "crc32-stream-0.3.2.tgz";
-      sha1 = "8c86a5c4ed38c53e36750d662784ad8ec642e38e";
+      url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.3.tgz";
+      name = "crc32-stream-0.3.3.tgz";
+      sha1 = "27cdfad6eec97a139820e3bff2b4aaad82e85e19";
     };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
@@ -9085,16 +9491,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."create-ecdh"."1.0.3" =
-    self.by-version."create-ecdh"."1.0.3";
-  by-version."create-ecdh"."1.0.3" = self.buildNodePackage {
-    name = "create-ecdh-1.0.3";
-    version = "1.0.3";
+  by-spec."create-ecdh"."^2.0.0" =
+    self.by-version."create-ecdh"."2.0.0";
+  by-version."create-ecdh"."2.0.0" = self.buildNodePackage {
+    name = "create-ecdh-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/create-ecdh/-/create-ecdh-1.0.3.tgz";
-      name = "create-ecdh-1.0.3.tgz";
-      sha1 = "ff6fce0d36747adf3a87918b97b93e302541a157";
+      url = "http://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.0.tgz";
+      name = "create-ecdh-2.0.0.tgz";
+      sha1 = "59a11dbd3af8de5acbc8d005b624ccf7136f2a78";
     };
     deps = {
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
@@ -9107,20 +9513,20 @@
     cpu = [ ];
   };
   by-spec."create-hash"."^1.1.0" =
-    self.by-version."create-hash"."1.1.0";
-  by-version."create-hash"."1.1.0" = self.buildNodePackage {
-    name = "create-hash-1.1.0";
-    version = "1.1.0";
+    self.by-version."create-hash"."1.1.1";
+  by-version."create-hash"."1.1.1" = self.buildNodePackage {
+    name = "create-hash-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/create-hash/-/create-hash-1.1.0.tgz";
-      name = "create-hash-1.1.0.tgz";
-      sha1 = "c2ab96b5d4ece5f22df2ef4306803d14da6931e7";
+      url = "http://registry.npmjs.org/create-hash/-/create-hash-1.1.1.tgz";
+      name = "create-hash-1.1.1.tgz";
+      sha1 = "a55424f97b5369bfb2a97e53bd9b7a1aa6dd3a17";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "ripemd160-1.0.0" = self.by-version."ripemd160"."1.0.0";
-      "sha.js-2.3.6" = self.by-version."sha.js"."2.3.6";
+      "sha.js-2.4.0" = self.by-version."sha.js"."2.4.0";
     };
     optionalDependencies = {
     };
@@ -9140,7 +9546,7 @@
       sha1 = "29843e9c191ba412ab001bc55ac8b8b9ae54b670";
     };
     deps = {
-      "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0";
+      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -9172,9 +9578,27 @@
     cpu = [ ];
   };
   by-spec."cron".">=1.0.1" =
-    self.by-version."cron"."1.0.6";
+    self.by-version."cron"."1.0.9";
+  by-version."cron"."1.0.9" = self.buildNodePackage {
+    name = "cron-1.0.9";
+    version = "1.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/cron/-/cron-1.0.9.tgz";
+      name = "cron-1.0.9.tgz";
+      sha1 = "5177cf751f3263f00f45ebf69fead1ea96d31cfc";
+    };
+    deps = {
+      "moment-timezone-0.3.1" = self.by-version."moment-timezone"."0.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cron"."^1.0.4" =
-    self.by-version."cron"."1.0.6";
+    self.by-version."cron"."1.0.9";
   by-spec."crossroads"."~0.12.0" =
     self.by-version."crossroads"."0.12.0";
   by-version."crossroads"."0.12.0" = self.buildNodePackage {
@@ -9195,6 +9619,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."crypt3".">=0.1.5 <1.0.0-0" =
+    self.by-version."crypt3"."0.1.8";
+  by-version."crypt3"."0.1.8" = self.buildNodePackage {
+    name = "crypt3-0.1.8";
+    version = "0.1.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crypt3/-/crypt3-0.1.8.tgz";
+      name = "crypt3-0.1.8.tgz";
+      sha1 = "60f27edeb4ec10703012463e6b974c73a1129688";
+    };
+    deps = {
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."crypt3".">=0.1.6 <1.0.0-0" =
+    self.by-version."crypt3"."0.1.8";
   by-spec."cryptiles"."0.1.x" =
     self.by-version."cryptiles"."0.1.3";
   by-version."cryptiles"."0.1.3" = self.buildNodePackage {
@@ -9247,7 +9693,7 @@
       sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
     };
     deps = {
-      "boom-2.6.1" = self.by-version."boom"."2.6.1";
+      "boom-2.7.1" = self.by-version."boom"."2.7.1";
     };
     optionalDependencies = {
     };
@@ -9274,50 +9720,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."crypto-browserify"."3.3.0" =
-    self.by-version."crypto-browserify"."3.3.0";
-  by-version."crypto-browserify"."3.3.0" = self.buildNodePackage {
-    name = "crypto-browserify-3.3.0";
-    version = "3.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz";
-      name = "crypto-browserify-3.3.0.tgz";
-      sha1 = "b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c";
-    };
-    deps = {
-      "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1";
-      "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0";
-      "sha.js-2.2.6" = self.by-version."sha.js"."2.2.6";
-      "browserify-aes-0.4.0" = self.by-version."browserify-aes"."0.4.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."crypto-browserify"."^3.0.0" =
-    self.by-version."crypto-browserify"."3.9.12";
-  by-version."crypto-browserify"."3.9.12" = self.buildNodePackage {
-    name = "crypto-browserify-3.9.12";
-    version = "3.9.12";
+    self.by-version."crypto-browserify"."3.9.14";
+  by-version."crypto-browserify"."3.9.14" = self.buildNodePackage {
+    name = "crypto-browserify-3.9.14";
+    version = "3.9.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.12.tgz";
-      name = "crypto-browserify-3.9.12.tgz";
-      sha1 = "3ddbfa01bb3e4c6501b3871787916744b3c97175";
+      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.14.tgz";
+      name = "crypto-browserify-3.9.14.tgz";
+      sha1 = "d69925252c845392714aed1460c54b56605314ab";
     };
     deps = {
       "browserify-aes-1.0.0" = self.by-version."browserify-aes"."1.0.0";
-      "browserify-sign-2.8.0" = self.by-version."browserify-sign"."2.8.0";
-      "create-ecdh-1.0.3" = self.by-version."create-ecdh"."1.0.3";
-      "create-hash-1.1.0" = self.by-version."create-hash"."1.1.0";
+      "browserify-sign-3.0.1" = self.by-version."browserify-sign"."3.0.1";
+      "create-ecdh-2.0.0" = self.by-version."create-ecdh"."2.0.0";
+      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
       "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3";
       "diffie-hellman-3.0.1" = self.by-version."diffie-hellman"."3.0.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "pbkdf2-compat-3.0.2" = self.by-version."pbkdf2-compat"."3.0.2";
-      "public-encrypt-1.1.2" = self.by-version."public-encrypt"."1.1.2";
+      "pbkdf2-3.0.4" = self.by-version."pbkdf2"."3.0.4";
+      "public-encrypt-2.0.0" = self.by-version."public-encrypt"."2.0.0";
       "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
     };
     optionalDependencies = {
@@ -9327,7 +9750,7 @@
     cpu = [ ];
   };
   by-spec."crypto-browserify"."^3.2.6" =
-    self.by-version."crypto-browserify"."3.9.12";
+    self.by-version."crypto-browserify"."3.9.14";
   by-spec."crypto-browserify"."~1.0.9" =
     self.by-version."crypto-browserify"."1.0.9";
   by-version."crypto-browserify"."1.0.9" = self.buildNodePackage {
@@ -9347,6 +9770,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."crypto-browserify"."~3.2.6" =
+    self.by-version."crypto-browserify"."3.2.8";
+  by-version."crypto-browserify"."3.2.8" = self.buildNodePackage {
+    name = "crypto-browserify-3.2.8";
+    version = "3.2.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
+      name = "crypto-browserify-3.2.8.tgz";
+      sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
+    };
+    deps = {
+      "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1";
+      "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0";
+      "sha.js-2.2.6" = self.by-version."sha.js"."2.2.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."csrf"."~2.0.5" =
     self.by-version."csrf"."2.0.6";
   by-version."csrf"."2.0.6" = self.buildNodePackage {
@@ -9472,15 +9917,15 @@
   by-spec."cssom"."~0.3.0" =
     self.by-version."cssom"."0.3.0";
   by-spec."cssstyle"."~0.2.9" =
-    self.by-version."cssstyle"."0.2.22";
-  by-version."cssstyle"."0.2.22" = self.buildNodePackage {
-    name = "cssstyle-0.2.22";
-    version = "0.2.22";
+    self.by-version."cssstyle"."0.2.23";
+  by-version."cssstyle"."0.2.23" = self.buildNodePackage {
+    name = "cssstyle-0.2.23";
+    version = "0.2.23";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cssstyle/-/cssstyle-0.2.22.tgz";
-      name = "cssstyle-0.2.22.tgz";
-      sha1 = "a1ce15f5fe15a45d6705be0fbc4f833fe75c4f8d";
+      url = "http://registry.npmjs.org/cssstyle/-/cssstyle-0.2.23.tgz";
+      name = "cssstyle-0.2.23.tgz";
+      sha1 = "34af29a8e9d82ffa031573cbce4309ca27a899f6";
     };
     deps = {
       "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
@@ -9560,16 +10005,77 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ctype"."0.5.0" =
-    self.by-version."ctype"."0.5.0";
-  by-version."ctype"."0.5.0" = self.buildNodePackage {
-    name = "ctype-0.5.0";
-    version = "0.5.0";
+  by-spec."csv"."^0.4.0" =
+    self.by-version."csv"."0.4.1";
+  by-version."csv"."0.4.1" = self.buildNodePackage {
+    name = "csv-0.4.1";
+    version = "0.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/csv/-/csv-0.4.1.tgz";
+      name = "csv-0.4.1.tgz";
+      sha1 = "aa58f059591c98a361a61b287d1c0a394c79160e";
+    };
+    deps = {
+      "csv-generate-0.0.4" = self.by-version."csv-generate"."0.0.4";
+      "csv-parse-0.1.0" = self.by-version."csv-parse"."0.1.0";
+      "stream-transform-0.0.7" = self.by-version."stream-transform"."0.0.7";
+      "csv-stringify-0.0.6" = self.by-version."csv-stringify"."0.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."csv-generate"."*" =
+    self.by-version."csv-generate"."0.0.4";
+  by-version."csv-generate"."0.0.4" = self.buildNodePackage {
+    name = "csv-generate-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.0.tgz";
-      name = "ctype-0.5.0.tgz";
-      sha1 = "672673ec67587eb495c1ed694da1abb964ff65e3";
+      url = "http://registry.npmjs.org/csv-generate/-/csv-generate-0.0.4.tgz";
+      name = "csv-generate-0.0.4.tgz";
+      sha1 = "6d0329b847ba0e12e24b82f4cf949c38c6f84d2f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."csv-parse"."*" =
+    self.by-version."csv-parse"."0.1.0";
+  by-version."csv-parse"."0.1.0" = self.buildNodePackage {
+    name = "csv-parse-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/csv-parse/-/csv-parse-0.1.0.tgz";
+      name = "csv-parse-0.1.0.tgz";
+      sha1 = "da80610577d05b1cfd7cabd0376bb7cdf707aa42";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."csv-stringify"."*" =
+    self.by-version."csv-stringify"."0.0.6";
+  by-version."csv-stringify"."0.0.6" = self.buildNodePackage {
+    name = "csv-stringify-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.6.tgz";
+      name = "csv-stringify-0.0.6.tgz";
+      sha1 = "7cf09e868b1b18a497dac1553420bdabb99b6b62";
     };
     deps = {
     };
@@ -9617,6 +10123,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ctype"."0.5.4" =
+    self.by-version."ctype"."0.5.4";
+  by-version."ctype"."0.5.4" = self.buildNodePackage {
+    name = "ctype-0.5.4";
+    version = "0.5.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.4.tgz";
+      name = "ctype-0.5.4.tgz";
+      sha1 = "5cfffbc266442ce8a1239a5f37091a085b7a3e6e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cycle"."1.0.x" =
     self.by-version."cycle"."1.0.3";
   by-version."cycle"."1.0.3" = self.buildNodePackage {
@@ -9805,7 +10330,7 @@
     };
     deps = {
       "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-      "meow-3.0.0" = self.by-version."meow"."3.0.0";
+      "meow-3.1.0" = self.by-version."meow"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -9855,18 +10380,18 @@
     cpu = [ ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."2.1.1";
-  by-version."debug"."2.1.1" = self.buildNodePackage {
-    name = "debug-2.1.1";
-    version = "2.1.1";
+    self.by-version."debug"."2.1.3";
+  by-version."debug"."2.1.3" = self.buildNodePackage {
+    name = "debug-2.1.3";
+    version = "2.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.1.1.tgz";
-      name = "debug-2.1.1.tgz";
-      sha1 = "e0c548cc607adc22b537540dc3639c4236fdf90c";
+      url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
+      name = "debug-2.1.3.tgz";
+      sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e";
     };
     deps = {
-      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+      "ms-0.7.0" = self.by-version."ms"."0.7.0";
     };
     optionalDependencies = {
     };
@@ -9971,8 +10496,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."debug"."0.8.1" =
-    self.by-version."debug"."0.8.1";
   by-spec."debug"."1.0.2" =
     self.by-version."debug"."1.0.2";
   by-version."debug"."1.0.2" = self.buildNodePackage {
@@ -10013,8 +10536,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."debug"."1.0.4" =
+    self.by-version."debug"."1.0.4";
+  by-version."debug"."1.0.4" = self.buildNodePackage {
+    name = "debug-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+      name = "debug-1.0.4.tgz";
+      sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+    };
+    deps = {
+      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."debug"."2" =
-    self.by-version."debug"."2.1.1";
+    self.by-version."debug"."2.1.3";
   by-spec."debug"."2.0.0" =
     self.by-version."debug"."2.0.0";
   by-version."debug"."2.0.0" = self.buildNodePackage {
@@ -10035,22 +10578,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."debug".">= 0.7.0" =
-    self.by-version."debug"."2.1.1";
-  by-spec."debug".">= 0.7.3 < 1" =
-    self.by-version."debug"."0.8.1";
-  by-spec."debug"."^0.8.1" =
-    self.by-version."debug"."0.8.1";
-  by-spec."debug"."^1.0" =
-    self.by-version."debug"."1.0.4";
-  by-version."debug"."1.0.4" = self.buildNodePackage {
-    name = "debug-1.0.4";
-    version = "1.0.4";
+  by-spec."debug"."2.1.0" =
+    self.by-version."debug"."2.1.0";
+  by-version."debug"."2.1.0" = self.buildNodePackage {
+    name = "debug-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
-      name = "debug-1.0.4.tgz";
-      sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
+      url = "http://registry.npmjs.org/debug/-/debug-2.1.0.tgz";
+      name = "debug-2.1.0.tgz";
+      sha1 = "33ab915659d8c2cc8a41443d94d6ebd37697ed21";
     };
     deps = {
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
@@ -10061,16 +10598,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."debug".">= 0.7.0" =
+    self.by-version."debug"."2.1.3";
+  by-spec."debug".">= 0.7.3 < 1" =
+    self.by-version."debug"."0.8.1";
+  by-spec."debug"."^0.8.1" =
+    self.by-version."debug"."0.8.1";
+  by-spec."debug"."^1.0" =
+    self.by-version."debug"."1.0.4";
   by-spec."debug"."^1.0.0" =
     self.by-version."debug"."1.0.4";
   by-spec."debug"."^1.0.2" =
     self.by-version."debug"."1.0.4";
   by-spec."debug"."^2.0.0" =
-    self.by-version."debug"."2.1.1";
+    self.by-version."debug"."2.1.3";
   by-spec."debug"."^2.1.0" =
-    self.by-version."debug"."2.1.1";
+    self.by-version."debug"."2.1.3";
   by-spec."debug"."^2.1.1" =
-    self.by-version."debug"."2.1.1";
+    self.by-version."debug"."2.1.3";
+  by-spec."debug"."^2.1.3" =
+    self.by-version."debug"."2.1.3";
   by-spec."debug"."~0.7.2" =
     self.by-version."debug"."0.7.4";
   by-spec."debug"."~0.7.4" =
@@ -10086,9 +10633,13 @@
   by-spec."debug"."~2.0.0" =
     self.by-version."debug"."2.0.0";
   by-spec."debug"."~2.1.0" =
-    self.by-version."debug"."2.1.1";
+    self.by-version."debug"."2.1.3";
   by-spec."debug"."~2.1.1" =
-    self.by-version."debug"."2.1.1";
+    self.by-version."debug"."2.1.3";
+  by-spec."debug"."~2.1.2" =
+    self.by-version."debug"."2.1.3";
+  by-spec."debug"."~2.1.3" =
+    self.by-version."debug"."2.1.3";
   by-spec."debuglog"."^1.0.1" =
     self.by-version."debuglog"."1.0.1";
   by-version."debuglog"."1.0.1" = self.buildNodePackage {
@@ -10108,25 +10659,44 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."decompress-zip"."0.0.8" =
-    self.by-version."decompress-zip"."0.0.8";
-  by-version."decompress-zip"."0.0.8" = self.buildNodePackage {
-    name = "decompress-zip-0.0.8";
-    version = "0.0.8";
+  by-spec."decamelize"."^1.0.0" =
+    self.by-version."decamelize"."1.0.0";
+  by-version."decamelize"."1.0.0" = self.buildNodePackage {
+    name = "decamelize-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz";
+      name = "decamelize-1.0.0.tgz";
+      sha1 = "5287122f71691d4505b18ff2258dc400a5b23847";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."decompress-zip"."^0.1.0" =
+    self.by-version."decompress-zip"."0.1.0";
+  by-version."decompress-zip"."0.1.0" = self.buildNodePackage {
+    name = "decompress-zip-0.1.0";
+    version = "0.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz";
-      name = "decompress-zip-0.0.8.tgz";
-      sha1 = "4a265b22c7b209d7b24fa66f2b2dfbced59044f3";
+      url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.1.0.tgz";
+      name = "decompress-zip-0.1.0.tgz";
+      sha1 = "bce60c11664f2d660fca4bcf634af6de5d6c14c7";
     };
     deps = {
-      "q-1.0.1" = self.by-version."q"."1.0.1";
-      "mkpath-0.1.0" = self.by-version."mkpath"."0.1.0";
       "binary-0.3.0" = self.by-version."binary"."0.3.0";
-      "touch-0.0.2" = self.by-version."touch"."0.0.2";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "mkpath-0.1.0" = self.by-version."mkpath"."0.1.0";
+      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
+      "q-1.2.0" = self.by-version."q"."1.2.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "touch-0.0.3" = self.by-version."touch"."0.0.3";
     };
     optionalDependencies = {
     };
@@ -10173,7 +10743,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-equal"."0.0.0" =
+  by-spec."deep-equal"."^0.2.1" =
+    self.by-version."deep-equal"."0.2.2";
+  by-version."deep-equal"."0.2.2" = self.buildNodePackage {
+    name = "deep-equal-0.2.2";
+    version = "0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz";
+      name = "deep-equal-0.2.2.tgz";
+      sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."deep-equal"."^1.0.0" =
+    self.by-version."deep-equal"."1.0.0";
+  by-spec."deep-equal"."~0.0.0" =
     self.by-version."deep-equal"."0.0.0";
   by-version."deep-equal"."0.0.0" = self.buildNodePackage {
     name = "deep-equal-0.0.0";
@@ -10192,10 +10783,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-equal"."^1.0.0" =
-    self.by-version."deep-equal"."1.0.0";
-  by-spec."deep-equal"."~0.0.0" =
-    self.by-version."deep-equal"."0.0.0";
   by-spec."deep-equal"."~0.1.0" =
     self.by-version."deep-equal"."0.1.2";
   by-version."deep-equal"."0.1.2" = self.buildNodePackage {
@@ -10215,25 +10802,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."deep-equal"."~0.2.0" =
+    self.by-version."deep-equal"."0.2.2";
   by-spec."deep-equal"."~0.2.1" =
     self.by-version."deep-equal"."0.2.2";
-  by-version."deep-equal"."0.2.2" = self.buildNodePackage {
-    name = "deep-equal-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz";
-      name = "deep-equal-0.2.2.tgz";
-      sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."deep-extend"."~0.2.5" =
     self.by-version."deep-extend"."0.2.11";
   by-version."deep-extend"."0.2.11" = self.buildNodePackage {
@@ -10253,25 +10825,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-extend"."~0.3.2" =
-    self.by-version."deep-extend"."0.3.2";
-  by-version."deep-extend"."0.3.2" = self.buildNodePackage {
-    name = "deep-extend-0.3.2";
-    version = "0.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.3.2.tgz";
-      name = "deep-extend-0.3.2.tgz";
-      sha1 = "c75dff89f1c639e98438894d156c30b4f87b3a56";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."deep-is"."0.1.x" =
     self.by-version."deep-is"."0.1.3";
   by-version."deep-is"."0.1.3" = self.buildNodePackage {
@@ -10354,15 +10907,15 @@
     cpu = [ ];
   };
   by-spec."defaults"."^1.0.0" =
-    self.by-version."defaults"."1.0.0";
-  by-version."defaults"."1.0.0" = self.buildNodePackage {
-    name = "defaults-1.0.0";
-    version = "1.0.0";
+    self.by-version."defaults"."1.0.2";
+  by-version."defaults"."1.0.2" = self.buildNodePackage {
+    name = "defaults-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/defaults/-/defaults-1.0.0.tgz";
-      name = "defaults-1.0.0.tgz";
-      sha1 = "3ae25f44416c6c01f9809a25fcdd285912d2a6b1";
+      url = "http://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz";
+      name = "defaults-1.0.2.tgz";
+      sha1 = "6902e25aa047649a501e19ef9e98f3e8365c109a";
     };
     deps = {
       "clone-0.1.19" = self.by-version."clone"."0.1.19";
@@ -10373,6 +10926,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."deferred-leveldown"."~0.2.0" =
+    self.by-version."deferred-leveldown"."0.2.0";
+  by-version."deferred-leveldown"."0.2.0" = self.buildNodePackage {
+    name = "deferred-leveldown-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz";
+      name = "deferred-leveldown-0.2.0.tgz";
+      sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
+    };
+    deps = {
+      "abstract-leveldown-0.12.4" = self.by-version."abstract-leveldown"."0.12.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."defined"."0.0.0" =
     self.by-version."defined"."0.0.0";
   by-version."defined"."0.0.0" = self.buildNodePackage {
@@ -10424,15 +10997,15 @@
     cpu = [ ];
   };
   by-spec."degenerator"."~1.0.0" =
-    self.by-version."degenerator"."1.0.0";
-  by-version."degenerator"."1.0.0" = self.buildNodePackage {
-    name = "degenerator-1.0.0";
-    version = "1.0.0";
+    self.by-version."degenerator"."1.0.1";
+  by-version."degenerator"."1.0.1" = self.buildNodePackage {
+    name = "degenerator-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/degenerator/-/degenerator-1.0.0.tgz";
-      name = "degenerator-1.0.0.tgz";
-      sha1 = "9cb6976fa1b860a9f2e913cbf18689113318dd8f";
+      url = "http://registry.npmjs.org/degenerator/-/degenerator-1.0.1.tgz";
+      name = "degenerator-1.0.1.tgz";
+      sha1 = "54a67ae57012ced53b0d51d8dcf7a5d3ee79cf62";
     };
     deps = {
       "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony";
@@ -10561,15 +11134,15 @@
     cpu = [ ];
   };
   by-spec."depd".">= 0.4.0" =
-    self.by-version."depd"."1.0.0";
-  by-version."depd"."1.0.0" = self.buildNodePackage {
-    name = "depd-1.0.0";
-    version = "1.0.0";
+    self.by-version."depd"."1.0.1";
+  by-version."depd"."1.0.1" = self.buildNodePackage {
+    name = "depd-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz";
-      name = "depd-1.0.0.tgz";
-      sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5";
+      url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
+      name = "depd-1.0.1.tgz";
+      sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
     };
     deps = {
     };
@@ -10580,7 +11153,9 @@
     cpu = [ ];
   };
   by-spec."depd"."~1.0.0" =
-    self.by-version."depd"."1.0.0";
+    self.by-version."depd"."1.0.1";
+  by-spec."depd"."~1.0.1" =
+    self.by-version."depd"."1.0.1";
   by-spec."deprecated"."^0.0.1" =
     self.by-version."deprecated"."0.0.1";
   by-version."deprecated"."0.0.1" = self.buildNodePackage {
@@ -10636,7 +11211,7 @@
       sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a";
     };
     deps = {
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
@@ -10837,6 +11412,28 @@
     self.by-version."diff"."1.0.8";
   by-spec."diff"."~1.0.8" =
     self.by-version."diff"."1.0.8";
+  by-spec."diff2html"."~0.1.8" =
+    self.by-version."diff2html"."0.1.9";
+  by-version."diff2html"."0.1.9" = self.buildNodePackage {
+    name = "diff2html-0.1.9";
+    version = "0.1.9";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/diff2html/-/diff2html-0.1.9.tgz";
+      name = "diff2html-0.1.9.tgz";
+      sha1 = "7005815d50da0d0729a6a43f0cfb24bbdf375f88";
+    };
+    deps = {
+      "commander-2.7.1" = self.by-version."commander"."2.7.1";
+      "extend-2.0.0" = self.by-version."extend"."2.0.0";
+      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."diffie-hellman"."^3.0.1" =
     self.by-version."diffie-hellman"."3.0.1";
   by-version."diffie-hellman"."3.0.1" = self.buildNodePackage {
@@ -10966,6 +11563,73 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."docker-parse-image"."^3.0.1" =
+    self.by-version."docker-parse-image"."3.0.1";
+  by-version."docker-parse-image"."3.0.1" = self.buildNodePackage {
+    name = "docker-parse-image-3.0.1";
+    version = "3.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/docker-parse-image/-/docker-parse-image-3.0.1.tgz";
+      name = "docker-parse-image-3.0.1.tgz";
+      sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."docker-registry-server"."*" =
+    self.by-version."docker-registry-server"."2.2.0";
+  by-version."docker-registry-server"."2.2.0" = self.buildNodePackage {
+    name = "docker-registry-server-2.2.0";
+    version = "2.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/docker-registry-server/-/docker-registry-server-2.2.0.tgz";
+      name = "docker-registry-server-2.2.0.tgz";
+      sha1 = "5b98836cd7f0348f7f472f7f5a42dd3cab231731";
+    };
+    deps = {
+      "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
+      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "cors-2.5.3" = self.by-version."cors"."2.5.3";
+      "docker-parse-image-3.0.1" = self.by-version."docker-parse-image"."3.0.1";
+      "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
+      "from2-1.3.0" = self.by-version."from2"."1.3.0";
+      "fs-blob-store-5.1.1" = self.by-version."fs-blob-store"."5.1.1";
+      "level-0.18.0" = self.by-version."level"."0.18.0";
+      "level-sublevel-6.4.6" = self.by-version."level-sublevel"."6.4.6";
+      "leveldown-0.10.4" = self.by-version."leveldown"."0.10.4";
+      "levelup-0.18.6" = self.by-version."levelup"."0.18.6";
+      "lexicographic-integer-1.1.0" = self.by-version."lexicographic-integer"."1.1.0";
+      "memdown-0.10.2" = self.by-version."memdown"."0.10.2";
+      "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "ndjson-1.3.0" = self.by-version."ndjson"."1.3.0";
+      "pump-1.0.0" = self.by-version."pump"."1.0.0";
+      "pumpify-1.3.3" = self.by-version."pumpify"."1.3.3";
+      "relative-date-1.1.2" = self.by-version."relative-date"."1.1.2";
+      "root-2.0.0" = self.by-version."root"."2.0.0";
+      "sorted-union-stream-1.0.2" = self.by-version."sorted-union-stream"."1.0.2";
+      "split2-0.2.1" = self.by-version."split2"."0.2.1";
+      "stream-collector-1.0.1" = self.by-version."stream-collector"."1.0.1";
+      "tar-stream-1.1.4" = self.by-version."tar-stream"."1.1.4";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
+      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "docker-registry-server" = self.by-version."docker-registry-server"."2.2.0";
   by-spec."dom-serializer"."0" =
     self.by-version."dom-serializer"."0.1.0";
   by-version."dom-serializer"."0.1.0" = self.buildNodePackage {
@@ -11030,6 +11694,25 @@
   by-spec."domain-browser"."~1.1.0" =
     self.by-version."domain-browser"."1.1.4";
   by-spec."domelementtype"."1" =
+    self.by-version."domelementtype"."1.3.0";
+  by-version."domelementtype"."1.3.0" = self.buildNodePackage {
+    name = "domelementtype-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
+      name = "domelementtype-1.3.0.tgz";
+      sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domelementtype"."~1.1.1" =
     self.by-version."domelementtype"."1.1.3";
   by-version."domelementtype"."1.1.3" = self.buildNodePackage {
     name = "domelementtype-1.1.3";
@@ -11048,8 +11731,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."domelementtype"."~1.1.1" =
-    self.by-version."domelementtype"."1.1.3";
   by-spec."domhandler"."2.2" =
     self.by-version."domhandler"."2.2.1";
   by-version."domhandler"."2.2.1" = self.buildNodePackage {
@@ -11062,7 +11743,7 @@
       sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2";
     };
     deps = {
-      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -11082,7 +11763,7 @@
       sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
     };
     deps = {
-      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -11121,7 +11802,7 @@
       sha1 = "0865513796c6b306031850e175516baf80b72a6f";
     };
     deps = {
-      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -11142,7 +11823,7 @@
     };
     deps = {
       "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0";
-      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -11190,6 +11871,46 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."dtrace-provider"."^0.3.1" =
+    self.by-version."dtrace-provider"."0.3.2";
+  by-version."dtrace-provider"."0.3.2" = self.buildNodePackage {
+    name = "dtrace-provider-0.3.2";
+    version = "0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.3.2.tgz";
+      name = "dtrace-provider-0.3.2.tgz";
+      sha1 = "794e4df1993d93ec333baed9c1a4d2da72f875b9";
+    };
+    deps = {
+      "nan-1.3.0" = self.by-version."nan"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dtrace-provider"."~0.4" =
+    self.by-version."dtrace-provider"."0.4.0";
+  by-version."dtrace-provider"."0.4.0" = self.buildNodePackage {
+    name = "dtrace-provider-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.4.0.tgz";
+      name = "dtrace-provider-0.4.0.tgz";
+      sha1 = "0b67bc1cc77e79bf88b87ad20664f4a753ce3f26";
+    };
+    deps = {
+      "nan-1.5.3" = self.by-version."nan"."1.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."duplexer"."~0.1.0" =
     self.by-version."duplexer"."0.1.1";
   by-version."duplexer"."0.1.1" = self.buildNodePackage {
@@ -11233,16 +11954,16 @@
   };
   by-spec."duplexer2"."~0.0.2" =
     self.by-version."duplexer2"."0.0.2";
-  by-spec."duplexify"."^3.2.0" =
-    self.by-version."duplexify"."3.2.0";
-  by-version."duplexify"."3.2.0" = self.buildNodePackage {
-    name = "duplexify-3.2.0";
-    version = "3.2.0";
+  by-spec."duplexify"."^3.1.2" =
+    self.by-version."duplexify"."3.3.0";
+  by-version."duplexify"."3.3.0" = self.buildNodePackage {
+    name = "duplexify-3.3.0";
+    version = "3.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/duplexify/-/duplexify-3.2.0.tgz";
-      name = "duplexify-3.2.0.tgz";
-      sha1 = "293974e3cef2e78fbb234e4fd84e20e0ad9d2d60";
+      url = "http://registry.npmjs.org/duplexify/-/duplexify-3.3.0.tgz";
+      name = "duplexify-3.3.0.tgz";
+      sha1 = "f5025c4b1f49f998b7399cd2d008e2895d18d247";
     };
     deps = {
       "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0";
@@ -11254,6 +11975,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."duplexify"."^3.2.0" =
+    self.by-version."duplexify"."3.3.0";
   by-spec."each-async"."^1.1.0" =
     self.by-version."each-async"."1.1.1";
   by-version."each-async"."1.1.1" = self.buildNodePackage {
@@ -11267,7 +11990,7 @@
     };
     deps = {
       "onetime-1.0.0" = self.by-version."onetime"."1.0.0";
-      "set-immediate-shim-1.0.0" = self.by-version."set-immediate-shim"."1.0.0";
+      "set-immediate-shim-1.0.1" = self.by-version."set-immediate-shim"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -11295,6 +12018,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."editor"."0.0.4" =
+    self.by-version."editor"."0.0.4";
+  by-version."editor"."0.0.4" = self.buildNodePackage {
+    name = "editor-0.0.4";
+    version = "0.0.4";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz";
+      name = "editor-0.0.4.tgz";
+      sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."editor"."~0.1.0" =
     self.by-version."editor"."0.1.0";
   by-version."editor"."0.1.0" = self.buildNodePackage {
@@ -11526,9 +12268,9 @@
       sha1 = "41676c594d2786760bbfff0013ca5b865da56627";
     };
     deps = {
-      "meow-3.0.0" = self.by-version."meow"."3.0.0";
+      "meow-3.1.0" = self.by-version."meow"."3.1.0";
       "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1";
-      "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0";
+      "update-notifier-0.3.2" = self.by-version."update-notifier"."0.3.2";
       "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0";
     };
     optionalDependencies = {
@@ -11550,7 +12292,7 @@
       sha1 = "52c65ac15aab467f1338451e2615f988eccc0258";
     };
     deps = {
-      "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
+      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
     };
     optionalDependencies = {
     };
@@ -11618,6 +12360,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."end-of-stream"."^1.1.0" =
+    self.by-version."end-of-stream"."1.1.0";
   by-spec."end-of-stream"."~0.1.5" =
     self.by-version."end-of-stream"."0.1.5";
   by-spec."end-of-stream"."~1.0.0" =
@@ -11645,6 +12389,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."engine.io"."1.5.1" =
+    self.by-version."engine.io"."1.5.1";
+  by-version."engine.io"."1.5.1" = self.buildNodePackage {
+    name = "engine.io-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io/-/engine.io-1.5.1.tgz";
+      name = "engine.io-1.5.1.tgz";
+      sha1 = "8f7a4b2aadf974b71ffd185cffe1e2bdf384ddfb";
+    };
+    deps = {
+      "debug-1.0.3" = self.by-version."debug"."1.0.3";
+      "ws-0.5.0" = self.by-version."ws"."0.5.0";
+      "engine.io-parser-1.2.1" = self.by-version."engine.io-parser"."1.2.1";
+      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."engine.io-client"."1.3.1" =
     self.by-version."engine.io-client"."1.3.1";
   by-version."engine.io-client"."1.3.1" = self.buildNodePackage {
@@ -11675,6 +12442,36 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."engine.io-client"."1.5.1" =
+    self.by-version."engine.io-client"."1.5.1";
+  by-version."engine.io-client"."1.5.1" = self.buildNodePackage {
+    name = "engine.io-client-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.5.1.tgz";
+      name = "engine.io-client-1.5.1.tgz";
+      sha1 = "ecd0026d90b065169b9885960183f3d56b8da18e";
+    };
+    deps = {
+      "has-cors-1.0.3" = self.by-version."has-cors"."1.0.3";
+      "ws-0.4.31" = self.by-version."ws"."0.4.31";
+      "xmlhttprequest-1.5.0" = self.by-version."xmlhttprequest"."1.5.0";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+      "engine.io-parser-1.2.1" = self.by-version."engine.io-parser"."1.2.1";
+      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
+      "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1";
+      "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2";
+      "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."engine.io-parser"."1.0.6" =
     self.by-version."engine.io-parser"."1.0.6";
   by-version."engine.io-parser"."1.0.6" = self.buildNodePackage {
@@ -11699,21 +12496,46 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."engine.io-parser"."1.2.1" =
+    self.by-version."engine.io-parser"."1.2.1";
+  by-version."engine.io-parser"."1.2.1" = self.buildNodePackage {
+    name = "engine.io-parser-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.1.tgz";
+      name = "engine.io-parser-1.2.1.tgz";
+      sha1 = "4462a67d0c70a907c06db2e1de53791a86f5ab37";
+    };
+    deps = {
+      "after-0.8.1" = self.by-version."after"."0.8.1";
+      "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6";
+      "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2";
+      "blob-0.0.2" = self.by-version."blob"."0.0.2";
+      "has-binary-0.1.5" = self.by-version."has-binary"."0.1.5";
+      "utf8-2.0.0" = self.by-version."utf8"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."enhanced-resolve"."~0.8.2" =
-    self.by-version."enhanced-resolve"."0.8.4";
-  by-version."enhanced-resolve"."0.8.4" = self.buildNodePackage {
-    name = "enhanced-resolve-0.8.4";
-    version = "0.8.4";
+    self.by-version."enhanced-resolve"."0.8.5";
+  by-version."enhanced-resolve"."0.8.5" = self.buildNodePackage {
+    name = "enhanced-resolve-0.8.5";
+    version = "0.8.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.8.4.tgz";
-      name = "enhanced-resolve-0.8.4.tgz";
-      sha1 = "4dae8ed556e5312256a9dd317919478e904b5387";
+      url = "http://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.8.5.tgz";
+      name = "enhanced-resolve-0.8.5.tgz";
+      sha1 = "cf0a05c2d186969e1681963e59593ffdd8a4362c";
     };
     deps = {
-      "tapable-0.1.8" = self.by-version."tapable"."0.1.8";
+      "tapable-0.1.9" = self.by-version."tapable"."0.1.9";
       "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
     };
     optionalDependencies = {
     };
@@ -11760,19 +12582,19 @@
     cpu = [ ];
   };
   by-spec."envify"."^3.0.0" =
-    self.by-version."envify"."3.2.0";
-  by-version."envify"."3.2.0" = self.buildNodePackage {
-    name = "envify-3.2.0";
-    version = "3.2.0";
+    self.by-version."envify"."3.4.0";
+  by-version."envify"."3.4.0" = self.buildNodePackage {
+    name = "envify-3.4.0";
+    version = "3.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/envify/-/envify-3.2.0.tgz";
-      name = "envify-3.2.0.tgz";
-      sha1 = "dda33c49ce4cc20efd1fda60dab9dd317c38ef7c";
+      url = "http://registry.npmjs.org/envify/-/envify-3.4.0.tgz";
+      name = "envify-3.4.0.tgz";
+      sha1 = "a0bed52222529076a02fabf6ce00eef42d7b6734";
     };
     deps = {
-      "through-2.3.6" = self.by-version."through"."2.3.6";
-      "jstransform-7.0.0" = self.by-version."jstransform"."7.0.0";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "jstransform-10.1.0" = self.by-version."jstransform"."10.1.0";
     };
     optionalDependencies = {
     };
@@ -11781,15 +12603,15 @@
     cpu = [ ];
   };
   by-spec."errno"."^0.1.1" =
-    self.by-version."errno"."0.1.1";
-  by-version."errno"."0.1.1" = self.buildNodePackage {
-    name = "errno-0.1.1";
-    version = "0.1.1";
+    self.by-version."errno"."0.1.2";
+  by-version."errno"."0.1.2" = self.buildNodePackage {
+    name = "errno-0.1.2";
+    version = "0.1.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errno/-/errno-0.1.1.tgz";
-      name = "errno-0.1.1.tgz";
-      sha1 = "fda4aae52d07f67c741e50a5a50612786f9d0ed3";
+      url = "http://registry.npmjs.org/errno/-/errno-0.1.2.tgz";
+      name = "errno-0.1.2.tgz";
+      sha1 = "ec94dac3794a92cec9e1f08502b165933a805808";
     };
     deps = {
       "prr-0.0.0" = self.by-version."prr"."0.0.0";
@@ -11800,6 +12622,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."errno"."~0.1.1" =
+    self.by-version."errno"."0.1.2";
   by-spec."errorhandler"."1.0.0" =
     self.by-version."errorhandler"."1.0.0";
   by-version."errorhandler"."1.0.0" = self.buildNodePackage {
@@ -11841,18 +12665,18 @@
     cpu = [ ];
   };
   by-spec."errorhandler"."^1.1.1" =
-    self.by-version."errorhandler"."1.3.4";
-  by-version."errorhandler"."1.3.4" = self.buildNodePackage {
-    name = "errorhandler-1.3.4";
-    version = "1.3.4";
+    self.by-version."errorhandler"."1.3.5";
+  by-version."errorhandler"."1.3.5" = self.buildNodePackage {
+    name = "errorhandler-1.3.5";
+    version = "1.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.4.tgz";
-      name = "errorhandler-1.3.4.tgz";
-      sha1 = "65a7e0843dcfd0f4a9647c50c0a6217556e0be0e";
+      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.5.tgz";
+      name = "errorhandler-1.3.5.tgz";
+      sha1 = "4ef655dd2c30e1fc1bf9c24805fa34ba20d4f69a";
     };
     deps = {
-      "accepts-1.2.4" = self.by-version."accepts"."1.2.4";
+      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
     optionalDependencies = {
@@ -11884,8 +12708,27 @@
   };
   by-spec."errorhandler"."~1.2.2" =
     self.by-version."errorhandler"."1.2.4";
-  by-spec."errorhandler"."~1.3.4" =
-    self.by-version."errorhandler"."1.3.4";
+  by-spec."errorhandler"."~1.3.5" =
+    self.by-version."errorhandler"."1.3.5";
+  by-spec."errs"."0.3.x" =
+    self.by-version."errs"."0.3.2";
+  by-version."errs"."0.3.2" = self.buildNodePackage {
+    name = "errs-0.3.2";
+    version = "0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/errs/-/errs-0.3.2.tgz";
+      name = "errs-0.3.2.tgz";
+      sha1 = "798099b2dbd37ca2bc749e538a7c1307d0b50499";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."es5-ext"."~0.10.2" =
     self.by-version."es5-ext"."0.10.6";
   by-version."es5-ext"."0.10.6" = self.buildNodePackage {
@@ -11911,7 +12754,9 @@
     self.by-version."es5-ext"."0.10.6";
   by-spec."es5-ext"."~0.10.5" =
     self.by-version."es5-ext"."0.10.6";
-  by-spec."es6-iterator"."~0.1.1" =
+  by-spec."es5-ext"."~0.10.6" =
+    self.by-version."es5-ext"."0.10.6";
+  by-spec."es6-iterator"."~0.1.3" =
     self.by-version."es6-iterator"."0.1.3";
   by-version."es6-iterator"."0.1.3" = self.buildNodePackage {
     name = "es6-iterator-0.1.3";
@@ -11933,18 +12778,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es6-iterator"."~0.1.3" =
-    self.by-version."es6-iterator"."0.1.3";
-  by-spec."es6-promise"."^1.0.0" =
-    self.by-version."es6-promise"."1.0.0";
-  by-version."es6-promise"."1.0.0" = self.buildNodePackage {
-    name = "es6-promise-1.0.0";
-    version = "1.0.0";
+  by-spec."es6-promise"."^2.0.0" =
+    self.by-version."es6-promise"."2.1.0";
+  by-version."es6-promise"."2.1.0" = self.buildNodePackage {
+    name = "es6-promise-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-promise/-/es6-promise-1.0.0.tgz";
-      name = "es6-promise-1.0.0.tgz";
-      sha1 = "f90d3629faa7c26166ae4df77c89bacdeb8dca7f";
+      url = "http://registry.npmjs.org/es6-promise/-/es6-promise-2.1.0.tgz";
+      name = "es6-promise-2.1.0.tgz";
+      sha1 = "ff979910a05a884c0557edc40e6d9c26fe38167a";
     };
     deps = {
     };
@@ -11954,16 +12797,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es6-shim".">=0.10.0 <1.0.0-0" =
-    self.by-version."es6-shim"."0.25.3";
-  by-version."es6-shim"."0.25.3" = self.buildNodePackage {
-    name = "es6-shim-0.25.3";
-    version = "0.25.3";
+  by-spec."es6-shim"."0.21.x" =
+    self.by-version."es6-shim"."0.21.1";
+  by-version."es6-shim"."0.21.1" = self.buildNodePackage {
+    name = "es6-shim-0.21.1";
+    version = "0.21.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.25.3.tgz";
-      name = "es6-shim-0.25.3.tgz";
-      sha1 = "774d24aa33be5ba9404ba4de1086bf87a6302f66";
+      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz";
+      name = "es6-shim-0.21.1.tgz";
+      sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2";
     };
     deps = {
     };
@@ -11973,16 +12816,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es6-shim"."~0.16.0" =
-    self.by-version."es6-shim"."0.16.0";
-  by-version."es6-shim"."0.16.0" = self.buildNodePackage {
-    name = "es6-shim-0.16.0";
-    version = "0.16.0";
+  by-spec."es6-shim".">=0.10.0 <1.0.0-0" =
+    self.by-version."es6-shim"."0.28.1";
+  by-version."es6-shim"."0.28.1" = self.buildNodePackage {
+    name = "es6-shim-0.28.1";
+    version = "0.28.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.16.0.tgz";
-      name = "es6-shim-0.16.0.tgz";
-      sha1 = "07e122909722d0fce581b17f64d1505c98094454";
+      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.28.1.tgz";
+      name = "es6-shim-0.28.1.tgz";
+      sha1 = "f59d122a42b810c085fa6b0340e365578a5739ea";
     };
     deps = {
     };
@@ -11992,20 +12835,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es6-symbol"."0.1.x" =
-    self.by-version."es6-symbol"."0.1.1";
-  by-version."es6-symbol"."0.1.1" = self.buildNodePackage {
-    name = "es6-symbol-0.1.1";
-    version = "0.1.1";
+  by-spec."es6-shim"."~0.16.0" =
+    self.by-version."es6-shim"."0.16.0";
+  by-version."es6-shim"."0.16.0" = self.buildNodePackage {
+    name = "es6-shim-0.16.0";
+    version = "0.16.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-0.1.1.tgz";
-      name = "es6-symbol-0.1.1.tgz";
-      sha1 = "9cf7fab2edaff1b1da8fe8e68bfe3f5aca6ca218";
+      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.16.0.tgz";
+      name = "es6-shim-0.16.0.tgz";
+      sha1 = "07e122909722d0fce581b17f64d1505c98094454";
     };
     deps = {
-      "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
     };
     optionalDependencies = {
     };
@@ -12035,21 +12876,21 @@
     cpu = [ ];
   };
   by-spec."es6-weak-map"."~0.1.2" =
-    self.by-version."es6-weak-map"."0.1.2";
-  by-version."es6-weak-map"."0.1.2" = self.buildNodePackage {
-    name = "es6-weak-map-0.1.2";
-    version = "0.1.2";
+    self.by-version."es6-weak-map"."0.1.4";
+  by-version."es6-weak-map"."0.1.4" = self.buildNodePackage {
+    name = "es6-weak-map-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.2.tgz";
-      name = "es6-weak-map-0.1.2.tgz";
-      sha1 = "bc5b5fab73f68f6f77a6b39c481fce3d7856d385";
+      url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.4.tgz";
+      name = "es6-weak-map-0.1.4.tgz";
+      sha1 = "706cef9e99aa236ba7766c239c8b9e286ea7d228";
     };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
       "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3";
-      "es6-symbol-0.1.1" = self.by-version."es6-symbol"."0.1.1";
+      "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -12079,6 +12920,25 @@
   "escape-html" = self.by-version."escape-html"."1.0.1";
   by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
+  by-spec."escape-regexp-component"."^1.0.2" =
+    self.by-version."escape-regexp-component"."1.0.2";
+  by-version."escape-regexp-component"."1.0.2" = self.buildNodePackage {
+    name = "escape-regexp-component-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz";
+      name = "escape-regexp-component-1.0.2.tgz";
+      sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."escape-string-applescript"."^1.0.0" =
     self.by-version."escape-string-applescript"."1.0.0";
   by-version."escape-string-applescript"."1.0.0" = self.buildNodePackage {
@@ -12136,6 +12996,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."escape-string-regexp"."^1.0.2" =
+    self.by-version."escape-string-regexp"."1.0.3";
   by-spec."escodegen"."0.0.15" =
     self.by-version."escodegen"."0.0.15";
   by-version."escodegen"."0.0.15" = self.buildNodePackage {
@@ -12148,10 +13010,10 @@
       sha1 = "ffda9cb26b70b34f7cc19f1d88756539afb543bd";
     };
     deps = {
-      "esprima-2.0.0" = self.by-version."esprima"."2.0.0";
+      "esprima-2.2.0" = self.by-version."esprima"."2.2.0";
     };
     optionalDependencies = {
-      "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
+      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
     };
     peerDependencies = [];
     os = [ ];
@@ -12173,27 +13035,28 @@
       "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4";
     };
     optionalDependencies = {
-      "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
+      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."escodegen"."1.3.x" =
-    self.by-version."escodegen"."1.3.3";
-  by-version."escodegen"."1.3.3" = self.buildNodePackage {
-    name = "escodegen-1.3.3";
-    version = "1.3.3";
+  by-spec."escodegen"."1.6.x" =
+    self.by-version."escodegen"."1.6.1";
+  by-version."escodegen"."1.6.1" = self.buildNodePackage {
+    name = "escodegen-1.6.1";
+    version = "1.6.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
-      name = "escodegen-1.3.3.tgz";
-      sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
+      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz";
+      name = "escodegen-1.6.1.tgz";
+      sha1 = "367de17d8510540d12bc6dcb8b3f918391265815";
     };
     deps = {
-      "esutils-1.0.0" = self.by-version."esutils"."1.0.0";
-      "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
-      "esprima-1.1.1" = self.by-version."esprima"."1.1.1";
+      "estraverse-1.9.3" = self.by-version."estraverse"."1.9.3";
+      "esutils-1.1.6" = self.by-version."esutils"."1.1.6";
+      "esprima-1.2.5" = self.by-version."esprima"."1.2.5";
+      "optionator-0.5.0" = self.by-version."optionator"."0.5.0";
     };
     optionalDependencies = {
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
@@ -12204,20 +13067,21 @@
   };
   by-spec."escodegen"."^1.4.1" =
     self.by-version."escodegen"."1.6.1";
-  by-version."escodegen"."1.6.1" = self.buildNodePackage {
-    name = "escodegen-1.6.1";
-    version = "1.6.1";
+  by-spec."escodegen"."~1.3.1" =
+    self.by-version."escodegen"."1.3.3";
+  by-version."escodegen"."1.3.3" = self.buildNodePackage {
+    name = "escodegen-1.3.3";
+    version = "1.3.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz";
-      name = "escodegen-1.6.1.tgz";
-      sha1 = "367de17d8510540d12bc6dcb8b3f918391265815";
+      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+      name = "escodegen-1.3.3.tgz";
+      sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
     };
     deps = {
-      "estraverse-1.9.1" = self.by-version."estraverse"."1.9.1";
-      "esutils-1.1.6" = self.by-version."esutils"."1.1.6";
-      "esprima-1.2.4" = self.by-version."esprima"."1.2.4";
-      "optionator-0.5.0" = self.by-version."optionator"."0.5.0";
+      "esutils-1.0.0" = self.by-version."esutils"."1.0.0";
+      "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
+      "esprima-1.1.1" = self.by-version."esprima"."1.1.1";
     };
     optionalDependencies = {
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
@@ -12226,8 +13090,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."escodegen"."~1.3.1" =
-    self.by-version."escodegen"."1.3.3";
   by-spec."escope"."~0.0.13" =
     self.by-version."escope"."0.0.16";
   by-version."escope"."0.0.16" = self.buildNodePackage {
@@ -12240,7 +13102,7 @@
       sha1 = "418c7a0afca721dafe659193fd986283e746538f";
     };
     deps = {
-      "estraverse-1.9.1" = self.by-version."estraverse"."1.9.1";
+      "estraverse-3.1.0" = self.by-version."estraverse"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -12267,16 +13129,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."1.2.x" =
-    self.by-version."esprima"."1.2.4";
-  by-version."esprima"."1.2.4" = self.buildNodePackage {
-    name = "esprima-1.2.4";
-    version = "1.2.4";
+  by-spec."esprima"."2.1.x" =
+    self.by-version."esprima"."2.1.0";
+  by-version."esprima"."2.1.0" = self.buildNodePackage {
+    name = "esprima-2.1.0";
+    version = "2.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-1.2.4.tgz";
-      name = "esprima-1.2.4.tgz";
-      sha1 = "835a0cfc8a628a7117da654bfaced8408a91dba7";
+      url = "http://registry.npmjs.org/esprima/-/esprima-2.1.0.tgz";
+      name = "esprima-2.1.0.tgz";
+      sha1 = "c1c9fb94975dfcc3fc71c60f074f3c5156a28ef5";
     };
     deps = {
     };
@@ -12286,16 +13148,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."2.0.x" =
-    self.by-version."esprima"."2.0.0";
-  by-version."esprima"."2.0.0" = self.buildNodePackage {
-    name = "esprima-2.0.0";
-    version = "2.0.0";
+  by-spec."esprima".">= 1.0.0" =
+    self.by-version."esprima"."2.2.0";
+  by-version."esprima"."2.2.0" = self.buildNodePackage {
+    name = "esprima-2.2.0";
+    version = "2.2.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz";
-      name = "esprima-2.0.0.tgz";
-      sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f";
+      url = "http://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz";
+      name = "esprima-2.2.0.tgz";
+      sha1 = "4292c1d68e4173d815fa2290dc7afc96d81fcd83";
     };
     deps = {
     };
@@ -12305,18 +13167,33 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima".">= 1.0.0" =
-    self.by-version."esprima"."2.0.0";
   by-spec."esprima"."^1.2.2" =
-    self.by-version."esprima"."1.2.4";
-  by-spec."esprima"."git://github.com/ariya/esprima.git#harmony" =
+    self.by-version."esprima"."1.2.5";
+  by-version."esprima"."1.2.5" = self.buildNodePackage {
+    name = "esprima-1.2.5";
+    version = "1.2.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz";
+      name = "esprima-1.2.5.tgz";
+      sha1 = "0993502feaf668138325756f30f9a51feeec11e9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."esprima"."git+https://github.com/ariya/esprima.git#harmony" =
     self.by-version."esprima"."1.1.0-dev-harmony";
   by-version."esprima"."1.1.0-dev-harmony" = self.buildNodePackage {
     name = "esprima-1.1.0-dev-harmony";
     version = "1.1.0-dev-harmony";
     bin = true;
     src = fetchgit {
-      url = "git://github.com/ariya/esprima.git";
+      url = "https://github.com/ariya/esprima.git";
       rev = "a41a40b49046747b3af57341cda048bbd3d9df79";
       sha256 = "a304effb5bc8e53d0752aeb7e10ab15afd8381ef09056d0fc98d94a43e5c748a";
     };
@@ -12349,6 +13226,23 @@
   };
   by-spec."esprima"."~ 2.0.0" =
     self.by-version."esprima"."2.0.0";
+  by-version."esprima"."2.0.0" = self.buildNodePackage {
+    name = "esprima-2.0.0";
+    version = "2.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz";
+      name = "esprima-2.0.0.tgz";
+      sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."esprima"."~0.9.9" =
     self.by-version."esprima"."0.9.9";
   by-version."esprima"."0.9.9" = self.buildNodePackage {
@@ -12392,17 +13286,17 @@
     cpu = [ ];
   };
   by-spec."esprima"."~1.2.0" =
-    self.by-version."esprima"."1.2.4";
-  by-spec."esprima-fb"."12001.1.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb";
-  by-version."esprima-fb"."12001.1.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-12001.1.0-dev-harmony-fb";
-    version = "12001.1.0-dev-harmony-fb";
+    self.by-version."esprima"."1.2.5";
+  by-spec."esprima-fb"."13001.1001.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb";
+  by-version."esprima-fb"."13001.1001.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-13001.1001.0-dev-harmony-fb";
+    version = "13001.1001.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-12001.1.0-dev-harmony-fb.tgz";
-      sha1 = "d84400384ba95ce2678c617ad24a7f40808da915";
+      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
+      sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
     };
     deps = {
     };
@@ -12450,18 +13344,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima-fb"."~12001.1.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb";
-  by-spec."esprima-fb"."~7001.0001.0000-dev-harmony-fb" =
-    self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb";
-  by-version."esprima-fb"."7001.1.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-7001.1.0-dev-harmony-fb";
-    version = "7001.1.0-dev-harmony-fb";
+  by-spec."esprima-fb"."~13001.1.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."13001.1.0-dev-harmony-fb";
+  by-version."esprima-fb"."13001.1.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-13001.1.0-dev-harmony-fb";
+    version = "13001.1.0-dev-harmony-fb";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-13001.1.0-dev-harmony-fb.tgz";
+      sha1 = "43a4a28f8e01c2e3bb8dfb22fd178474d4d881f5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."esprima-fb"."~14001.1.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."14001.1.0-dev-harmony-fb";
+  by-version."esprima-fb"."14001.1.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-14001.1.0-dev-harmony-fb";
+    version = "14001.1.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-7001.1.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-7001.1.0-dev-harmony-fb.tgz";
-      sha1 = "907e20919575a667dd1b42335de00cf6646d77b3";
+      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-14001.1.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-14001.1.0-dev-harmony-fb.tgz";
+      sha1 = "9f4b99a36f45aa58e11da95c9bc9ccf25a6e958c";
     };
     deps = {
     };
@@ -12534,15 +13445,15 @@
     cpu = [ ];
   };
   by-spec."estraverse".">= 0.0.2" =
-    self.by-version."estraverse"."1.9.1";
-  by-version."estraverse"."1.9.1" = self.buildNodePackage {
-    name = "estraverse-1.9.1";
-    version = "1.9.1";
+    self.by-version."estraverse"."3.1.0";
+  by-version."estraverse"."3.1.0" = self.buildNodePackage {
+    name = "estraverse-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.1.tgz";
-      name = "estraverse-1.9.1.tgz";
-      sha1 = "553a74829ef763ea6153807f86b90ccde5e32231";
+      url = "http://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz";
+      name = "estraverse-3.1.0.tgz";
+      sha1 = "15e28a446b8b82bc700ccc8b96c78af4da0d6cba";
     };
     deps = {
     };
@@ -12553,7 +13464,24 @@
     cpu = [ ];
   };
   by-spec."estraverse"."^1.9.1" =
-    self.by-version."estraverse"."1.9.1";
+    self.by-version."estraverse"."1.9.3";
+  by-version."estraverse"."1.9.3" = self.buildNodePackage {
+    name = "estraverse-1.9.3";
+    version = "1.9.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz";
+      name = "estraverse-1.9.3.tgz";
+      sha1 = "af67f2dc922582415950926091a4005d29c9bb44";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."estraverse"."~0.0.4" =
     self.by-version."estraverse"."0.0.4";
   by-version."estraverse"."0.0.4" = self.buildNodePackage {
@@ -12592,25 +13520,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."estraverse"."~1.8.0" =
-    self.by-version."estraverse"."1.8.0";
-  by-version."estraverse"."1.8.0" = self.buildNodePackage {
-    name = "estraverse-1.8.0";
-    version = "1.8.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz";
-      name = "estraverse-1.8.0.tgz";
-      sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."esutils"."^1.1.6" =
     self.by-version."esutils"."1.1.6";
   by-version."esutils"."1.1.6" = self.buildNodePackage {
@@ -12771,6 +13680,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."eventemitter2"."0.4.x" =
+    self.by-version."eventemitter2"."0.4.14";
   by-spec."eventemitter2"."~0.4.13" =
     self.by-version."eventemitter2"."0.4.14";
   by-spec."eventemitter2"."~0.4.14" =
@@ -12869,12 +13780,12 @@
       "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
       "request-2.9.203" = self.by-version."request"."2.9.203";
       "connect-2.3.9" = self.by-version."connect"."2.3.9";
-      "openid-0.5.9" = self.by-version."openid"."0.5.9";
-      "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
+      "openid-0.5.11" = self.by-version."openid"."0.5.11";
+      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
       "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1";
       "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1";
       "debug-0.5.0" = self.by-version."debug"."0.5.0";
-      "express-3.20.0" = self.by-version."express"."3.20.0";
+      "express-3.20.2" = self.by-version."express"."3.20.2";
     };
     optionalDependencies = {
     };
@@ -12925,6 +13836,88 @@
     self.by-version."exit"."0.1.2";
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
+  by-spec."expand-braces"."~0.1.1" =
+    self.by-version."expand-braces"."0.1.1";
+  by-version."expand-braces"."0.1.1" = self.buildNodePackage {
+    name = "expand-braces-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/expand-braces/-/expand-braces-0.1.1.tgz";
+      name = "expand-braces-0.1.1.tgz";
+      sha1 = "83f2b897a16abebd406abad10949c2e03cae55d4";
+    };
+    deps = {
+      "array-slice-0.2.3" = self.by-version."array-slice"."0.2.3";
+      "array-uniq-1.0.2" = self.by-version."array-uniq"."1.0.2";
+      "braces-0.1.5" = self.by-version."braces"."0.1.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."expand-brackets"."^0.1.1" =
+    self.by-version."expand-brackets"."0.1.1";
+  by-version."expand-brackets"."0.1.1" = self.buildNodePackage {
+    name = "expand-brackets-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.1.tgz";
+      name = "expand-brackets-0.1.1.tgz";
+      sha1 = "e9a1a1a1bbbac19fbf065646fe63fe51f498821f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."expand-range"."^0.1.0" =
+    self.by-version."expand-range"."0.1.1";
+  by-version."expand-range"."0.1.1" = self.buildNodePackage {
+    name = "expand-range-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz";
+      name = "expand-range-0.1.1.tgz";
+      sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044";
+    };
+    deps = {
+      "is-number-0.1.1" = self.by-version."is-number"."0.1.1";
+      "repeat-string-0.2.2" = self.by-version."repeat-string"."0.2.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."expand-range"."^1.8.1" =
+    self.by-version."expand-range"."1.8.1";
+  by-version."expand-range"."1.8.1" = self.buildNodePackage {
+    name = "expand-range-1.8.1";
+    version = "1.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz";
+      name = "expand-range-1.8.1.tgz";
+      sha1 = "acbd63e56efd9139722b755f099b9db5ac1f33f6";
+    };
+    deps = {
+      "fill-range-2.2.2" = self.by-version."fill-range"."2.2.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."express"."*" =
     self.by-version."express"."5.0.0-alpha.1";
   by-version."express"."5.0.0-alpha.1" = self.buildNodePackage {
@@ -12940,8 +13933,8 @@
       "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
       "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2";
@@ -12951,7 +13944,7 @@
       "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
-      "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6";
+      "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7";
       "qs-2.3.2" = self.by-version."qs"."2.3.2";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
       "send-0.10.1" = self.by-version."send"."0.10.1";
@@ -12993,38 +13986,38 @@
     cpu = [ ];
   };
   by-spec."express"."3.*" =
-    self.by-version."express"."3.20.0";
-  by-version."express"."3.20.0" = self.buildNodePackage {
-    name = "express-3.20.0";
-    version = "3.20.0";
+    self.by-version."express"."3.20.2";
+  by-version."express"."3.20.2" = self.buildNodePackage {
+    name = "express-3.20.2";
+    version = "3.20.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.20.0.tgz";
-      name = "express-3.20.0.tgz";
-      sha1 = "9dac561e31a08e7d2852790d86d17c7b70bdd9ac";
+      url = "http://registry.npmjs.org/express/-/express-3.20.2.tgz";
+      name = "express-3.20.2.tgz";
+      sha1 = "c604027746e60f3da0a4b43063375d21c3235858";
     };
     deps = {
       "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "connect-2.29.0" = self.by-version."connect"."2.29.0";
+      "connect-2.29.1" = self.by-version."connect"."2.29.1";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
       "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6";
+      "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.12.1" = self.by-version."send"."0.12.1";
+      "send-0.12.2" = self.by-version."send"."0.12.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
     };
     optionalDependencies = {
     };
@@ -13092,7 +14085,7 @@
       "methods-0.0.1" = self.by-version."methods"."0.0.1";
       "send-0.1.0" = self.by-version."send"."0.1.0";
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -13122,7 +14115,7 @@
       "methods-0.1.0" = self.by-version."methods"."0.1.0";
       "send-0.1.4" = self.by-version."send"."0.1.4";
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -13131,7 +14124,7 @@
     cpu = [ ];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.20.0";
+    self.by-version."express"."3.20.2";
   by-spec."express"."4.6.1" =
     self.by-version."express"."4.6.1";
   by-version."express"."4.6.1" = self.buildNodePackage {
@@ -13174,40 +14167,40 @@
     cpu = [ ];
   };
   by-spec."express".">=3.0.0" =
-    self.by-version."express"."4.12.0";
-  by-version."express"."4.12.0" = self.buildNodePackage {
-    name = "express-4.12.0";
-    version = "4.12.0";
+    self.by-version."express"."4.12.3";
+  by-version."express"."4.12.3" = self.buildNodePackage {
+    name = "express-4.12.3";
+    version = "4.12.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-4.12.0.tgz";
-      name = "express-4.12.0.tgz";
-      sha1 = "739660fce86acbc11ba9c37dc96ff009dc9975e8";
+      url = "http://registry.npmjs.org/express/-/express-4.12.3.tgz";
+      name = "express-4.12.3.tgz";
+      sha1 = "6b9d94aec5ae03270d86d390c277a8c5a5ad0ee2";
     };
     deps = {
-      "accepts-1.2.4" = self.by-version."accepts"."1.2.4";
+      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
       "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
+      "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
-      "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7";
+      "qs-2.4.1" = self.by-version."qs"."2.4.1";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.12.1" = self.by-version."send"."0.12.1";
-      "serve-static-1.9.1" = self.by-version."serve-static"."1.9.1";
-      "type-is-1.6.0" = self.by-version."type-is"."1.6.0";
+      "send-0.12.2" = self.by-version."send"."0.12.2";
+      "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2";
+      "type-is-1.6.1" = self.by-version."type-is"."1.6.1";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
     optionalDependencies = {
@@ -13217,9 +14210,11 @@
     cpu = [ ];
   };
   by-spec."express".">=4.0.0" =
-    self.by-version."express"."4.12.0";
-  by-spec."express"."^4.0" =
-    self.by-version."express"."4.12.0";
+    self.by-version."express"."4.12.3";
+  by-spec."express".">=5.0.0-0 <6.0.0-0" =
+    self.by-version."express"."5.0.0-alpha.1";
+  by-spec."express"."^4.8.0" =
+    self.by-version."express"."4.12.3";
   by-spec."express"."~2.5.11" =
     self.by-version."express"."2.5.11";
   by-spec."express"."~3.1.1" =
@@ -13244,7 +14239,7 @@
       "methods-0.0.1" = self.by-version."methods"."0.0.1";
       "send-0.1.0" = self.by-version."send"."0.1.0";
       "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -13283,49 +14278,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."express"."~4.10.3" =
-    self.by-version."express"."4.10.8";
-  by-version."express"."4.10.8" = self.buildNodePackage {
-    name = "express-4.10.8";
-    version = "4.10.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-4.10.8.tgz";
-      name = "express-4.10.8.tgz";
-      sha1 = "2d83571e065c0efb2679c0a5f9ae66aeaa47024a";
-    };
-    deps = {
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
-      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
-      "proxy-addr-1.0.6" = self.by-version."proxy-addr"."1.0.6";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.10.1" = self.by-version."send"."0.10.1";
-      "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."express"."~4.12.3" =
+    self.by-version."express"."4.12.3";
   by-spec."express-form"."*" =
     self.by-version."express-form"."0.12.4";
   by-version."express-form"."0.12.4" = self.buildNodePackage {
@@ -13345,11 +14299,32 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."express"."4.12.0"];
+      self.by-version."express"."4.12.3"];
     os = [ ];
     cpu = [ ];
   };
   "express-form" = self.by-version."express-form"."0.12.4";
+  by-spec."express-json5".">=0.1.0 <1.0.0-0" =
+    self.by-version."express-json5"."0.1.0";
+  by-version."express-json5"."0.1.0" = self.buildNodePackage {
+    name = "express-json5-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz";
+      name = "express-json5-0.1.0.tgz";
+      sha1 = "114a514bd734b319e018a1bde337923cc455b836";
+    };
+    deps = {
+      "raw-body-1.3.4" = self.by-version."raw-body"."1.3.4";
+      "jju-1.2.0" = self.by-version."jju"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."express-partials"."0.0.6" =
     self.by-version."express-partials"."0.0.6";
   by-version."express-partials"."0.0.6" = self.buildNodePackage {
@@ -13395,22 +14370,22 @@
     cpu = [ ];
   };
   by-spec."express-session"."^1.0.4" =
-    self.by-version."express-session"."1.10.3";
-  by-version."express-session"."1.10.3" = self.buildNodePackage {
-    name = "express-session-1.10.3";
-    version = "1.10.3";
+    self.by-version."express-session"."1.11.1";
+  by-version."express-session"."1.11.1" = self.buildNodePackage {
+    name = "express-session-1.11.1";
+    version = "1.11.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-session/-/express-session-1.10.3.tgz";
-      name = "express-session-1.10.3.tgz";
-      sha1 = "10e09dab2548a0c95d4f1710b89e63016610a268";
+      url = "http://registry.npmjs.org/express-session/-/express-session-1.11.1.tgz";
+      name = "express-session-1.11.1.tgz";
+      sha1 = "607eb9458e9e98c1ab576e3408f5c8d9019fe633";
     };
     deps = {
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
       "crc-3.2.1" = self.by-version."crc"."3.2.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
@@ -13422,28 +14397,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."express-session"."~1.10.3" =
-    self.by-version."express-session"."1.10.3";
-  by-spec."express-session"."~1.8.2" =
-    self.by-version."express-session"."1.8.2";
-  by-version."express-session"."1.8.2" = self.buildNodePackage {
-    name = "express-session-1.8.2";
-    version = "1.8.2";
+  by-spec."express-session"."~1.10.4" =
+    self.by-version."express-session"."1.10.4";
+  by-version."express-session"."1.10.4" = self.buildNodePackage {
+    name = "express-session-1.10.4";
+    version = "1.10.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz";
-      name = "express-session-1.8.2.tgz";
-      sha1 = "c4011e728a2349b3c18f117a5409908985e83483";
+      url = "http://registry.npmjs.org/express-session/-/express-session-1.10.4.tgz";
+      name = "express-session-1.10.4.tgz";
+      sha1 = "04e1d92e00593893e1f76569eb3ad63113daf94c";
     };
     deps = {
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "crc-3.0.0" = self.by-version."crc"."3.0.0";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "depd-0.4.5" = self.by-version."depd"."0.4.5";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "crc-3.2.1" = self.by-version."crc"."3.2.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
+      "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
     optionalDependencies = {
@@ -13452,23 +14425,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."express-session"."~1.9.2" =
-    self.by-version."express-session"."1.9.3";
-  by-version."express-session"."1.9.3" = self.buildNodePackage {
-    name = "express-session-1.9.3";
-    version = "1.9.3";
+  by-spec."express-session"."~1.8.2" =
+    self.by-version."express-session"."1.8.2";
+  by-version."express-session"."1.8.2" = self.buildNodePackage {
+    name = "express-session-1.8.2";
+    version = "1.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz";
-      name = "express-session-1.9.3.tgz";
-      sha1 = "7d2fc387af6fd928775213bfe9d635a5705a84ce";
+      url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz";
+      name = "express-session-1.8.2.tgz";
+      sha1 = "c4011e728a2349b3c18f117a5409908985e83483";
     };
     deps = {
       "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
       "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "crc-3.2.1" = self.by-version."crc"."3.2.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "crc-3.0.0" = self.by-version."crc"."3.0.0";
+      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "depd-0.4.5" = self.by-version."depd"."0.4.5";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
@@ -13500,20 +14473,20 @@
     cpu = [ ];
   };
   "extend" = self.by-version."extend"."2.0.0";
-  by-spec."extend".">=1.1.3" =
+  by-spec."extend"."2.0.0" =
     self.by-version."extend"."2.0.0";
-  by-spec."extend"."^2.0.0" =
+  by-spec."extend".">=1.1.3" =
     self.by-version."extend"."2.0.0";
-  by-spec."extend"."~1.2.1" =
-    self.by-version."extend"."1.2.1";
-  by-version."extend"."1.2.1" = self.buildNodePackage {
-    name = "extend-1.2.1";
-    version = "1.2.1";
+  by-spec."extend"."^1.3.0" =
+    self.by-version."extend"."1.3.0";
+  by-version."extend"."1.3.0" = self.buildNodePackage {
+    name = "extend-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
-      name = "extend-1.2.1.tgz";
-      sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
+      url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
+      name = "extend-1.3.0.tgz";
+      sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
     };
     deps = {
     };
@@ -13523,16 +14496,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."extend"."~1.3.0" =
-    self.by-version."extend"."1.3.0";
-  by-version."extend"."1.3.0" = self.buildNodePackage {
-    name = "extend-1.3.0";
-    version = "1.3.0";
+  by-spec."extend"."^2.0.0" =
+    self.by-version."extend"."2.0.0";
+  by-spec."extend"."~1.2.1" =
+    self.by-version."extend"."1.2.1";
+  by-version."extend"."1.2.1" = self.buildNodePackage {
+    name = "extend-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
-      name = "extend-1.3.0.tgz";
-      sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
+      url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+      name = "extend-1.2.1.tgz";
+      sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
     };
     deps = {
     };
@@ -13542,6 +14517,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."extend"."~2.0.0" =
+    self.by-version."extend"."2.0.0";
   by-spec."extend.js"."0.0.2" =
     self.by-version."extend.js"."0.0.2";
   by-version."extend.js"."0.0.2" = self.buildNodePackage {
@@ -13561,7 +14538,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."extract-opts"."~2.2.0" =
+  by-spec."extract-opts"."^2.2.0" =
     self.by-version."extract-opts"."2.2.0";
   by-version."extract-opts"."2.2.0" = self.buildNodePackage {
     name = "extract-opts-2.2.0";
@@ -13715,7 +14692,7 @@
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "q-1.2.0" = self.by-version."q"."1.2.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19";
     };
     optionalDependencies = {
@@ -13727,18 +14704,18 @@
   by-spec."favitest"."^1.0.7" =
     self.by-version."favitest"."1.0.7";
   by-spec."faye-websocket"."*" =
-    self.by-version."faye-websocket"."0.9.3";
-  by-version."faye-websocket"."0.9.3" = self.buildNodePackage {
-    name = "faye-websocket-0.9.3";
-    version = "0.9.3";
+    self.by-version."faye-websocket"."0.9.4";
+  by-version."faye-websocket"."0.9.4" = self.buildNodePackage {
+    name = "faye-websocket-0.9.4";
+    version = "0.9.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.3.tgz";
-      name = "faye-websocket-0.9.3.tgz";
-      sha1 = "482a505b0df0ae626b969866d3bd740cdb962e83";
+      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz";
+      name = "faye-websocket-0.9.4.tgz";
+      sha1 = "885934c79effb0409549e0c0a3801ed17a40cdad";
     };
     deps = {
-      "websocket-driver-0.5.3" = self.by-version."websocket-driver"."0.5.3";
+      "websocket-driver-0.5.4" = self.by-version."websocket-driver"."0.5.4";
     };
     optionalDependencies = {
     };
@@ -13746,11 +14723,11 @@
     os = [ ];
     cpu = [ ];
   };
-  "faye-websocket" = self.by-version."faye-websocket"."0.9.3";
+  "faye-websocket" = self.by-version."faye-websocket"."0.9.4";
   by-spec."faye-websocket".">= 0.4.1" =
-    self.by-version."faye-websocket"."0.9.3";
-  by-spec."faye-websocket"."^0.7.3 || ^0.8.0 || ^0.9.0" =
-    self.by-version."faye-websocket"."0.9.3";
+    self.by-version."faye-websocket"."0.9.4";
+  by-spec."faye-websocket"."^0.9.3" =
+    self.by-version."faye-websocket"."0.9.4";
   by-spec."faye-websocket"."~0.7.0" =
     self.by-version."faye-websocket"."0.7.3";
   by-version."faye-websocket"."0.7.3" = self.buildNodePackage {
@@ -13763,7 +14740,7 @@
       sha1 = "cc4074c7f4a4dfd03af54dd65c354b135132ce11";
     };
     deps = {
-      "websocket-driver-0.5.3" = self.by-version."websocket-driver"."0.5.3";
+      "websocket-driver-0.5.4" = self.by-version."websocket-driver"."0.5.4";
     };
     optionalDependencies = {
     };
@@ -13817,7 +14794,28 @@
     cpu = [ ];
   };
   by-spec."feedparser".">=0.16.2" =
-    self.by-version."feedparser"."0.19.2";
+    self.by-version."feedparser"."1.0.1";
+  by-version."feedparser"."1.0.1" = self.buildNodePackage {
+    name = "feedparser-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/feedparser/-/feedparser-1.0.1.tgz";
+      name = "feedparser-1.0.1.tgz";
+      sha1 = "9db66f6d94072c427cecdb18a9c884a95c7c658e";
+    };
+    deps = {
+      "sax-0.6.1" = self.by-version."sax"."0.6.1";
+      "addressparser-0.1.3" = self.by-version."addressparser"."0.1.3";
+      "array-indexofobject-0.0.1" = self.by-version."array-indexofobject"."0.0.1";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."fetch-bower"."*" =
     self.by-version."fetch-bower"."2.0.0";
   by-version."fetch-bower"."2.0.0" = self.buildNodePackage {
@@ -13832,7 +14830,7 @@
     deps = {
       "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1";
       "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1";
-      "bower-1.3.12" = self.by-version."bower"."1.3.12";
+      "bower-1.4.1" = self.by-version."bower"."1.4.1";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
     };
     optionalDependencies = {
@@ -13844,7 +14842,7 @@
   "fetch-bower" = self.by-version."fetch-bower"."2.0.0";
   by-spec."fetch-bower".">=2 <3" =
     self.by-version."fetch-bower"."2.0.0";
-  by-spec."fields"."~0.1.11" =
+  by-spec."fields"."~0.1.22" =
     self.by-version."fields"."0.1.23";
   by-version."fields"."0.1.23" = self.buildNodePackage {
     name = "fields-0.1.23";
@@ -13906,6 +14904,8 @@
   };
   by-spec."figures"."^1.3.2" =
     self.by-version."figures"."1.3.5";
+  by-spec."figures"."^1.3.5" =
+    self.by-version."figures"."1.3.5";
   by-spec."file-uri-to-path"."0" =
     self.by-version."file-uri-to-path"."0.0.2";
   by-version."file-uri-to-path"."0.0.2" = self.buildNodePackage {
@@ -13925,6 +14925,45 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."filed"."0.1.x" =
+    self.by-version."filed"."0.1.0";
+  by-version."filed"."0.1.0" = self.buildNodePackage {
+    name = "filed-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/filed/-/filed-0.1.0.tgz";
+      name = "filed-0.1.0.tgz";
+      sha1 = "b0f626472a2366dc1194537a4eea7e7a89f3c735";
+    };
+    deps = {
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."filename-regex"."^2.0.0" =
+    self.by-version."filename-regex"."2.0.0";
+  by-version."filename-regex"."2.0.0" = self.buildNodePackage {
+    name = "filename-regex-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz";
+      name = "filename-regex-2.0.0.tgz";
+      sha1 = "996e3e80479b98b9897f15a8a58b3d084e926775";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."fileset"."0.1.x" =
     self.by-version."fileset"."0.1.5";
   by-version."fileset"."0.1.5" = self.buildNodePackage {
@@ -13946,6 +14985,30 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."fill-range"."^2.1.0" =
+    self.by-version."fill-range"."2.2.2";
+  by-version."fill-range"."2.2.2" = self.buildNodePackage {
+    name = "fill-range-2.2.2";
+    version = "2.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fill-range/-/fill-range-2.2.2.tgz";
+      name = "fill-range-2.2.2.tgz";
+      sha1 = "2ad9d158a6a666f9fb8c9f9f05345dff68d45760";
+    };
+    deps = {
+      "is-number-1.1.2" = self.by-version."is-number"."1.1.2";
+      "isobject-1.0.0" = self.by-version."isobject"."1.0.0";
+      "randomatic-1.1.0" = self.by-version."randomatic"."1.1.0";
+      "repeat-element-1.1.0" = self.by-version."repeat-element"."1.1.0";
+      "repeat-string-1.5.2" = self.by-version."repeat-string"."1.5.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."finalhandler"."0.0.2" =
     self.by-version."finalhandler"."0.0.2";
   by-version."finalhandler"."0.0.2" = self.buildNodePackage {
@@ -14021,7 +15084,7 @@
       sha1 = "7b389b0fd3647a6f90bd564e22624bf8a4a77fb5";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
     };
@@ -14031,19 +15094,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."finalhandler"."0.3.3" =
-    self.by-version."finalhandler"."0.3.3";
-  by-version."finalhandler"."0.3.3" = self.buildNodePackage {
-    name = "finalhandler-0.3.3";
-    version = "0.3.3";
+  by-spec."finalhandler"."0.3.4" =
+    self.by-version."finalhandler"."0.3.4";
+  by-version."finalhandler"."0.3.4" = self.buildNodePackage {
+    name = "finalhandler-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz";
-      name = "finalhandler-0.3.3.tgz";
-      sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426";
+      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.4.tgz";
+      name = "finalhandler-0.3.4.tgz";
+      sha1 = "4787d3573d079ae8b07536f26b0b911ebaf2a2ac";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
     };
@@ -14220,6 +15283,25 @@
   "flatiron" = self.by-version."flatiron"."0.4.3";
   by-spec."flatiron"."~0.4.2" =
     self.by-version."flatiron"."0.4.3";
+  by-spec."flatten"."0.0.1" =
+    self.by-version."flatten"."0.0.1";
+  by-version."flatten"."0.0.1" = self.buildNodePackage {
+    name = "flatten-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz";
+      name = "flatten-0.0.1.tgz";
+      sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."flickrapi".">=0.3.12" =
     self.by-version."flickrapi"."0.3.28";
   by-version."flickrapi"."0.3.28" = self.buildNodePackage {
@@ -14265,6 +15347,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."flushwritable"."^1.0.0" =
+    self.by-version."flushwritable"."1.0.0";
+  by-version."flushwritable"."1.0.0" = self.buildNodePackage {
+    name = "flushwritable-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/flushwritable/-/flushwritable-1.0.0.tgz";
+      name = "flushwritable-1.0.0.tgz";
+      sha1 = "3e328d8fde412ad47e738e3be750b4d290043498";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."follow-redirects"."0.0.3" =
     self.by-version."follow-redirects"."0.0.3";
   by-version."follow-redirects"."0.0.3" = self.buildNodePackage {
@@ -14277,7 +15378,46 @@
       sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
     };
     deps = {
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."for-in"."^0.1.4" =
+    self.by-version."for-in"."0.1.4";
+  by-version."for-in"."0.1.4" = self.buildNodePackage {
+    name = "for-in-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz";
+      name = "for-in-0.1.4.tgz";
+      sha1 = "9f5cf7b4ffc7e1ae6591a4e97b177aa59d70fb2e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."for-own"."^0.1.1" =
+    self.by-version."for-own"."0.1.3";
+  by-version."for-own"."0.1.3" = self.buildNodePackage {
+    name = "for-own-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz";
+      name = "for-own-0.1.3.tgz";
+      sha1 = "606444cde77c2f0a11088169e2e354eaf56e74fe";
+    };
+    deps = {
+      "for-in-0.1.4" = self.by-version."for-in"."0.1.4";
     };
     optionalDependencies = {
     };
@@ -14372,6 +15512,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."forever-agent"."~0.6.0" =
+    self.by-version."forever-agent"."0.6.1";
+  by-version."forever-agent"."0.6.1" = self.buildNodePackage {
+    name = "forever-agent-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+      name = "forever-agent-0.6.1.tgz";
+      sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."forever-monitor"."*" =
     self.by-version."forever-monitor"."1.5.2";
   by-version."forever-monitor"."1.5.2" = self.buildNodePackage {
@@ -14397,24 +15556,25 @@
     cpu = [ ];
   };
   "forever-monitor" = self.by-version."forever-monitor"."1.5.2";
-  by-spec."forever-monitor"."1.1.0" =
-    self.by-version."forever-monitor"."1.1.0";
-  by-version."forever-monitor"."1.1.0" = self.buildNodePackage {
-    name = "forever-monitor-1.1.0";
-    version = "1.1.0";
+  by-spec."forever-monitor"."~1.5.1" =
+    self.by-version."forever-monitor"."1.5.2";
+  by-spec."forever-monitor"."~1.5.2" =
+    self.by-version."forever-monitor"."1.5.2";
+  by-spec."form-data"."0.0.8" =
+    self.by-version."form-data"."0.0.8";
+  by-version."form-data"."0.0.8" = self.buildNodePackage {
+    name = "form-data-0.0.8";
+    version = "0.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
-      name = "forever-monitor-1.1.0.tgz";
-      sha1 = "439ce036f999601cff551aea7f5151001a869ef9";
+      url = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz";
+      name = "form-data-0.0.8.tgz";
+      sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5";
     };
     deps = {
-      "broadway-0.2.10" = self.by-version."broadway"."0.2.10";
-      "minimatch-0.0.5" = self.by-version."minimatch"."0.0.5";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
-      "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
-      "watch-0.5.1" = self.by-version."watch"."0.5.1";
-      "utile-0.1.7" = self.by-version."utile"."0.1.7";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "async-0.2.10" = self.by-version."async"."0.2.10";
     };
     optionalDependencies = {
     };
@@ -14422,8 +15582,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."forever-monitor"."~1.5.1" =
-    self.by-version."forever-monitor"."1.5.2";
   by-spec."form-data"."0.1.3" =
     self.by-version."form-data"."0.1.3";
   by-version."form-data"."0.1.3" = self.buildNodePackage {
@@ -14460,7 +15618,7 @@
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
     };
     optionalDependencies = {
     };
@@ -14555,25 +15713,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."formidable"."1.0.13" =
-    self.by-version."formidable"."1.0.13";
-  by-version."formidable"."1.0.13" = self.buildNodePackage {
-    name = "formidable-1.0.13";
-    version = "1.0.13";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.13.tgz";
-      name = "formidable-1.0.13.tgz";
-      sha1 = "70caf0f9d69692a77e04021ddab4f46b01c82aea";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."formidable"."1.0.14" =
     self.by-version."formidable"."1.0.14";
   by-version."formidable"."1.0.14" = self.buildNodePackage {
@@ -14612,6 +15751,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."formidable"."^1.0.14" =
+    self.by-version."formidable"."1.0.17";
   by-spec."forwarded"."~0.1.0" =
     self.by-version."forwarded"."0.1.0";
   by-version."forwarded"."0.1.0" = self.buildNodePackage {
@@ -14709,6 +15850,72 @@
   };
   by-spec."fresh"."~0.2.1" =
     self.by-version."fresh"."0.2.4";
+  by-spec."from2"."^1.1.0" =
+    self.by-version."from2"."1.3.0";
+  by-version."from2"."1.3.0" = self.buildNodePackage {
+    name = "from2-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/from2/-/from2-1.3.0.tgz";
+      name = "from2-1.3.0.tgz";
+      sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fs-blob-store"."^5.0.0" =
+    self.by-version."fs-blob-store"."5.1.1";
+  by-version."fs-blob-store"."5.1.1" = self.buildNodePackage {
+    name = "fs-blob-store-5.1.1";
+    version = "5.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-blob-store/-/fs-blob-store-5.1.1.tgz";
+      name = "fs-blob-store-5.1.1.tgz";
+      sha1 = "970f2df170d0f21313c932f817b8cb0660c42137";
+    };
+    deps = {
+      "duplexify-3.3.0" = self.by-version."duplexify"."3.3.0";
+      "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fs-ext"."*" =
+    self.by-version."fs-ext"."0.4.4";
+  by-version."fs-ext"."0.4.4" = self.buildNodePackage {
+    name = "fs-ext-0.4.4";
+    version = "0.4.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-ext/-/fs-ext-0.4.4.tgz";
+      name = "fs-ext-0.4.4.tgz";
+      sha1 = "406dc3ff81c0db69a63e11b6755916256407bb30";
+    };
+    deps = {
+      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fs-ext".">=0.4.1 <1.0.0-0" =
+    self.by-version."fs-ext"."0.4.4";
   by-spec."fs-extended"."^0.2.0" =
     self.by-version."fs-extended"."0.2.0";
   by-version."fs-extended"."0.2.0" = self.buildNodePackage {
@@ -14740,9 +15947,31 @@
       sha1 = "4a5663cc51582546625a1bce04f09a1f5ceec35b";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fs-extra"."^0.18.0" =
+    self.by-version."fs-extra"."0.18.2";
+  by-version."fs-extra"."0.18.2" = self.buildNodePackage {
+    name = "fs-extra-0.18.2";
+    version = "0.18.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.18.2.tgz";
+      name = "fs-extra-0.18.2.tgz";
+      sha1 = "af05ca702b0b6dfa7de803a1f7ab479ec5c21525";
+    };
+    deps = {
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -14750,10 +15979,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-extra"."^0.16.0" =
-    self.by-version."fs-extra"."0.16.3";
   by-spec."fs-extra"."~0.16.0" =
-    self.by-version."fs-extra"."0.16.3";
+    self.by-version."fs-extra"."0.16.5";
+  by-version."fs-extra"."0.16.5" = self.buildNodePackage {
+    name = "fs-extra-0.16.5";
+    version = "0.16.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.5.tgz";
+      name = "fs-extra-0.16.5.tgz";
+      sha1 = "1ad661fa6c86c9608cd1b49efc6fce834939a750";
+    };
+    deps = {
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."fs-extra"."~0.6.1" =
     self.by-version."fs-extra"."0.6.4";
   by-version."fs-extra"."0.6.4" = self.buildNodePackage {
@@ -14812,9 +16059,9 @@
       sha1 = "a5cbaa844b4b3a7cff139f3cc90e7f7007e5fbb8";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -14855,7 +16102,7 @@
       sha1 = "fe0c6cec75256072b2fef8180d97e309fe3f5efb";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
     };
     optionalDependencies = {
     };
@@ -14928,24 +16175,22 @@
     os = [ "darwin" ];
     cpu = [ ];
   };
-  by-spec."fsevents"."~0.3.1" =
-    self.by-version."fsevents"."0.3.5";
-  by-spec."fstream"."^1.0.0" =
-    self.by-version."fstream"."1.0.4";
-  by-version."fstream"."1.0.4" = self.buildNodePackage {
-    name = "fstream-1.0.4";
-    version = "1.0.4";
+  by-spec."fstream"."0" =
+    self.by-version."fstream"."0.1.31";
+  by-version."fstream"."0.1.31" = self.buildNodePackage {
+    name = "fstream-0.1.31";
+    version = "0.1.31";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz";
-      name = "fstream-1.0.4.tgz";
-      sha1 = "6c52298473fd6351fd22fc4bf9254fcfebe80f2b";
+      url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+      name = "fstream-0.1.31.tgz";
+      sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -14953,24 +16198,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fstream"."^1.0.2" =
+  by-spec."fstream"."^1.0.0" =
     self.by-version."fstream"."1.0.4";
-  by-spec."fstream"."~0.1.17" =
-    self.by-version."fstream"."0.1.31";
-  by-version."fstream"."0.1.31" = self.buildNodePackage {
-    name = "fstream-0.1.31";
-    version = "0.1.31";
+  by-version."fstream"."1.0.4" = self.buildNodePackage {
+    name = "fstream-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
-      name = "fstream-0.1.31.tgz";
-      sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
+      url = "http://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz";
+      name = "fstream-1.0.4.tgz";
+      sha1 = "6c52298473fd6351fd22fc4bf9254fcfebe80f2b";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -14978,14 +16221,20 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."fstream"."^1.0.2" =
+    self.by-version."fstream"."1.0.4";
+  by-spec."fstream"."^1.0.3" =
+    self.by-version."fstream"."1.0.4";
+  by-spec."fstream"."~0.1.17" =
+    self.by-version."fstream"."0.1.31";
   by-spec."fstream"."~0.1.22" =
     self.by-version."fstream"."0.1.31";
+  by-spec."fstream"."~0.1.23" =
+    self.by-version."fstream"."0.1.31";
   by-spec."fstream"."~0.1.28" =
     self.by-version."fstream"."0.1.31";
   by-spec."fstream"."~0.1.8" =
     self.by-version."fstream"."0.1.31";
-  by-spec."fstream"."~1.0.2" =
-    self.by-version."fstream"."1.0.4";
   by-spec."fstream"."~1.0.4" =
     self.by-version."fstream"."1.0.4";
   by-spec."fstream-ignore"."0.0.7" =
@@ -15024,7 +16273,7 @@
     deps = {
       "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
     };
     optionalDependencies = {
     };
@@ -15032,18 +16281,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fstream-ignore"."~1.0.1" =
+  by-spec."fstream-ignore"."^1.0.2" =
     self.by-version."fstream-ignore"."1.0.2";
-  by-spec."fstream-npm"."~1.0.0" =
-    self.by-version."fstream-npm"."1.0.1";
-  by-version."fstream-npm"."1.0.1" = self.buildNodePackage {
-    name = "fstream-npm-1.0.1";
-    version = "1.0.1";
+  by-spec."fstream-npm"."~0.1.3" =
+    self.by-version."fstream-npm"."0.1.8";
+  by-version."fstream-npm"."0.1.8" = self.buildNodePackage {
+    name = "fstream-npm-0.1.8";
+    version = "0.1.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.8.tgz";
+      name = "fstream-npm-0.1.8.tgz";
+      sha1 = "38a70fdeb510a443e1a5378d90413403fc724fa8";
+    };
+    deps = {
+      "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fstream-npm"."~1.0.2" =
+    self.by-version."fstream-npm"."1.0.2";
+  by-version."fstream-npm"."1.0.2" = self.buildNodePackage {
+    name = "fstream-npm-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.1.tgz";
-      name = "fstream-npm-1.0.1.tgz";
-      sha1 = "1e35c77f0fa24f5d6367e6d447ae7d6ddb482db2";
+      url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.2.tgz";
+      name = "fstream-npm-1.0.2.tgz";
+      sha1 = "a1d2a4ce6ac2db731f0f66a85b4dddfea9565d77";
     };
     deps = {
       "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
@@ -15055,18 +16325,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fstream-npm"."~1.0.1" =
-    self.by-version."fstream-npm"."1.0.1";
   by-spec."ftp"."~0.3.5" =
-    self.by-version."ftp"."0.3.8";
-  by-version."ftp"."0.3.8" = self.buildNodePackage {
-    name = "ftp-0.3.8";
-    version = "0.3.8";
+    self.by-version."ftp"."0.3.10";
+  by-version."ftp"."0.3.10" = self.buildNodePackage {
+    name = "ftp-0.3.10";
+    version = "0.3.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ftp/-/ftp-0.3.8.tgz";
-      name = "ftp-0.3.8.tgz";
-      sha1 = "d9764f8bb3eeffa3319429b88ecc4b8e75396632";
+      url = "http://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz";
+      name = "ftp-0.3.10.tgz";
+      sha1 = "9197d861ad8142f3e63d5a83bfe4c59f7330885d";
     };
     deps = {
       "xregexp-2.0.0" = self.by-version."xregexp"."2.0.0";
@@ -15078,19 +16346,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."gapitoken"."~0.1.2" =
-    self.by-version."gapitoken"."0.1.3";
-  by-version."gapitoken"."0.1.3" = self.buildNodePackage {
-    name = "gapitoken-0.1.3";
-    version = "0.1.3";
+  by-spec."gapitoken"."^0.1.3" =
+    self.by-version."gapitoken"."0.1.4";
+  by-version."gapitoken"."0.1.4" = self.buildNodePackage {
+    name = "gapitoken-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.3.tgz";
-      name = "gapitoken-0.1.3.tgz";
-      sha1 = "b873f1172603d043f930a71a0a4846330f385b41";
+      url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.4.tgz";
+      name = "gapitoken-0.1.4.tgz";
+      sha1 = "643dedb26cb142466f62b73d2782e7822a6f1ad8";
     };
     deps = {
       "jws-0.0.2" = self.by-version."jws"."0.0.2";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -15098,6 +16367,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."gapitoken"."~0.1.2" =
+    self.by-version."gapitoken"."0.1.4";
   by-spec."gauge"."~1.1.0" =
     self.by-version."gauge"."1.1.0";
   by-version."gauge"."1.1.0" = self.buildNodePackage {
@@ -15112,9 +16383,33 @@
     deps = {
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
       "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0";
-      "lodash.pad-3.0.0" = self.by-version."lodash.pad"."3.0.0";
-      "lodash.padleft-3.0.0" = self.by-version."lodash.padleft"."3.0.0";
-      "lodash.padright-3.0.0" = self.by-version."lodash.padright"."3.0.0";
+      "lodash.pad-3.1.0" = self.by-version."lodash.pad"."3.1.0";
+      "lodash.padleft-3.1.0" = self.by-version."lodash.padleft"."3.1.0";
+      "lodash.padright-3.1.0" = self.by-version."lodash.padright"."3.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."gauge"."~1.2.0" =
+    self.by-version."gauge"."1.2.0";
+  by-version."gauge"."1.2.0" = self.buildNodePackage {
+    name = "gauge-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz";
+      name = "gauge-1.2.0.tgz";
+      sha1 = "3094ab1285633f799814388fc8f2de67b4c012c5";
+    };
+    deps = {
+      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
+      "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0";
+      "lodash.pad-3.1.0" = self.by-version."lodash.pad"."3.1.0";
+      "lodash.padleft-3.1.0" = self.by-version."lodash.padleft"."3.1.0";
+      "lodash.padright-3.1.0" = self.by-version."lodash.padright"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -15142,6 +16437,33 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."gcloud"."^0.10.0" =
+    self.by-version."gcloud"."0.10.0";
+  by-version."gcloud"."0.10.0" = self.buildNodePackage {
+    name = "gcloud-0.10.0";
+    version = "0.10.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gcloud/-/gcloud-0.10.0.tgz";
+      name = "gcloud-0.10.0.tgz";
+      sha1 = "855a26b3531dc7b0791513fffb89fc65921f43ee";
+    };
+    deps = {
+      "duplexify-3.3.0" = self.by-version."duplexify"."3.3.0";
+      "extend-1.3.0" = self.by-version."extend"."1.3.0";
+      "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "protobufjs-3.8.2" = self.by-version."protobufjs"."3.8.2";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "stream-events-1.0.1" = self.by-version."stream-events"."1.0.1";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."gelf-stream"."~0.2.4" =
     self.by-version."gelf-stream"."0.2.4";
   by-version."gelf-stream"."0.2.4" = self.buildNodePackage {
@@ -15181,6 +16503,45 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."generate-function"."^2.0.0" =
+    self.by-version."generate-function"."2.0.0";
+  by-version."generate-function"."2.0.0" = self.buildNodePackage {
+    name = "generate-function-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+      name = "generate-function-2.0.0.tgz";
+      sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."generate-object-property"."^1.1.0" =
+    self.by-version."generate-object-property"."1.1.1";
+  by-version."generate-object-property"."1.1.1" = self.buildNodePackage {
+    name = "generate-object-property-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz";
+      name = "generate-object-property-1.1.1.tgz";
+      sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93";
+    };
+    deps = {
+      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."get-stdin"."*" =
     self.by-version."get-stdin"."4.0.1";
   by-version."get-stdin"."4.0.1" = self.buildNodePackage {
@@ -15215,7 +16576,7 @@
     };
     deps = {
       "data-uri-to-buffer-0.0.3" = self.by-version."data-uri-to-buffer"."0.0.3";
-      "ftp-0.3.8" = self.by-version."ftp"."0.3.8";
+      "ftp-0.3.10" = self.by-version."ftp"."0.3.10";
       "debug-0.8.1" = self.by-version."debug"."0.8.1";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
       "file-uri-to-path-0.0.2" = self.by-version."file-uri-to-path"."0.0.2";
@@ -15246,16 +16607,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."getmac"."~1.0.6" =
-    self.by-version."getmac"."1.0.6";
-  by-version."getmac"."1.0.6" = self.buildNodePackage {
-    name = "getmac-1.0.6";
-    version = "1.0.6";
+  by-spec."getmac"."~1.0.7" =
+    self.by-version."getmac"."1.0.7";
+  by-version."getmac"."1.0.7" = self.buildNodePackage {
+    name = "getmac-1.0.7";
+    version = "1.0.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/getmac/-/getmac-1.0.6.tgz";
-      name = "getmac-1.0.6.tgz";
-      sha1 = "f222c8178be9de24899df5a04e77557fbaf4e522";
+      url = "http://registry.npmjs.org/getmac/-/getmac-1.0.7.tgz";
+      name = "getmac-1.0.7.tgz";
+      sha1 = "94460f9778698d2e159a03da6c165689f22cdd67";
     };
     deps = {
       "extract-opts-2.2.0" = self.by-version."extract-opts"."2.2.0";
@@ -15297,7 +16658,7 @@
       sha1 = "34a59d4a90c1501d491ea87d478d26c877808415";
     };
     deps = {
-      "minilog-2.0.6" = self.by-version."minilog"."2.0.6";
+      "minilog-2.0.7" = self.by-version."minilog"."2.0.7";
       "tabtab-0.0.2" = self.by-version."tabtab"."0.0.2";
     };
     optionalDependencies = {
@@ -15307,6 +16668,26 @@
     cpu = [ ];
   };
   "git-run" = self.by-version."git-run"."0.3.1";
+  by-spec."github"."^0.2.3" =
+    self.by-version."github"."0.2.4";
+  by-version."github"."0.2.4" = self.buildNodePackage {
+    name = "github-0.2.4";
+    version = "0.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/github/-/github-0.2.4.tgz";
+      name = "github-0.2.4.tgz";
+      sha1 = "24fa7f0e13fa11b946af91134c51982a91ce538b";
+    };
+    deps = {
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."github-url-from-git"."^1.3.0" =
     self.by-version."github-url-from-git"."1.4.0";
   by-version."github-url-from-git"."1.4.0" = self.buildNodePackage {
@@ -15326,8 +16707,46 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."github-url-from-git"."~1.1.1" =
+    self.by-version."github-url-from-git"."1.1.1";
+  by-version."github-url-from-git"."1.1.1" = self.buildNodePackage {
+    name = "github-url-from-git-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz";
+      name = "github-url-from-git-1.1.1.tgz";
+      sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."github-url-from-git"."~1.4.0" =
     self.by-version."github-url-from-git"."1.4.0";
+  by-spec."github-url-from-username-repo"."^0.1.0" =
+    self.by-version."github-url-from-username-repo"."0.1.0";
+  by-version."github-url-from-username-repo"."0.1.0" = self.buildNodePackage {
+    name = "github-url-from-username-repo-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.1.0.tgz";
+      name = "github-url-from-username-repo-0.1.0.tgz";
+      sha1 = "fe398af670692e91af7bcfc5ae1d99ff97b1df89";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."github-url-from-username-repo"."^1.0.0" =
     self.by-version."github-url-from-username-repo"."1.0.2";
   by-version."github-url-from-username-repo"."1.0.2" = self.buildNodePackage {
@@ -15347,25 +16766,44 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."github-url-from-username-repo"."~1.0.0" =
-    self.by-version."github-url-from-username-repo"."1.0.2";
   by-spec."github-url-from-username-repo"."~1.0.2" =
     self.by-version."github-url-from-username-repo"."1.0.2";
+  by-spec."glob"."3" =
+    self.by-version."glob"."3.2.11";
+  by-version."glob"."3.2.11" = self.buildNodePackage {
+    name = "glob-3.2.11";
+    version = "3.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+      name = "glob-3.2.11.tgz";
+      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."glob"."3 || 4" =
-    self.by-version."glob"."4.4.0";
-  by-version."glob"."4.4.0" = self.buildNodePackage {
-    name = "glob-4.4.0";
-    version = "4.4.0";
+    self.by-version."glob"."4.5.3";
+  by-version."glob"."4.5.3" = self.buildNodePackage {
+    name = "glob-4.5.3";
+    version = "4.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.4.0.tgz";
-      name = "glob-4.4.0.tgz";
-      sha1 = "91d63dc1ed1d82b52ba2cb76044852ccafc2130f";
+      url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
+      name = "glob-4.5.3.tgz";
+      sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
     optionalDependencies = {
@@ -15398,25 +16836,6 @@
   };
   by-spec."glob"."3.2.x" =
     self.by-version."glob"."3.2.11";
-  by-version."glob"."3.2.11" = self.buildNodePackage {
-    name = "glob-3.2.11";
-    version = "3.2.11";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-      name = "glob-3.2.11.tgz";
-      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."glob"."3.x" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."4.0.6" =
@@ -15431,7 +16850,7 @@
       sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
@@ -15443,17 +16862,43 @@
     cpu = [ ];
   };
   by-spec."glob"."4.x" =
-    self.by-version."glob"."4.4.0";
+    self.by-version."glob"."4.5.3";
   by-spec."glob".">=3.2.7 <4" =
     self.by-version."glob"."3.2.11";
-  by-spec."glob"."^4.0.2" =
-    self.by-version."glob"."4.4.0";
   by-spec."glob"."^4.0.5" =
-    self.by-version."glob"."4.4.0";
+    self.by-version."glob"."4.5.3";
   by-spec."glob"."^4.3.1" =
-    self.by-version."glob"."4.4.0";
+    self.by-version."glob"."4.5.3";
+  by-spec."glob"."^4.3.2" =
+    self.by-version."glob"."4.5.3";
   by-spec."glob"."^4.3.5" =
-    self.by-version."glob"."4.4.0";
+    self.by-version."glob"."4.5.3";
+  by-spec."glob"."^4.4.2" =
+    self.by-version."glob"."4.5.3";
+  by-spec."glob"."^5.0.3" =
+    self.by-version."glob"."5.0.5";
+  by-version."glob"."5.0.5" = self.buildNodePackage {
+    name = "glob-5.0.5";
+    version = "5.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob/-/glob-5.0.5.tgz";
+      name = "glob-5.0.5.tgz";
+      sha1 = "784431e4e29a900ae0d47fba6aa1c7f16a8e7df7";
+    };
+    deps = {
+      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
+      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."glob"."~ 3.2.1" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.1.21" =
@@ -15478,16 +16923,16 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."glob"."~3.2.1" =
+    self.by-version."glob"."3.2.11";
+  by-spec."glob"."~3.2.3" =
+    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.6" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.7" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.9" =
     self.by-version."glob"."3.2.11";
-  by-spec."glob"."~4.0.2" =
-    self.by-version."glob"."4.0.6";
-  by-spec."glob"."~4.0.5" =
-    self.by-version."glob"."4.0.6";
   by-spec."glob"."~4.0.6" =
     self.by-version."glob"."4.0.6";
   by-spec."glob"."~4.2.1" =
@@ -15527,7 +16972,7 @@
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
     optionalDependencies = {
@@ -15536,21 +16981,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob"."~4.4.0" =
-    self.by-version."glob"."4.4.0";
+  by-spec."glob"."~5.0.5" =
+    self.by-version."glob"."5.0.5";
+  by-spec."glob-base"."^0.2.0" =
+    self.by-version."glob-base"."0.2.0";
+  by-version."glob-base"."0.2.0" = self.buildNodePackage {
+    name = "glob-base-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/glob-base/-/glob-base-0.2.0.tgz";
+      name = "glob-base-0.2.0.tgz";
+      sha1 = "59d2f38c3ba2860af149b6b174512a169e9f1b3d";
+    };
+    deps = {
+      "glob-parent-1.2.0" = self.by-version."glob-parent"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."glob-parent"."^1.0.0" =
-    self.by-version."glob-parent"."1.0.0";
-  by-version."glob-parent"."1.0.0" = self.buildNodePackage {
-    name = "glob-parent-1.0.0";
-    version = "1.0.0";
+    self.by-version."glob-parent"."1.2.0";
+  by-version."glob-parent"."1.2.0" = self.buildNodePackage {
+    name = "glob-parent-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob-parent/-/glob-parent-1.0.0.tgz";
-      name = "glob-parent-1.0.0.tgz";
-      sha1 = "3344e0e0534fbdd478a7c1f1480f2d8851650a21";
+      url = "http://registry.npmjs.org/glob-parent/-/glob-parent-1.2.0.tgz";
+      name = "glob-parent-1.2.0.tgz";
+      sha1 = "8deffabf6317db5b0f775f553fac731ecf41ded5";
     };
     deps = {
-      "is-glob-0.3.0" = self.by-version."is-glob"."0.3.0";
+      "is-glob-1.1.3" = self.by-version."is-glob"."1.1.3";
     };
     optionalDependencies = {
     };
@@ -15558,6 +17023,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."glob-parent"."^1.2.0" =
+    self.by-version."glob-parent"."1.2.0";
   by-spec."glob-stream"."^3.1.5" =
     self.by-version."glob-stream"."3.1.18";
   by-version."glob-stream"."3.1.18" = self.buildNodePackage {
@@ -15570,12 +17037,12 @@
       sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b";
     };
     deps = {
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "ordered-read-streams-0.1.0" = self.by-version."ordered-read-streams"."0.1.0";
       "glob2base-0.0.12" = self.by-version."glob2base"."0.0.12";
       "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0";
-      "through2-0.6.3" = self.by-version."through2"."0.6.3";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
     };
     optionalDependencies = {
     };
@@ -15654,7 +17121,7 @@
       sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
     };
     deps = {
-      "lodash-1.0.1" = self.by-version."lodash"."1.0.1";
+      "lodash-1.0.2" = self.by-version."lodash"."1.0.2";
       "glob-3.1.21" = self.by-version."glob"."3.1.21";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
     };
@@ -15678,7 +17145,7 @@
     deps = {
       "request-2.34.0" = self.by-version."request"."2.34.0";
       "async-0.2.10" = self.by-version."async"."0.2.10";
-      "gapitoken-0.1.3" = self.by-version."gapitoken"."0.1.3";
+      "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
     };
     optionalDependencies = {
     };
@@ -15687,19 +17154,19 @@
     cpu = [ ];
   };
   by-spec."googleapis"."^1.0.20" =
-    self.by-version."googleapis"."1.1.3";
-  by-version."googleapis"."1.1.3" = self.buildNodePackage {
-    name = "googleapis-1.1.3";
-    version = "1.1.3";
+    self.by-version."googleapis"."1.1.5";
+  by-version."googleapis"."1.1.5" = self.buildNodePackage {
+    name = "googleapis-1.1.5";
+    version = "1.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/googleapis/-/googleapis-1.1.3.tgz";
-      name = "googleapis-1.1.3.tgz";
-      sha1 = "ebfd0c2b3ff89a9445b29ccaeb792b867fab4b50";
+      url = "http://registry.npmjs.org/googleapis/-/googleapis-1.1.5.tgz";
+      name = "googleapis-1.1.5.tgz";
+      sha1 = "e10150ac9e8b25fb51799f10ed946c5b9f8064aa";
     };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "gapitoken-0.1.3" = self.by-version."gapitoken"."0.1.3";
+      "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
       "request-2.51.0" = self.by-version."request"."2.51.0";
       "string-template-0.2.0" = self.by-version."string-template"."0.2.0";
     };
@@ -15709,26 +17176,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."got"."^0.3.0" =
-    self.by-version."got"."0.3.0";
-  by-version."got"."0.3.0" = self.buildNodePackage {
-    name = "got-0.3.0";
-    version = "0.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/got/-/got-0.3.0.tgz";
-      name = "got-0.3.0.tgz";
-      sha1 = "888ec66ca4bc735ab089dbe959496d0f79485493";
-    };
-    deps = {
-      "object-assign-0.3.1" = self.by-version."object-assign"."0.3.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."got"."^1.2.2" =
     self.by-version."got"."1.2.2";
   by-version."got"."1.2.2" = self.buildNodePackage {
@@ -15750,24 +17197,25 @@
     cpu = [ ];
   };
   by-spec."got"."^2.4.0" =
-    self.by-version."got"."2.4.0";
-  by-version."got"."2.4.0" = self.buildNodePackage {
-    name = "got-2.4.0";
-    version = "2.4.0";
+    self.by-version."got"."2.7.2";
+  by-version."got"."2.7.2" = self.buildNodePackage {
+    name = "got-2.7.2";
+    version = "2.7.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/got/-/got-2.4.0.tgz";
-      name = "got-2.4.0.tgz";
-      sha1 = "e4087a2cd59b5d20f2d169dc85d2169ed9e89f56";
+      url = "http://registry.npmjs.org/got/-/got-2.7.2.tgz";
+      name = "got-2.7.2.tgz";
+      sha1 = "089cfe07c37590d6ab59ced31d5ff5b09f05145d";
     };
     deps = {
-      "duplexify-3.2.0" = self.by-version."duplexify"."3.2.0";
+      "duplexify-3.3.0" = self.by-version."duplexify"."3.3.0";
       "infinity-agent-1.0.2" = self.by-version."infinity-agent"."1.0.2";
       "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
       "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0";
+      "nested-error-stacks-1.0.0" = self.by-version."nested-error-stacks"."1.0.0";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
       "prepend-http-1.0.1" = self.by-version."prepend-http"."1.0.1";
-      "read-all-stream-1.0.2" = self.by-version."read-all-stream"."1.0.2";
+      "read-all-stream-2.1.2" = self.by-version."read-all-stream"."2.1.2";
       "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
       "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0";
     };
@@ -15816,15 +17264,15 @@
     cpu = [ ];
   };
   by-spec."graceful-fs"."2 || 3" =
-    self.by-version."graceful-fs"."3.0.5";
-  by-version."graceful-fs"."3.0.5" = self.buildNodePackage {
-    name = "graceful-fs-3.0.5";
-    version = "3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
+  by-version."graceful-fs"."3.0.6" = self.buildNodePackage {
+    name = "graceful-fs-3.0.6";
+    version = "3.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.5.tgz";
-      name = "graceful-fs-3.0.5.tgz";
-      sha1 = "4a880474bdeb716fe3278cf29792dec38dfac418";
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz";
+      name = "graceful-fs-3.0.6.tgz";
+      sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb";
     };
     deps = {
     };
@@ -15835,47 +17283,45 @@
     cpu = [ ];
   };
   by-spec."graceful-fs"."3" =
-    self.by-version."graceful-fs"."3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs".">3.0.1 <4.0.0-0" =
-    self.by-version."graceful-fs"."3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs"."^3.0.0" =
-    self.by-version."graceful-fs"."3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs"."^3.0.1" =
-    self.by-version."graceful-fs"."3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs"."^3.0.2" =
-    self.by-version."graceful-fs"."3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs"."^3.0.4" =
-    self.by-version."graceful-fs"."3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs"."^3.0.5" =
-    self.by-version."graceful-fs"."3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
   by-spec."graceful-fs"."~1.2.0" =
     self.by-version."graceful-fs"."1.2.3";
+  by-spec."graceful-fs"."~2" =
+    self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.0" =
     self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.1" =
     self.by-version."graceful-fs"."2.0.3";
-  by-spec."graceful-fs"."~3.0.0" =
-    self.by-version."graceful-fs"."3.0.5";
-  by-spec."graceful-fs"."~3.0.1" =
-    self.by-version."graceful-fs"."3.0.5";
   by-spec."graceful-fs"."~3.0.2" =
-    self.by-version."graceful-fs"."3.0.5";
+    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs"."~3.0.4" =
-    self.by-version."graceful-fs"."3.0.5";
-  by-spec."graceful-fs"."~3.0.5" =
-    self.by-version."graceful-fs"."3.0.5";
-  by-spec."gridfs-stream"."*" =
-    self.by-version."gridfs-stream"."1.0.1";
-  by-version."gridfs-stream"."1.0.1" = self.buildNodePackage {
-    name = "gridfs-stream-1.0.1";
+    self.by-version."graceful-fs"."3.0.6";
+  by-spec."graceful-fs"."~3.0.6" =
+    self.by-version."graceful-fs"."3.0.6";
+  by-spec."graceful-readlink".">= 1.0.0" =
+    self.by-version."graceful-readlink"."1.0.1";
+  by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
+    name = "graceful-readlink-1.0.1";
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.0.1.tgz";
-      name = "gridfs-stream-1.0.1.tgz";
-      sha1 = "72cd5a8c167adfdefd053807d024758e5a86c0fd";
+      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+      name = "graceful-readlink-1.0.1.tgz";
+      sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
     };
     deps = {
     };
@@ -15885,7 +17331,27 @@
     os = [ ];
     cpu = [ ];
   };
-  "gridfs-stream" = self.by-version."gridfs-stream"."1.0.1";
+  by-spec."gridfs-stream"."*" =
+    self.by-version."gridfs-stream"."1.1.1";
+  by-version."gridfs-stream"."1.1.1" = self.buildNodePackage {
+    name = "gridfs-stream-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.1.1.tgz";
+      name = "gridfs-stream-1.1.1.tgz";
+      sha1 = "3dd3a100ec2021a181282f6eb46709636074df89";
+    };
+    deps = {
+      "flushwritable-1.0.0" = self.by-version."flushwritable"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "gridfs-stream" = self.by-version."gridfs-stream"."1.1.1";
   by-spec."growl"."1.7.x" =
     self.by-version."growl"."1.7.0";
   by-version."growl"."1.7.0" = self.buildNodePackage {
@@ -15950,7 +17416,7 @@
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "lodash-0.9.2" = self.by-version."lodash"."0.9.2";
       "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
       "js-yaml-2.0.5" = self.by-version."js-yaml"."2.0.5";
       "exit-0.1.2" = self.by-version."exit"."0.1.2";
       "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
@@ -16007,8 +17473,8 @@
     };
     deps = {
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "clean-css-3.0.10" = self.by-version."clean-css"."3.0.10";
-      "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0";
+      "clean-css-3.2.1" = self.by-version."clean-css"."3.2.1";
+      "maxmin-1.1.0" = self.by-version."maxmin"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -16019,19 +17485,19 @@
   };
   "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.12.2";
   by-spec."grunt-contrib-jshint"."*" =
-    self.by-version."grunt-contrib-jshint"."0.11.0";
-  by-version."grunt-contrib-jshint"."0.11.0" = self.buildNodePackage {
-    name = "grunt-contrib-jshint-0.11.0";
-    version = "0.11.0";
+    self.by-version."grunt-contrib-jshint"."0.11.2";
+  by-version."grunt-contrib-jshint"."0.11.2" = self.buildNodePackage {
+    name = "grunt-contrib-jshint-0.11.2";
+    version = "0.11.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.11.0.tgz";
-      name = "grunt-contrib-jshint-0.11.0.tgz";
-      sha1 = "2ba17953d30471c3ba58792a5aa92e447059de45";
+      url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.11.2.tgz";
+      name = "grunt-contrib-jshint-0.11.2.tgz";
+      sha1 = "a7e000427bb007848c1099264860c0485b4741d3";
     };
     deps = {
       "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
-      "jshint-2.6.0" = self.by-version."jshint"."2.6.0";
+      "jshint-2.7.0" = self.by-version."jshint"."2.7.0";
     };
     optionalDependencies = {
     };
@@ -16040,17 +17506,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.11.0";
+  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.11.2";
   by-spec."grunt-contrib-less"."*" =
-    self.by-version."grunt-contrib-less"."1.0.0";
-  by-version."grunt-contrib-less"."1.0.0" = self.buildNodePackage {
-    name = "grunt-contrib-less-1.0.0";
-    version = "1.0.0";
+    self.by-version."grunt-contrib-less"."1.0.1";
+  by-version."grunt-contrib-less"."1.0.1" = self.buildNodePackage {
+    name = "grunt-contrib-less-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.0.tgz";
-      name = "grunt-contrib-less-1.0.0.tgz";
-      sha1 = "370e5f18682bf4ea72a622fece416a08bb194523";
+      url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.1.tgz";
+      name = "grunt-contrib-less-1.0.1.tgz";
+      sha1 = "87f32a5e474987a405c9c9890d33686a45021d51";
     };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
@@ -16065,7 +17531,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.0.0";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.0.1";
   by-spec."grunt-contrib-requirejs"."*" =
     self.by-version."grunt-contrib-requirejs"."0.4.4";
   by-version."grunt-contrib-requirejs"."0.4.4" = self.buildNodePackage {
@@ -16078,7 +17544,7 @@
       sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972";
     };
     deps = {
-      "requirejs-2.1.16" = self.by-version."requirejs"."2.1.16";
+      "requirejs-2.1.17" = self.by-version."requirejs"."2.1.17";
     };
     optionalDependencies = {
     };
@@ -16089,21 +17555,21 @@
   };
   "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4";
   by-spec."grunt-contrib-uglify"."*" =
-    self.by-version."grunt-contrib-uglify"."0.8.0";
-  by-version."grunt-contrib-uglify"."0.8.0" = self.buildNodePackage {
-    name = "grunt-contrib-uglify-0.8.0";
-    version = "0.8.0";
+    self.by-version."grunt-contrib-uglify"."0.9.1";
+  by-version."grunt-contrib-uglify"."0.9.1" = self.buildNodePackage {
+    name = "grunt-contrib-uglify-0.9.1";
+    version = "0.9.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.8.0.tgz";
-      name = "grunt-contrib-uglify-0.8.0.tgz";
-      sha1 = "6897a450fab8563c9885e388bd705a5ff2c3937e";
+      url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.9.1.tgz";
+      name = "grunt-contrib-uglify-0.9.1.tgz";
+      sha1 = "1eb8420009f15ed1a97368077479ab25ded28d1b";
     };
     deps = {
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
-      "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0";
-      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
+      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
+      "maxmin-1.1.0" = self.by-version."maxmin"."1.1.0";
+      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
       "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2";
     };
     optionalDependencies = {
@@ -16113,7 +17579,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.8.0";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.9.1";
   by-spec."grunt-karma"."*" =
     self.by-version."grunt-karma"."0.10.1";
   by-version."grunt-karma"."0.10.1" = self.buildNodePackage {
@@ -16132,7 +17598,7 @@
     };
     peerDependencies = [
       self.by-version."grunt"."0.4.5"
-      self.by-version."karma"."0.12.31"];
+      self.by-version."karma"."0.12.32"];
     os = [ ];
     cpu = [ ];
   };
@@ -16178,7 +17644,7 @@
       "exit-0.1.2" = self.by-version."exit"."0.1.2";
       "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1";
       "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
     };
     optionalDependencies = {
     };
@@ -16220,10 +17686,10 @@
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     deps = {
-      "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1";
+      "coffee-script-1.9.2" = self.by-version."coffee-script"."1.9.2";
       "jade-1.9.2" = self.by-version."jade"."1.9.2";
       "q-2.0.3" = self.by-version."q"."2.0.3";
-      "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
+      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
       "msgpack-0.2.6" = self.by-version."msgpack"."0.2.6";
     };
     optionalDependencies = {
@@ -16248,15 +17714,15 @@
       "archy-1.0.0" = self.by-version."archy"."1.0.0";
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1";
-      "gulp-util-3.0.3" = self.by-version."gulp-util"."3.0.3";
+      "gulp-util-3.0.4" = self.by-version."gulp-util"."3.0.4";
       "interpret-0.3.10" = self.by-version."interpret"."0.3.10";
-      "liftoff-2.0.1" = self.by-version."liftoff"."2.0.1";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "liftoff-2.0.3" = self.by-version."liftoff"."2.0.3";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
       "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7";
       "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "tildify-1.0.0" = self.by-version."tildify"."1.0.0";
-      "v8flags-2.0.2" = self.by-version."v8flags"."2.0.2";
+      "v8flags-2.0.5" = self.by-version."v8flags"."2.0.5";
       "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13";
     };
     optionalDependencies = {
@@ -16267,31 +17733,31 @@
   };
   "gulp" = self.by-version."gulp"."3.8.11";
   by-spec."gulp-util"."^3.0.0" =
-    self.by-version."gulp-util"."3.0.3";
-  by-version."gulp-util"."3.0.3" = self.buildNodePackage {
-    name = "gulp-util-3.0.3";
-    version = "3.0.3";
+    self.by-version."gulp-util"."3.0.4";
+  by-version."gulp-util"."3.0.4" = self.buildNodePackage {
+    name = "gulp-util-3.0.4";
+    version = "3.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.3.tgz";
-      name = "gulp-util-3.0.3.tgz";
-      sha1 = "3b078d09001a7b5f77bbe2e7402e05d97d78b3e4";
+      url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz";
+      name = "gulp-util-3.0.4.tgz";
+      sha1 = "ec73553090fdb23d88fa02812ad1b61225854881";
     };
     deps = {
       "array-differ-1.0.0" = self.by-version."array-differ"."1.0.0";
       "array-uniq-1.0.2" = self.by-version."array-uniq"."1.0.2";
       "beeper-1.0.0" = self.by-version."beeper"."1.0.0";
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
       "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11";
-      "lodash.reescape-3.0.1" = self.by-version."lodash.reescape"."3.0.1";
-      "lodash.reevaluate-3.0.1" = self.by-version."lodash.reevaluate"."3.0.1";
-      "lodash.reinterpolate-3.0.1" = self.by-version."lodash.reinterpolate"."3.0.1";
-      "lodash.template-3.3.0" = self.by-version."lodash.template"."3.3.0";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0";
+      "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0";
+      "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
+      "lodash.template-3.5.0" = self.by-version."lodash.template"."3.5.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
       "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
       "replace-ext-0.0.1" = self.by-version."replace-ext"."0.0.1";
-      "through2-0.6.3" = self.by-version."through2"."0.6.3";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
     };
     optionalDependencies = {
@@ -16312,7 +17778,7 @@
       sha1 = "66cf8b101047227b95bace6ea1da0c177ed5c22f";
     };
     deps = {
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
     };
     optionalDependencies = {
@@ -16333,7 +17799,7 @@
       sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
     };
     deps = {
-      "send-0.12.1" = self.by-version."send"."0.12.1";
+      "send-0.12.2" = self.by-version."send"."0.12.2";
     };
     optionalDependencies = {
     };
@@ -16342,7 +17808,52 @@
     cpu = [ ];
   };
   "gzippo" = self.by-version."gzippo"."0.2.0";
-  by-spec."handlebars"."1.3.x" =
+  by-spec."handlebars"."2.x" =
+    self.by-version."handlebars"."2.0.0";
+  by-version."handlebars"."2.0.0" = self.buildNodePackage {
+    name = "handlebars-2.0.0";
+    version = "2.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
+      name = "handlebars-2.0.0.tgz";
+      sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f";
+    };
+    deps = {
+      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+    };
+    optionalDependencies = {
+      "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."handlebars"."3.0.0" =
+    self.by-version."handlebars"."3.0.0";
+  by-version."handlebars"."3.0.0" = self.buildNodePackage {
+    name = "handlebars-3.0.0";
+    version = "3.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/handlebars/-/handlebars-3.0.0.tgz";
+      name = "handlebars-3.0.0.tgz";
+      sha1 = "7f4e537f4dd6992869d66c01b7505eba3561a5d5";
+    };
+    deps = {
+      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+    };
+    optionalDependencies = {
+      "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."handlebars"."^2.0.0" =
+    self.by-version."handlebars"."2.0.0";
+  by-spec."handlebars"."~1.3.0" =
     self.by-version."handlebars"."1.3.0";
   by-version."handlebars"."1.3.0" = self.buildNodePackage {
     name = "handlebars-1.3.0";
@@ -16363,24 +17874,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."handlebars"."~1.3.0" =
-    self.by-version."handlebars"."1.3.0";
-  by-spec."handlebars"."~2.0.0" =
-    self.by-version."handlebars"."2.0.0";
-  by-version."handlebars"."2.0.0" = self.buildNodePackage {
-    name = "handlebars-2.0.0";
-    version = "2.0.0";
+  by-spec."har-validator"."^1.4.0" =
+    self.by-version."har-validator"."1.6.1";
+  by-version."har-validator"."1.6.1" = self.buildNodePackage {
+    name = "har-validator-1.6.1";
+    version = "1.6.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
-      name = "handlebars-2.0.0.tgz";
-      sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f";
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.6.1.tgz";
+      name = "har-validator-1.6.1.tgz";
+      sha1 = "baef452cde645eff7d26562e8e749d7fd000b7fd";
     };
     deps = {
-      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+      "bluebird-2.9.24" = self.by-version."bluebird"."2.9.24";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
+      "commander-2.8.0" = self.by-version."commander"."2.8.0";
+      "is-my-json-valid-2.10.1" = self.by-version."is-my-json-valid"."2.10.1";
     };
     optionalDependencies = {
-      "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
     };
     peerDependencies = [];
     os = [ ];
@@ -16425,6 +17936,67 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."has-ansi"."^1.0.3" =
+    self.by-version."has-ansi"."1.0.3";
+  by-version."has-ansi"."1.0.3" = self.buildNodePackage {
+    name = "has-ansi-1.0.3";
+    version = "1.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
+      name = "has-ansi-1.0.3.tgz";
+      sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
+    };
+    deps = {
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-binary"."0.1.5" =
+    self.by-version."has-binary"."0.1.5";
+  by-version."has-binary"."0.1.5" = self.buildNodePackage {
+    name = "has-binary-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.5.tgz";
+      name = "has-binary-0.1.5.tgz";
+      sha1 = "95e75720ff31b72a3ba89a5b6dce082e4bc6467f";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-binary"."0.1.6" =
+    self.by-version."has-binary"."0.1.6";
+  by-version."has-binary"."0.1.6" = self.buildNodePackage {
+    name = "has-binary-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
+      name = "has-binary-0.1.6.tgz";
+      sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."has-binary-data"."0.1.1" =
     self.by-version."has-binary-data"."0.1.1";
   by-version."has-binary-data"."0.1.1" = self.buildNodePackage {
@@ -16445,6 +18017,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."has-binary-data"."0.1.3" =
+    self.by-version."has-binary-data"."0.1.3";
+  by-version."has-binary-data"."0.1.3" = self.buildNodePackage {
+    name = "has-binary-data-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.3.tgz";
+      name = "has-binary-data-0.1.3.tgz";
+      sha1 = "8ebb18388b57f19a5231275a16fc18d51f379aae";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."has-cors"."1.0.3" =
     self.by-version."has-cors"."1.0.3";
   by-version."has-cors"."1.0.3" = self.buildNodePackage {
@@ -16548,20 +18140,22 @@
     self.by-version."hashish"."0.0.4";
   by-spec."hashish"."0.0.x" =
     self.by-version."hashish"."0.0.4";
-  by-spec."hashring"."1.0.1" =
-    self.by-version."hashring"."1.0.1";
-  by-version."hashring"."1.0.1" = self.buildNodePackage {
-    name = "hashring-1.0.1";
-    version = "1.0.1";
+  by-spec."hashring"."3.1.0" =
+    self.by-version."hashring"."3.1.0";
+  by-version."hashring"."3.1.0" = self.buildNodePackage {
+    name = "hashring-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hashring/-/hashring-1.0.1.tgz";
-      name = "hashring-1.0.1.tgz";
-      sha1 = "b6a7b8c675a0c715ac0d0071786eb241a28d0a7c";
+      url = "http://registry.npmjs.org/hashring/-/hashring-3.1.0.tgz";
+      name = "hashring-3.1.0.tgz";
+      sha1 = "f315f99f281d9ef0292ca7abe50aa8f4ef7f8aad";
     };
     deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
-      "simple-lru-cache-0.0.1" = self.by-version."simple-lru-cache"."0.0.1";
+      "nan-1.5.3" = self.by-version."nan"."1.5.3";
+      "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2";
     };
     optionalDependencies = {
     };
@@ -16640,6 +18234,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."hawk"."~0.13.0" =
+    self.by-version."hawk"."0.13.1";
+  by-version."hawk"."0.13.1" = self.buildNodePackage {
+    name = "hawk-0.13.1";
+    version = "0.13.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz";
+      name = "hawk-0.13.1.tgz";
+      sha1 = "3617958821f58311e4d7f6de291fca662b412ef4";
+    };
+    deps = {
+      "hoek-0.8.5" = self.by-version."hoek"."0.8.5";
+      "boom-0.4.2" = self.by-version."boom"."0.4.2";
+      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
+      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."hawk"."~1.0.0" =
     self.by-version."hawk"."1.0.0";
   by-version."hawk"."1.0.0" = self.buildNodePackage {
@@ -16675,8 +18292,8 @@
       sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
     };
     deps = {
-      "hoek-2.11.0" = self.by-version."hoek"."2.11.0";
-      "boom-2.6.1" = self.by-version."boom"."2.6.1";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+      "boom-2.7.1" = self.by-version."boom"."2.7.1";
       "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
       "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
     };
@@ -16764,6 +18381,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."highlight.js"."8.x" =
+    self.by-version."highlight.js"."8.5.0";
+  by-version."highlight.js"."8.5.0" = self.buildNodePackage {
+    name = "highlight.js-8.5.0";
+    version = "8.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.5.0.tgz";
+      name = "highlight.js-8.5.0.tgz";
+      sha1 = "6473d5099edb9f82fa50286b9178c8583ad7d652";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."hipache"."*" =
     self.by-version."hipache"."0.3.1";
   by-version."hipache"."0.3.1" = self.buildNodePackage {
@@ -16778,7 +18414,7 @@
     deps = {
       "http-proxy-1.0.2" = self.by-version."http-proxy"."1.0.2";
       "redis-0.10.3" = self.by-version."redis"."0.10.3";
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2";
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
     };
     optionalDependencies = {
@@ -16789,15 +18425,15 @@
   };
   "hipache" = self.by-version."hipache"."0.3.1";
   by-spec."hiredis"."*" =
-    self.by-version."hiredis"."0.2.0";
-  by-version."hiredis"."0.2.0" = self.buildNodePackage {
-    name = "hiredis-0.2.0";
-    version = "0.2.0";
+    self.by-version."hiredis"."0.3.0";
+  by-version."hiredis"."0.3.0" = self.buildNodePackage {
+    name = "hiredis-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hiredis/-/hiredis-0.2.0.tgz";
-      name = "hiredis-0.2.0.tgz";
-      sha1 = "34415bd11f8ddb61581ab2da39468515198d14a8";
+      url = "http://registry.npmjs.org/hiredis/-/hiredis-0.3.0.tgz";
+      name = "hiredis-0.3.0.tgz";
+      sha1 = "8981aa09d0f9d7e00c88ceec72ece68444f412d9";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
@@ -16828,6 +18464,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."hoek"."0.8.x" =
+    self.by-version."hoek"."0.8.5";
+  by-version."hoek"."0.8.5" = self.buildNodePackage {
+    name = "hoek-0.8.5";
+    version = "0.8.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz";
+      name = "hoek-0.8.5.tgz";
+      sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."hoek"."0.9.x" =
     self.by-version."hoek"."0.9.1";
   by-version."hoek"."0.9.1" = self.buildNodePackage {
@@ -16848,15 +18503,15 @@
     cpu = [ ];
   };
   by-spec."hoek"."2.x.x" =
-    self.by-version."hoek"."2.11.0";
-  by-version."hoek"."2.11.0" = self.buildNodePackage {
-    name = "hoek-2.11.0";
-    version = "2.11.0";
+    self.by-version."hoek"."2.12.0";
+  by-version."hoek"."2.12.0" = self.buildNodePackage {
+    name = "hoek-2.12.0";
+    version = "2.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-2.11.0.tgz";
-      name = "hoek-2.11.0.tgz";
-      sha1 = "e588ec66a6b405b0e7140308720e1e1cd4f035b7";
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.12.0.tgz";
+      name = "hoek-2.12.0.tgz";
+      sha1 = "5d1196e0bf20c5cec957e8927101164effdaf1c9";
     };
     deps = {
     };
@@ -16866,7 +18521,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hooker"."~0.2.3" =
+  by-spec."hooker"."^0.2.3" =
     self.by-version."hooker"."0.2.3";
   by-version."hooker"."0.2.3" = self.buildNodePackage {
     name = "hooker-0.2.3";
@@ -16885,6 +18540,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."hooker"."~0.2.3" =
+    self.by-version."hooker"."0.2.3";
   by-spec."hooks"."0.2.1" =
     self.by-version."hooks"."0.2.1";
   by-version."hooks"."0.2.1" = self.buildNodePackage {
@@ -16924,15 +18581,34 @@
     cpu = [ ];
   };
   by-spec."hosted-git-info"."^1.5.3" =
-    self.by-version."hosted-git-info"."1.5.3";
-  by-version."hosted-git-info"."1.5.3" = self.buildNodePackage {
-    name = "hosted-git-info-1.5.3";
-    version = "1.5.3";
+    self.by-version."hosted-git-info"."1.6.0";
+  by-version."hosted-git-info"."1.6.0" = self.buildNodePackage {
+    name = "hosted-git-info-1.6.0";
+    version = "1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-1.6.0.tgz";
+      name = "hosted-git-info-1.6.0.tgz";
+      sha1 = "dbc718bed09c2f30abe6bdc68d46b9c5317282db";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hosted-git-info"."^2.0.2" =
+    self.by-version."hosted-git-info"."2.1.2";
+  by-version."hosted-git-info"."2.1.2" = self.buildNodePackage {
+    name = "hosted-git-info-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-1.5.3.tgz";
-      name = "hosted-git-info-1.5.3.tgz";
-      sha1 = "1f46e25e9c0e207852fb7a4b94422ed5f09a03f5";
+      url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz";
+      name = "hosted-git-info-2.1.2.tgz";
+      sha1 = "f947976852931851c33644bbce80d1e499795246";
     };
     deps = {
     };
@@ -16942,6 +18618,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."hosted-git-info"."~2.1.2" =
+    self.by-version."hosted-git-info"."2.1.2";
   by-spec."html-md"."^3.0.2" =
     self.by-version."html-md"."3.0.2";
   by-version."html-md"."3.0.2" = self.buildNodePackage {
@@ -17021,7 +18699,7 @@
     deps = {
       "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
       "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
-      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "entities-1.0.0" = self.by-version."entities"."1.0.0";
     };
@@ -17051,7 +18729,7 @@
     deps = {
       "domhandler-2.2.1" = self.by-version."domhandler"."2.2.1";
       "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
-      "domelementtype-1.1.3" = self.by-version."domelementtype"."1.1.3";
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
       "entities-1.0.0" = self.by-version."entities"."1.0.0";
     };
@@ -17128,16 +18806,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-errors"."~1.2.8" =
-    self.by-version."http-errors"."1.2.8";
-  by-version."http-errors"."1.2.8" = self.buildNodePackage {
-    name = "http-errors-1.2.8";
-    version = "1.2.8";
+  by-spec."http-errors".">=1.2.0" =
+    self.by-version."http-errors"."1.3.1";
+  by-version."http-errors"."1.3.1" = self.buildNodePackage {
+    name = "http-errors-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz";
-      name = "http-errors-1.2.8.tgz";
-      sha1 = "8ee5fe0b51982221d796c0c4712d76f72097a4d0";
+      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
+      name = "http-errors-1.3.1.tgz";
+      sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -17149,16 +18827,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-errors"."~1.3.1" =
-    self.by-version."http-errors"."1.3.1";
-  by-version."http-errors"."1.3.1" = self.buildNodePackage {
-    name = "http-errors-1.3.1";
-    version = "1.3.1";
+  by-spec."http-errors"."~1.2.8" =
+    self.by-version."http-errors"."1.2.8";
+  by-version."http-errors"."1.2.8" = self.buildNodePackage {
+    name = "http-errors-1.2.8";
+    version = "1.2.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
-      name = "http-errors-1.3.1.tgz";
-      sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
+      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz";
+      name = "http-errors-1.2.8.tgz";
+      sha1 = "8ee5fe0b51982221d796c0c4712d76f72097a4d0";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -17170,6 +18848,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."http-errors"."~1.3.1" =
+    self.by-version."http-errors"."1.3.1";
   by-spec."http-proxy"."1.0.2" =
     self.by-version."http-proxy"."1.0.2";
   by-version."http-proxy"."1.0.2" = self.buildNodePackage {
@@ -17235,21 +18915,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-signature"."0.9.11" =
-    self.by-version."http-signature"."0.9.11";
-  by-version."http-signature"."0.9.11" = self.buildNodePackage {
-    name = "http-signature-0.9.11";
-    version = "0.9.11";
+  by-spec."http-signature"."^0.10.0" =
+    self.by-version."http-signature"."0.10.1";
+  by-version."http-signature"."0.10.1" = self.buildNodePackage {
+    name = "http-signature-0.10.1";
+    version = "0.10.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
-      name = "http-signature-0.9.11.tgz";
-      sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+      name = "http-signature-0.10.1.tgz";
+      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
     };
     deps = {
-      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
       "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
-      "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
+      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
     };
     optionalDependencies = {
     };
@@ -17259,19 +18939,21 @@
   };
   by-spec."http-signature"."~0.10.0" =
     self.by-version."http-signature"."0.10.1";
-  by-version."http-signature"."0.10.1" = self.buildNodePackage {
-    name = "http-signature-0.10.1";
-    version = "0.10.1";
+  by-spec."http-signature"."~0.9.11" =
+    self.by-version."http-signature"."0.9.11";
+  by-version."http-signature"."0.9.11" = self.buildNodePackage {
+    name = "http-signature-0.9.11";
+    version = "0.9.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-      name = "http-signature-0.10.1.tgz";
-      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
+      name = "http-signature-0.9.11.tgz";
+      sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
     };
     deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
       "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
-      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
+      "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
     };
     optionalDependencies = {
     };
@@ -17362,16 +19044,37 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."hyperquest"."^1.2.0" =
+    self.by-version."hyperquest"."1.2.0";
+  by-version."hyperquest"."1.2.0" = self.buildNodePackage {
+    name = "hyperquest-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hyperquest/-/hyperquest-1.2.0.tgz";
+      name = "hyperquest-1.2.0.tgz";
+      sha1 = "39e1fef66888dc7ce0dec6c0dd814f6fc8944ad5";
+    };
+    deps = {
+      "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."i"."0.3.x" =
-    self.by-version."i"."0.3.2";
-  by-version."i"."0.3.2" = self.buildNodePackage {
-    name = "i-0.3.2";
-    version = "0.3.2";
+    self.by-version."i"."0.3.3";
+  by-version."i"."0.3.3" = self.buildNodePackage {
+    name = "i-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/i/-/i-0.3.2.tgz";
-      name = "i-0.3.2.tgz";
-      sha1 = "b2e2d6ef47900bd924e281231ff4c5cc798d9ea8";
+      url = "http://registry.npmjs.org/i/-/i-0.3.3.tgz";
+      name = "i-0.3.3.tgz";
+      sha1 = "0ff9a5eb743504aa8ac26a84f84c641287ff24cd";
     };
     deps = {
     };
@@ -17403,34 +19106,6 @@
     cpu = [ ];
   };
   "i18next" = self.by-version."i18next"."1.7.10";
-  by-spec."ibrik"."~2.0.0" =
-    self.by-version."ibrik"."2.0.0";
-  by-version."ibrik"."2.0.0" = self.buildNodePackage {
-    name = "ibrik-2.0.0";
-    version = "2.0.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ibrik/-/ibrik-2.0.0.tgz";
-      name = "ibrik-2.0.0.tgz";
-      sha1 = "89a2434f2a5c82b92166c3d97de3b5636eea2e9c";
-    };
-    deps = {
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0";
-      "istanbul-0.3.6" = self.by-version."istanbul"."0.3.6";
-      "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "esprima-1.2.4" = self.by-version."esprima"."1.2.4";
-      "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."iconv"."~2.1.4" =
     self.by-version."iconv"."2.1.6";
   by-version."iconv"."2.1.6" = self.buildNodePackage {
@@ -17472,25 +19147,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."iconv-lite"."0.4.5" =
-    self.by-version."iconv-lite"."0.4.5";
-  by-version."iconv-lite"."0.4.5" = self.buildNodePackage {
-    name = "iconv-lite-0.4.5";
-    version = "0.4.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.5.tgz";
-      name = "iconv-lite-0.4.5.tgz";
-      sha1 = "9c574b70c30d615859f2064d2be4335ad6b1a8d6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."iconv-lite"."0.4.6" =
     self.by-version."iconv-lite"."0.4.6";
   by-version."iconv-lite"."0.4.6" = self.buildNodePackage {
@@ -17510,16 +19166,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."iconv-lite"."0.4.7" =
-    self.by-version."iconv-lite"."0.4.7";
-  by-version."iconv-lite"."0.4.7" = self.buildNodePackage {
-    name = "iconv-lite-0.4.7";
-    version = "0.4.7";
+  by-spec."iconv-lite"."0.4.8" =
+    self.by-version."iconv-lite"."0.4.8";
+  by-version."iconv-lite"."0.4.8" = self.buildNodePackage {
+    name = "iconv-lite-0.4.8";
+    version = "0.4.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.7.tgz";
-      name = "iconv-lite-0.4.7.tgz";
-      sha1 = "89d32fec821bf8597f44609b4bc09bed5c209a23";
+      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
+      name = "iconv-lite-0.4.8.tgz";
+      sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
     };
     deps = {
     };
@@ -17530,7 +19186,9 @@
     cpu = [ ];
   };
   by-spec."iconv-lite"."^0.4.4" =
-    self.by-version."iconv-lite"."0.4.7";
+    self.by-version."iconv-lite"."0.4.8";
+  by-spec."iconv-lite"."^0.4.8" =
+    self.by-version."iconv-lite"."0.4.8";
   by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
   by-version."iconv-lite"."0.2.11" = self.buildNodePackage {
@@ -17551,9 +19209,9 @@
     cpu = [ ];
   };
   by-spec."iconv-lite"."~0.4.4" =
-    self.by-version."iconv-lite"."0.4.7";
+    self.by-version."iconv-lite"."0.4.8";
   by-spec."iconv-lite"."~0.4.5" =
-    self.by-version."iconv-lite"."0.4.7";
+    self.by-version."iconv-lite"."0.4.8";
   by-spec."ieee754"."^1.1.4" =
     self.by-version."ieee754"."1.1.4";
   by-version."ieee754"."1.1.4" = self.buildNodePackage {
@@ -17647,7 +19305,7 @@
     };
     deps = {
       "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
       "repeating-1.1.2" = self.by-version."repeating"."1.1.2";
     };
     optionalDependencies = {
@@ -17753,8 +19411,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inflight"."~1.0.1" =
-    self.by-version."inflight"."1.0.4";
   by-spec."inflight"."~1.0.4" =
     self.by-version."inflight"."1.0.4";
   by-spec."inherits"."*" =
@@ -17851,46 +19507,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ini"."~1.2.0" =
-    self.by-version."ini"."1.2.1";
-  by-version."ini"."1.2.1" = self.buildNodePackage {
-    name = "ini-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ini/-/ini-1.2.1.tgz";
-      name = "ini-1.2.1.tgz";
-      sha1 = "7f774e2f22752cd1dacbf9c63323df2a164ebca3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."ini"."~1.3.0" =
     self.by-version."ini"."1.3.3";
   by-spec."ini"."~1.3.3" =
     self.by-version."ini"."1.3.3";
-  by-spec."init-package-json"."~1.0.0" =
-    self.by-version."init-package-json"."1.0.1";
-  by-version."init-package-json"."1.0.1" = self.buildNodePackage {
-    name = "init-package-json-1.0.1";
-    version = "1.0.1";
+  by-spec."init-package-json"."0.0.10" =
+    self.by-version."init-package-json"."0.0.10";
+  by-version."init-package-json"."0.0.10" = self.buildNodePackage {
+    name = "init-package-json-0.0.10";
+    version = "0.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.0.1.tgz";
-      name = "init-package-json-1.0.1.tgz";
-      sha1 = "c01b08cc90504ebc448d57b468e66fc08293e8a8";
+      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz";
+      name = "init-package-json-0.0.10.tgz";
+      sha1 = "7baf10535227e0878105a04e44b78f132475da6a";
     };
     deps = {
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
       "promzard-0.2.2" = self.by-version."promzard"."0.2.2";
       "read-1.0.5" = self.by-version."read"."1.0.5";
-      "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "read-package-json-1.3.3" = self.by-version."read-package-json"."1.3.3";
+      "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -17898,23 +19534,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."init-package-json"."~1.2.0" =
-    self.by-version."init-package-json"."1.2.0";
-  by-version."init-package-json"."1.2.0" = self.buildNodePackage {
-    name = "init-package-json-1.2.0";
-    version = "1.2.0";
+  by-spec."init-package-json"."^1.2.0" =
+    self.by-version."init-package-json"."1.4.1";
+  by-version."init-package-json"."1.4.1" = self.buildNodePackage {
+    name = "init-package-json-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.2.0.tgz";
-      name = "init-package-json-1.2.0.tgz";
-      sha1 = "b9f027514403b3b3f582c148592ab75214003348";
+      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.4.1.tgz";
+      name = "init-package-json-1.4.1.tgz";
+      sha1 = "6f68a14e181941849d84f6861f946e0028716cee";
     };
     deps = {
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
-      "promzard-0.2.2" = self.by-version."promzard"."0.2.2";
+      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+      "npm-package-arg-4.0.0" = self.by-version."npm-package-arg"."4.0.0";
+      "promzard-0.3.0" = self.by-version."promzard"."0.3.0";
       "read-1.0.5" = self.by-version."read"."1.0.5";
-      "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "read-package-json-2.0.0" = self.by-version."read-package-json"."2.0.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "validate-npm-package-name-2.0.1" = self.by-version."validate-npm-package-name"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -17922,6 +19560,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."init-package-json"."~1.4.1" =
+    self.by-version."init-package-json"."1.4.1";
   by-spec."inline-source-map"."~0.3.0" =
     self.by-version."inline-source-map"."0.3.1";
   by-version."inline-source-map"."0.3.1" = self.buildNodePackage {
@@ -17942,34 +19582,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inquirer"."0.7.1" =
-    self.by-version."inquirer"."0.7.1";
-  by-version."inquirer"."0.7.1" = self.buildNodePackage {
-    name = "inquirer-0.7.1";
-    version = "0.7.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz";
-      name = "inquirer-0.7.1.tgz";
-      sha1 = "b8acf140165bd581862ed1198fb6d26430091fac";
-    };
-    deps = {
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2";
-      "figures-1.3.5" = self.by-version."figures"."1.3.5";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
-      "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
-      "rx-2.4.0" = self.by-version."rx"."2.4.0";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."inquirer".">=0.2.4" =
+  by-spec."inquirer"."0.8.0" =
     self.by-version."inquirer"."0.8.0";
   by-version."inquirer"."0.8.0" = self.buildNodePackage {
     name = "inquirer-0.8.0";
@@ -17983,13 +19596,13 @@
     deps = {
       "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2";
+      "cli-color-0.3.3" = self.by-version."cli-color"."0.3.3";
       "figures-1.3.5" = self.by-version."figures"."1.3.5";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
       "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
-      "rx-2.4.0" = self.by-version."rx"."2.4.0";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "rx-2.5.2" = self.by-version."rx"."2.5.2";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -17997,25 +19610,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inquirer"."^0.6.0" =
-    self.by-version."inquirer"."0.6.0";
-  by-version."inquirer"."0.6.0" = self.buildNodePackage {
-    name = "inquirer-0.6.0";
-    version = "0.6.0";
+  by-spec."inquirer".">=0.2.4" =
+    self.by-version."inquirer"."0.8.2";
+  by-version."inquirer"."0.8.2" = self.buildNodePackage {
+    name = "inquirer-0.8.2";
+    version = "0.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz";
-      name = "inquirer-0.6.0.tgz";
-      sha1 = "614d7bb3e48f9e6a8028e94a0c38f23ef29823d3";
+      url = "http://registry.npmjs.org/inquirer/-/inquirer-0.8.2.tgz";
+      name = "inquirer-0.8.2.tgz";
+      sha1 = "41586548e1c5d9b3f81df7325034baacab6f58ab";
     };
     deps = {
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "cli-color-0.3.2" = self.by-version."cli-color"."0.3.2";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
+      "cli-width-1.0.1" = self.by-version."cli-width"."1.0.1";
+      "figures-1.3.5" = self.by-version."figures"."1.3.5";
+      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
       "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
-      "rx-2.4.0" = self.by-version."rx"."2.4.0";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "rx-2.5.2" = self.by-version."rx"."2.5.2";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -18023,24 +19637,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."inquirer"."^0.8.0" =
+    self.by-version."inquirer"."0.8.2";
   by-spec."insert-module-globals"."^6.1.0" =
-    self.by-version."insert-module-globals"."6.2.0";
-  by-version."insert-module-globals"."6.2.0" = self.buildNodePackage {
-    name = "insert-module-globals-6.2.0";
-    version = "6.2.0";
+    self.by-version."insert-module-globals"."6.2.1";
+  by-version."insert-module-globals"."6.2.1" = self.buildNodePackage {
+    name = "insert-module-globals-6.2.1";
+    version = "6.2.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.0.tgz";
-      name = "insert-module-globals-6.2.0.tgz";
-      sha1 = "4f75ce864f0a23c2edc73f9a582d23b6581484ff";
+      url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.1.tgz";
+      name = "insert-module-globals-6.2.1.tgz";
+      sha1 = "95b8ec9ef8da579ceee827255a6a00e5b5cabaea";
     };
     deps = {
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "lexical-scope-1.1.0" = self.by-version."lexical-scope"."1.1.0";
       "process-0.6.0" = self.by-version."process"."0.6.0";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
     optionalDependencies = {
@@ -18050,7 +19666,7 @@
     cpu = [ ];
   };
   by-spec."insert-module-globals"."^6.2.0" =
-    self.by-version."insert-module-globals"."6.2.0";
+    self.by-version."insert-module-globals"."6.2.1";
   by-spec."insert-module-globals"."~2.3.0" =
     self.by-version."insert-module-globals"."2.3.4";
   by-version."insert-module-globals"."2.3.4" = self.buildNodePackage {
@@ -18063,10 +19679,10 @@
       sha1 = "e920cd470bcf1f47713eac6cc5cc13437e1a9e7e";
     };
     deps = {
-      "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
+      "commondir-0.0.2" = self.by-version."commondir"."0.0.2";
       "lexical-scope-0.0.15" = self.by-version."lexical-scope"."0.0.15";
       "process-0.5.2" = self.by-version."process"."0.5.2";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
@@ -18093,9 +19709,9 @@
     deps = {
       "lexical-scope-0.1.0" = self.by-version."lexical-scope"."0.1.0";
       "process-0.5.2" = self.by-version."process"."0.5.2";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
     };
     optionalDependencies = {
     };
@@ -18103,26 +19719,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."insight"."0.4.3" =
-    self.by-version."insight"."0.4.3";
-  by-version."insight"."0.4.3" = self.buildNodePackage {
-    name = "insight-0.4.3";
-    version = "0.4.3";
+  by-spec."insight"."^0.5.0" =
+    self.by-version."insight"."0.5.3";
+  by-version."insight"."0.5.3" = self.buildNodePackage {
+    name = "insight-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/insight/-/insight-0.4.3.tgz";
-      name = "insight-0.4.3.tgz";
-      sha1 = "76d653c5c0d8048b03cdba6385a6948f74614af0";
+      url = "http://registry.npmjs.org/insight/-/insight-0.5.3.tgz";
+      name = "insight-0.5.3.tgz";
+      sha1 = "353626c1b86b12c7bdfecb0a54ef80cd7e6f89e0";
     };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
       "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
-      "inquirer-0.6.0" = self.by-version."inquirer"."0.6.0";
-      "lodash.debounce-2.4.1" = self.by-version."lodash.debounce"."2.4.1";
-      "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
+      "inquirer-0.8.2" = self.by-version."inquirer"."0.8.2";
+      "lodash.debounce-3.0.3" = self.by-version."lodash.debounce"."3.0.3";
+      "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
       "os-name-1.0.3" = self.by-version."os-name"."1.0.3";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
     };
     optionalDependencies = {
@@ -18188,6 +19804,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."interpret"."^0.5.2" =
+    self.by-version."interpret"."0.5.2";
+  by-version."interpret"."0.5.2" = self.buildNodePackage {
+    name = "interpret-0.5.2";
+    version = "0.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/interpret/-/interpret-0.5.2.tgz";
+      name = "interpret-0.5.2.tgz";
+      sha1 = "377833b04b5ea693ff0d533380e3dda0c0381be0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."intersect"."~0.0.3" =
     self.by-version."intersect"."0.0.3";
   by-version."intersect"."0.0.3" = self.buildNodePackage {
@@ -18207,7 +19842,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ip"."^0.3.0" =
+  by-spec."ip"."0.3.x" =
     self.by-version."ip"."0.3.2";
   by-version."ip"."0.3.2" = self.buildNodePackage {
     name = "ip-0.3.2";
@@ -18226,6 +19861,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ip"."^0.3.0" =
+    self.by-version."ip"."0.3.2";
   by-spec."ip-regex"."^1.0.0" =
     self.by-version."ip-regex"."1.0.3";
   by-version."ip-regex"."1.0.3" = self.buildNodePackage {
@@ -18284,16 +19921,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ipaddr.js"."0.1.8" =
-    self.by-version."ipaddr.js"."0.1.8";
-  by-version."ipaddr.js"."0.1.8" = self.buildNodePackage {
-    name = "ipaddr.js-0.1.8";
-    version = "0.1.8";
+  by-spec."ipaddr.js"."0.1.9" =
+    self.by-version."ipaddr.js"."0.1.9";
+  by-version."ipaddr.js"."0.1.9" = self.buildNodePackage {
+    name = "ipaddr.js-0.1.9";
+    version = "0.1.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.8.tgz";
-      name = "ipaddr.js-0.1.8.tgz";
-      sha1 = "27442eda77b626c44724b4aa8a1867e8410579ee";
+      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz";
+      name = "ipaddr.js-0.1.9.tgz";
+      sha1 = "a9c78ccc12dc9010f296ab9aef2f61f432d69efa";
     };
     deps = {
     };
@@ -18304,13 +19941,30 @@
     cpu = [ ];
   };
   by-spec."ipaddr.js".">= 0.1.1" =
-    self.by-version."ipaddr.js"."0.1.8";
+    self.by-version."ipaddr.js"."1.0.1";
+  by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
+    name = "ipaddr.js-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
+      name = "ipaddr.js-1.0.1.tgz";
+      sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ipaddr.js".">= 0.1.5" =
-    self.by-version."ipaddr.js"."0.1.8";
+    self.by-version."ipaddr.js"."1.0.1";
   by-spec."ipaddr.js".">=0.1.2" =
-    self.by-version."ipaddr.js"."0.1.8";
+    self.by-version."ipaddr.js"."1.0.1";
   by-spec."ipaddr.js"."^0.1.5" =
-    self.by-version."ipaddr.js"."0.1.8";
+    self.by-version."ipaddr.js"."0.1.9";
   by-spec."irc"."0.3.9" =
     self.by-version."irc"."0.3.9";
   by-version."irc"."0.3.9" = self.buildNodePackage {
@@ -18367,7 +20021,7 @@
     };
     deps = {
       "underscore-1.5.2" = self.by-version."underscore"."1.5.2";
-      "winston-0.9.0" = self.by-version."winston"."0.9.0";
+      "winston-1.0.0" = self.by-version."winston"."1.0.0";
       "nconf-0.7.1" = self.by-version."nconf"."0.7.1";
       "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1";
       "async-0.9.0" = self.by-version."async"."0.9.0";
@@ -18376,12 +20030,12 @@
       "passport-0.2.1" = self.by-version."passport"."0.2.1";
       "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2";
       "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
-      "mongoose-3.8.23" = self.by-version."mongoose"."3.8.23";
-      "gridfs-stream-1.0.1" = self.by-version."gridfs-stream"."1.0.1";
+      "mongoose-3.8.26" = self.by-version."mongoose"."3.8.26";
+      "gridfs-stream-1.1.1" = self.by-version."gridfs-stream"."1.1.1";
       "temp-0.8.1" = self.by-version."temp"."0.8.1";
-      "kue-0.8.11" = self.by-version."kue"."0.8.11";
+      "kue-0.8.12" = self.by-version."kue"."0.8.12";
       "redis-0.12.1" = self.by-version."redis"."0.12.1";
-      "hiredis-0.2.0" = self.by-version."hiredis"."0.2.0";
+      "hiredis-0.3.0" = self.by-version."hiredis"."0.3.0";
     };
     optionalDependencies = {
     };
@@ -18429,6 +20083,64 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-dotfile"."^1.0.0" =
+    self.by-version."is-dotfile"."1.0.0";
+  by-version."is-dotfile"."1.0.0" = self.buildNodePackage {
+    name = "is-dotfile-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.0.tgz";
+      name = "is-dotfile-1.0.0.tgz";
+      sha1 = "cfb6c7d7ebcb99e97ea8a353230dd4eea3e72825";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-equal-shallow"."^0.1.1" =
+    self.by-version."is-equal-shallow"."0.1.2";
+  by-version."is-equal-shallow"."0.1.2" = self.buildNodePackage {
+    name = "is-equal-shallow-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.2.tgz";
+      name = "is-equal-shallow-0.1.2.tgz";
+      sha1 = "89e619a1f9f1b37019a821c5fe23f93ad874f371";
+    };
+    deps = {
+      "is-primitive-1.0.0" = self.by-version."is-primitive"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-extglob"."^1.0.0" =
+    self.by-version."is-extglob"."1.0.0";
+  by-version."is-extglob"."1.0.0" = self.buildNodePackage {
+    name = "is-extglob-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz";
+      name = "is-extglob-1.0.0.tgz";
+      sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."is-finite"."^1.0.0" =
     self.by-version."is-finite"."1.0.0";
   by-version."is-finite"."1.0.0" = self.buildNodePackage {
@@ -18448,16 +20160,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-glob"."^0.3.0" =
-    self.by-version."is-glob"."0.3.0";
-  by-version."is-glob"."0.3.0" = self.buildNodePackage {
-    name = "is-glob-0.3.0";
-    version = "0.3.0";
+  by-spec."is-glob"."^1.1.1" =
+    self.by-version."is-glob"."1.1.3";
+  by-version."is-glob"."1.1.3" = self.buildNodePackage {
+    name = "is-glob-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-glob/-/is-glob-0.3.0.tgz";
-      name = "is-glob-0.3.0.tgz";
-      sha1 = "36f358abccfb33836406c44075b121a58736a382";
+      url = "http://registry.npmjs.org/is-glob/-/is-glob-1.1.3.tgz";
+      name = "is-glob-1.1.3.tgz";
+      sha1 = "b4c64b8303d39114492a460d364ccfb0d3c0a045";
     };
     deps = {
     };
@@ -18467,6 +20179,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-glob"."^1.1.3" =
+    self.by-version."is-glob"."1.1.3";
   by-spec."is-ip"."^1.0.0" =
     self.by-version."is-ip"."1.0.0";
   by-version."is-ip"."1.0.0" = self.buildNodePackage {
@@ -18487,6 +20201,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-my-json-valid"."^2.10.0" =
+    self.by-version."is-my-json-valid"."2.10.1";
+  by-version."is-my-json-valid"."2.10.1" = self.buildNodePackage {
+    name = "is-my-json-valid-2.10.1";
+    version = "2.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz";
+      name = "is-my-json-valid-2.10.1.tgz";
+      sha1 = "bf20ca7e71116302f8660ac812659f71e22ea2d0";
+    };
+    deps = {
+      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
+      "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1";
+      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."is-npm"."^1.0.0" =
     self.by-version."is-npm"."1.0.0";
   by-version."is-npm"."1.0.0" = self.buildNodePackage {
@@ -18506,6 +20243,84 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-number"."^0.1.1" =
+    self.by-version."is-number"."0.1.1";
+  by-version."is-number"."0.1.1" = self.buildNodePackage {
+    name = "is-number-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz";
+      name = "is-number-0.1.1.tgz";
+      sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-number"."^1.1.0" =
+    self.by-version."is-number"."1.1.2";
+  by-version."is-number"."1.1.2" = self.buildNodePackage {
+    name = "is-number-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-number/-/is-number-1.1.2.tgz";
+      name = "is-number-1.1.2.tgz";
+      sha1 = "9d82409f3a8a8beecf249b1bc7dada49829966e4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-number"."^1.1.2" =
+    self.by-version."is-number"."1.1.2";
+  by-spec."is-primitive"."^1.0.0" =
+    self.by-version."is-primitive"."1.0.0";
+  by-version."is-primitive"."1.0.0" = self.buildNodePackage {
+    name = "is-primitive-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-primitive/-/is-primitive-1.0.0.tgz";
+      name = "is-primitive-1.0.0.tgz";
+      sha1 = "c3677046fe11225017222204dd602503f7e5eb74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-primitive"."^2.0.0" =
+    self.by-version."is-primitive"."2.0.0";
+  by-version."is-primitive"."2.0.0" = self.buildNodePackage {
+    name = "is-primitive-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz";
+      name = "is-primitive-2.0.0.tgz";
+      sha1 = "207bab91638499c07b2adf240a41a87210034575";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."is-promise"."~1" =
     self.by-version."is-promise"."1.0.1";
   by-version."is-promise"."1.0.1" = self.buildNodePackage {
@@ -18525,7 +20340,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-root"."~1.0.0" =
+  by-spec."is-property"."^1.0.0" =
+    self.by-version."is-property"."1.0.2";
+  by-version."is-property"."1.0.2" = self.buildNodePackage {
+    name = "is-property-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+      name = "is-property-1.0.2.tgz";
+      sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-root"."^1.0.0" =
     self.by-version."is-root"."1.0.0";
   by-version."is-root"."1.0.0" = self.buildNodePackage {
     name = "is-root-1.0.0";
@@ -18605,16 +20439,54 @@
   };
   by-spec."isarray"."~0.0.1" =
     self.by-version."isarray"."0.0.1";
+  by-spec."isobject"."^0.2.0" =
+    self.by-version."isobject"."0.2.0";
+  by-version."isobject"."0.2.0" = self.buildNodePackage {
+    name = "isobject-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isobject/-/isobject-0.2.0.tgz";
+      name = "isobject-0.2.0.tgz";
+      sha1 = "a3432192f39b910b5f02cc989487836ec70aa85e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isobject"."^1.0.0" =
+    self.by-version."isobject"."1.0.0";
+  by-version."isobject"."1.0.0" = self.buildNodePackage {
+    name = "isobject-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isobject/-/isobject-1.0.0.tgz";
+      name = "isobject-1.0.0.tgz";
+      sha1 = "97fa6e8007c8e1251276be7565ce34ae69c90083";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."isstream"."0.1.x" =
-    self.by-version."isstream"."0.1.1";
-  by-version."isstream"."0.1.1" = self.buildNodePackage {
-    name = "isstream-0.1.1";
-    version = "0.1.1";
+    self.by-version."isstream"."0.1.2";
+  by-version."isstream"."0.1.2" = self.buildNodePackage {
+    name = "isstream-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz";
-      name = "isstream-0.1.1.tgz";
-      sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f";
+      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+      name = "isstream-0.1.2.tgz";
+      sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
     };
     deps = {
     };
@@ -18625,31 +20497,31 @@
     cpu = [ ];
   };
   by-spec."isstream"."~0.1.1" =
-    self.by-version."isstream"."0.1.1";
+    self.by-version."isstream"."0.1.2";
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.3.6";
-  by-version."istanbul"."0.3.6" = self.buildNodePackage {
-    name = "istanbul-0.3.6";
-    version = "0.3.6";
+    self.by-version."istanbul"."0.3.13";
+  by-version."istanbul"."0.3.13" = self.buildNodePackage {
+    name = "istanbul-0.3.13";
+    version = "0.3.13";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.6.tgz";
-      name = "istanbul-0.3.6.tgz";
-      sha1 = "e63ffc1d61de2f6344a899f80abdc0ef6491b17b";
+      url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.13.tgz";
+      name = "istanbul-0.3.13.tgz";
+      sha1 = "152dbcc195f01e9102fea48fe71084f583f6299c";
     };
     deps = {
-      "esprima-2.0.0" = self.by-version."esprima"."2.0.0";
-      "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
-      "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
+      "esprima-2.1.0" = self.by-version."esprima"."2.1.0";
+      "escodegen-1.6.1" = self.by-version."escodegen"."1.6.1";
+      "handlebars-3.0.0" = self.by-version."handlebars"."3.0.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1";
+      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
       "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
-      "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
       "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
@@ -18659,11 +20531,9 @@
     os = [ ];
     cpu = [ ];
   };
-  "istanbul" = self.by-version."istanbul"."0.3.6";
+  "istanbul" = self.by-version."istanbul"."0.3.13";
   by-spec."istanbul"."~0.3.0" =
-    self.by-version."istanbul"."0.3.6";
-  by-spec."istanbul"."~0.3.2" =
-    self.by-version."istanbul"."0.3.6";
+    self.by-version."istanbul"."0.3.13";
   by-spec."jade"."*" =
     self.by-version."jade"."1.9.2";
   by-version."jade"."1.9.2" = self.buildNodePackage {
@@ -18682,7 +20552,7 @@
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
       "void-elements-2.0.1" = self.by-version."void-elements"."2.0.1";
-      "with-4.0.1" = self.by-version."with"."4.0.1";
+      "with-4.0.3" = self.by-version."with"."4.0.3";
     };
     optionalDependencies = {
     };
@@ -18821,7 +20691,7 @@
     };
     deps = {
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "clone-0.2.0" = self.by-version."clone"."0.2.0";
     };
@@ -18832,6 +20702,27 @@
     cpu = [ ];
   };
   "jfs" = self.by-version."jfs"."0.2.5";
+  by-spec."jju"."1.x" =
+    self.by-version."jju"."1.2.0";
+  by-version."jju"."1.2.0" = self.buildNodePackage {
+    name = "jju-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jju/-/jju-1.2.0.tgz";
+      name = "jju-1.2.0.tgz";
+      sha1 = "add5b586fec853b44929d78bf94864ab577c02e9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jju"."^1.1.0" =
+    self.by-version."jju"."1.2.0";
   by-spec."js-string-escape"."^1.0.0" =
     self.by-version."js-string-escape"."1.0.0";
   by-version."js-string-escape"."1.0.0" = self.buildNodePackage {
@@ -18863,7 +20754,7 @@
       sha1 = "102790f265d986fe95a4d0f2a792e7a7bd886eec";
     };
     deps = {
-      "argparse-1.0.1" = self.by-version."argparse"."1.0.1";
+      "argparse-1.0.2" = self.by-version."argparse"."1.0.2";
       "esprima-2.0.0" = self.by-version."esprima"."2.0.0";
     };
     optionalDependencies = {
@@ -18936,6 +20827,10 @@
   };
   by-spec."js-yaml"."3.x" =
     self.by-version."js-yaml"."3.2.7";
+  by-spec."js-yaml"."3.x >=3.2" =
+    self.by-version."js-yaml"."3.2.7";
+  by-spec."js-yaml".">=3.0.1 <4.0.0-0" =
+    self.by-version."js-yaml"."3.2.7";
   by-spec."js-yaml"."^3.1.0" =
     self.by-version."js-yaml"."3.2.7";
   by-spec."js-yaml"."~2.0.5" =
@@ -18973,10 +20868,10 @@
     deps = {
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
       "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
       "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
-      "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
+      "cssstyle-0.2.23" = self.by-version."cssstyle"."0.2.23";
       "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
     };
     optionalDependencies = {
@@ -18999,10 +20894,10 @@
     deps = {
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
       "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
       "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
-      "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
+      "cssstyle-0.2.23" = self.by-version."cssstyle"."0.2.23";
       "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
     };
     optionalDependencies = {
@@ -19025,10 +20920,10 @@
     deps = {
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
       "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
       "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
-      "cssstyle-0.2.22" = self.by-version."cssstyle"."0.2.22";
+      "cssstyle-0.2.23" = self.by-version."cssstyle"."0.2.23";
       "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
     };
     optionalDependencies = {
@@ -19059,25 +20954,25 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.6.0";
-  by-version."jshint"."2.6.0" = self.buildNodePackage {
-    name = "jshint-2.6.0";
-    version = "2.6.0";
+    self.by-version."jshint"."2.7.0";
+  by-version."jshint"."2.7.0" = self.buildNodePackage {
+    name = "jshint-2.7.0";
+    version = "2.7.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jshint/-/jshint-2.6.0.tgz";
-      name = "jshint-2.6.0.tgz";
-      sha1 = "04e59d04da83aa32301d89115628274871597f33";
+      url = "http://registry.npmjs.org/jshint/-/jshint-2.7.0.tgz";
+      name = "jshint-2.7.0.tgz";
+      sha1 = "d512bb14731dac09e49f212e6b2f1b0fdbabbc4f";
     };
     deps = {
-      "cli-0.6.5" = self.by-version."cli"."0.6.5";
+      "cli-0.6.6" = self.by-version."cli"."0.6.6";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "exit-0.1.2" = self.by-version."exit"."0.1.2";
       "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
-      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0";
       "strip-json-comments-1.0.2" = self.by-version."strip-json-comments"."1.0.2";
-      "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
+      "lodash-3.6.0" = self.by-version."lodash"."3.6.0";
     };
     optionalDependencies = {
     };
@@ -19085,9 +20980,9 @@
     os = [ ];
     cpu = [ ];
   };
-  "jshint" = self.by-version."jshint"."2.6.0";
-  by-spec."jshint"."~2.6.0" =
-    self.by-version."jshint"."2.6.0";
+  "jshint" = self.by-version."jshint"."2.7.0";
+  by-spec."jshint"."^2.6.0" =
+    self.by-version."jshint"."2.7.0";
   by-spec."json"."*" =
     self.by-version."json"."9.0.3";
   by-version."json"."9.0.3" = self.buildNodePackage {
@@ -19127,6 +21022,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."json-parse-helpfulerror"."^1.0.2" =
+    self.by-version."json-parse-helpfulerror"."1.0.3";
+  by-version."json-parse-helpfulerror"."1.0.3" = self.buildNodePackage {
+    name = "json-parse-helpfulerror-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz";
+      name = "json-parse-helpfulerror-1.0.3.tgz";
+      sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc";
+    };
+    deps = {
+      "jju-1.2.0" = self.by-version."jju"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."json-schema"."0.2.2" =
     self.by-version."json-schema"."0.2.2";
   by-version."json-schema"."0.2.2" = self.buildNodePackage {
@@ -19185,6 +21100,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."json-stringify-safe"."~4.0.0" =
+    self.by-version."json-stringify-safe"."4.0.0";
+  by-version."json-stringify-safe"."4.0.0" = self.buildNodePackage {
+    name = "json-stringify-safe-4.0.0";
+    version = "4.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz";
+      name = "json-stringify-safe-4.0.0.tgz";
+      sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."json-stringify-safe"."~5.0.0" =
     self.by-version."json-stringify-safe"."5.0.0";
   by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage {
@@ -19337,6 +21271,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."jsonpointer"."^1.1.0" =
+    self.by-version."jsonpointer"."1.1.0";
+  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
+    name = "jsonpointer-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
+      name = "jsonpointer-1.1.0.tgz";
+      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."jsontool"."*" =
     self.by-version."jsontool"."7.0.2";
   by-version."jsontool"."7.0.2" = self.buildNodePackage {
@@ -19399,20 +21352,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jstransform"."^7.0.0" =
-    self.by-version."jstransform"."7.0.0";
-  by-version."jstransform"."7.0.0" = self.buildNodePackage {
-    name = "jstransform-7.0.0";
-    version = "7.0.0";
+  by-spec."jstransform"."^10.0.1" =
+    self.by-version."jstransform"."10.1.0";
+  by-version."jstransform"."10.1.0" = self.buildNodePackage {
+    name = "jstransform-10.1.0";
+    version = "10.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jstransform/-/jstransform-7.0.0.tgz";
-      name = "jstransform-7.0.0.tgz";
-      sha1 = "4f5b7fd0dce2d2ba8b7d0a3190b278ee8bf68a6c";
+      url = "http://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz";
+      name = "jstransform-10.1.0.tgz";
+      sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
     };
     deps = {
       "base62-0.1.1" = self.by-version."base62"."0.1.1";
-      "esprima-fb-7001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."7001.1.0-dev-harmony-fb";
+      "esprima-fb-13001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb";
       "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
     };
     optionalDependencies = {
@@ -19421,29 +21374,9 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jstransform"."^9.1.1" =
-    self.by-version."jstransform"."9.1.1";
-  by-version."jstransform"."9.1.1" = self.buildNodePackage {
-    name = "jstransform-9.1.1";
-    version = "9.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jstransform/-/jstransform-9.1.1.tgz";
-      name = "jstransform-9.1.1.tgz";
-      sha1 = "2085ae83ac4e28d5f247c56bf6e43404a85c4b14";
-    };
-    deps = {
-      "base62-0.1.1" = self.by-version."base62"."0.1.1";
-      "esprima-fb-12001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb";
-      "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."junk"."~1.0.0" =
+  by-spec."jstransform"."^10.1.0" =
+    self.by-version."jstransform"."10.1.0";
+  by-spec."junk"."^1.0.0" =
     self.by-version."junk"."1.0.1";
   by-version."junk"."1.0.1" = self.buildNodePackage {
     name = "junk-1.0.1";
@@ -19583,22 +21516,23 @@
     cpu = [ ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.12.31";
-  by-version."karma"."0.12.31" = self.buildNodePackage {
-    name = "karma-0.12.31";
-    version = "0.12.31";
+    self.by-version."karma"."0.12.32";
+  by-version."karma"."0.12.32" = self.buildNodePackage {
+    name = "karma-0.12.32";
+    version = "0.12.32";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma/-/karma-0.12.31.tgz";
-      name = "karma-0.12.31.tgz";
-      sha1 = "806aa7c2acb13a39edb9374a7a477e643a5e94c9";
+      url = "http://registry.npmjs.org/karma/-/karma-0.12.32.tgz";
+      name = "karma-0.12.32.tgz";
+      sha1 = "8d8277482bf6b29b13cf2d024ad9bbae18742a9a";
     };
     deps = {
       "di-0.0.1" = self.by-version."di"."0.0.1";
-      "socket.io-0.9.16" = self.by-version."socket.io"."0.9.16";
-      "chokidar-0.12.6" = self.by-version."chokidar"."0.12.6";
+      "socket.io-1.3.5" = self.by-version."socket.io"."1.3.5";
+      "chokidar-1.0.1" = self.by-version."chokidar"."1.0.1";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "expand-braces-0.1.1" = self.by-version."expand-braces"."0.1.1";
       "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
@@ -19606,11 +21540,12 @@
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "log4js-0.6.22" = self.by-version."log4js"."0.6.22";
+      "log4js-0.6.24" = self.by-version."log4js"."0.6.24";
       "useragent-2.0.10" = self.by-version."useragent"."2.0.10";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "connect-2.26.6" = self.by-version."connect"."2.26.6";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8";
     };
     optionalDependencies = {
     };
@@ -19618,63 +21553,63 @@
     os = [ ];
     cpu = [ ];
   };
-  "karma" = self.by-version."karma"."0.12.31";
+  "karma" = self.by-version."karma"."0.12.32";
   by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.12.31";
+    self.by-version."karma"."0.12.32";
   by-spec."karma".">=0.12.8" =
-    self.by-version."karma"."0.12.31";
+    self.by-version."karma"."0.12.32";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.12.31";
+    self.by-version."karma"."0.12.32";
   by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.12.31";
+    self.by-version."karma"."0.12.32";
   by-spec."karma"."~0.12.0" =
-    self.by-version."karma"."0.12.31";
+    self.by-version."karma"."0.12.32";
   by-spec."karma-chrome-launcher"."*" =
-    self.by-version."karma-chrome-launcher"."0.1.7";
-  by-version."karma-chrome-launcher"."0.1.7" = self.buildNodePackage {
-    name = "karma-chrome-launcher-0.1.7";
-    version = "0.1.7";
+    self.by-version."karma-chrome-launcher"."0.1.8";
+  by-version."karma-chrome-launcher"."0.1.8" = self.buildNodePackage {
+    name = "karma-chrome-launcher-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.7.tgz";
-      name = "karma-chrome-launcher-0.1.7.tgz";
-      sha1 = "c248cc01d5ae17dafdb16319d0badf637dfb6e59";
+      url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.8.tgz";
+      name = "karma-chrome-launcher-0.1.8.tgz";
+      sha1 = "5ba43f821f64f531e4ff1e7d86caf95df9ac9142";
     };
     deps = {
+      "which-1.0.9" = self.by-version."which"."1.0.9";
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"];
+      self.by-version."karma"."0.12.32"];
     os = [ ];
     cpu = [ ];
   };
-  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.7";
+  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.8";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.2.7";
-  by-version."karma-coverage"."0.2.7" = self.buildNodePackage {
-    name = "karma-coverage-0.2.7";
-    version = "0.2.7";
+    self.by-version."karma-coverage"."0.3.1";
+  by-version."karma-coverage"."0.3.1" = self.buildNodePackage {
+    name = "karma-coverage-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.2.7.tgz";
-      name = "karma-coverage-0.2.7.tgz";
-      sha1 = "f76740b275bbf30a0ab9f41d8cf56843a0994576";
+      url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.3.1.tgz";
+      name = "karma-coverage-0.3.1.tgz";
+      sha1 = "05c8861aec457b4857b827a10f5fec32cc11a4ae";
     };
     deps = {
-      "istanbul-0.3.6" = self.by-version."istanbul"."0.3.6";
-      "ibrik-2.0.0" = self.by-version."ibrik"."2.0.0";
+      "istanbul-0.3.13" = self.by-version."istanbul"."0.3.13";
       "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11";
       "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"];
+      self.by-version."karma"."0.12.32"];
     os = [ ];
     cpu = [ ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.2.7";
+  "karma-coverage" = self.by-version."karma-coverage"."0.3.1";
   by-spec."karma-junit-reporter"."*" =
     self.by-version."karma-junit-reporter"."0.2.2";
   by-version."karma-junit-reporter"."0.2.2" = self.buildNodePackage {
@@ -19692,7 +21627,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"];
+      self.by-version."karma"."0.12.32"];
     os = [ ];
     cpu = [ ];
   };
@@ -19713,8 +21648,8 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"
-      self.by-version."mocha"."2.1.0"];
+      self.by-version."karma"."0.12.32"
+      self.by-version."mocha"."2.2.4"];
     os = [ ];
     cpu = [ ];
   };
@@ -19735,8 +21670,8 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"
-      self.by-version."requirejs"."2.1.16"];
+      self.by-version."karma"."0.12.32"
+      self.by-version."requirejs"."2.1.17"];
     os = [ ];
     cpu = [ ];
   };
@@ -19761,7 +21696,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.31"];
+      self.by-version."karma"."0.12.32"];
     os = [ ];
     cpu = [ ];
   };
@@ -19789,7 +21724,7 @@
   };
   by-spec."keen.io"."~0.1.3" =
     self.by-version."keen.io"."0.1.3";
-  by-spec."keep-alive-agent"."0.0.1" =
+  by-spec."keep-alive-agent"."^0.0.1" =
     self.by-version."keep-alive-agent"."0.0.1";
   by-version."keep-alive-agent"."0.0.1" = self.buildNodePackage {
     name = "keep-alive-agent-0.0.1";
@@ -19846,19 +21781,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kerberos"."0.0.7" =
-    self.by-version."kerberos"."0.0.7";
-  by-version."kerberos"."0.0.7" = self.buildNodePackage {
-    name = "kerberos-0.0.7";
-    version = "0.0.7";
+  by-spec."kerberos"."0.0.9" =
+    self.by-version."kerberos"."0.0.9";
+  by-version."kerberos"."0.0.9" = self.buildNodePackage {
+    name = "kerberos-0.0.9";
+    version = "0.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.7.tgz";
-      name = "kerberos-0.0.7.tgz";
-      sha1 = "48db5e268e59ebb1626fd3c76ff8ff7f267a9852";
+      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz";
+      name = "kerberos-0.0.9.tgz";
+      sha1 = "595bf97e7e8aae5401ae313aea57bbf402e799c5";
     };
     deps = {
-      "nan-1.3.0" = self.by-version."nan"."1.3.0";
+      "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
     optionalDependencies = {
     };
@@ -19866,19 +21801,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kerberos"."0.0.9" =
-    self.by-version."kerberos"."0.0.9";
-  by-version."kerberos"."0.0.9" = self.buildNodePackage {
-    name = "kerberos-0.0.9";
-    version = "0.0.9";
+  by-spec."kerberos"."~0.0" =
+    self.by-version."kerberos"."0.0.10";
+  by-version."kerberos"."0.0.10" = self.buildNodePackage {
+    name = "kerberos-0.0.10";
+    version = "0.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz";
-      name = "kerberos-0.0.9.tgz";
-      sha1 = "595bf97e7e8aae5401ae313aea57bbf402e799c5";
+      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.10.tgz";
+      name = "kerberos-0.0.10.tgz";
+      sha1 = "bd4a9daa5f7b19dcd30038101d121e92bb8d3934";
     };
     deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -20002,23 +21937,23 @@
   };
   by-spec."keypress"."~0.2.1" =
     self.by-version."keypress"."0.2.1";
-  by-spec."kibana-authentication-proxy"."git://github.com/fangli/kibana-authentication-proxy" =
+  by-spec."kibana-authentication-proxy"."git://github.com/fangli/kibana-authentication-proxy.git" =
     self.by-version."kibana-authentication-proxy"."1.1.0";
   by-version."kibana-authentication-proxy"."1.1.0" = self.buildNodePackage {
     name = "kibana-authentication-proxy-1.1.0";
     version = "1.1.0";
     bin = false;
     src = fetchgit {
-      url = "git://github.com/fangli/kibana-authentication-proxy";
+      url = "git://github.com/fangli/kibana-authentication-proxy.git";
       rev = "0c0173b0cb51b392b7fc04d0cc728ffb64671ef3";
       sha256 = "dd2e42da959c359bf48d16993c6caf1d810241f7f37dfa4da911dd284571236f";
     };
     deps = {
-      "express-3.20.0" = self.by-version."express"."3.20.0";
+      "express-3.20.2" = self.by-version."express"."3.20.2";
       "passport-0.2.1" = self.by-version."passport"."0.2.1";
-      "passport-google-oauth-0.1.5" = self.by-version."passport-google-oauth"."0.1.5";
-      "connect-restreamer-1.0.1" = self.by-version."connect-restreamer"."1.0.1";
-      "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
+      "passport-google-oauth-0.2.0" = self.by-version."passport-google-oauth"."0.2.0";
+      "connect-restreamer-1.0.2" = self.by-version."connect-restreamer"."1.0.2";
+      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
     };
     optionalDependencies = {
     };
@@ -20027,16 +21962,37 @@
     cpu = [ ];
   };
   "kibana-authentication-proxy" = self.by-version."kibana-authentication-proxy"."1.1.0";
-  by-spec."knockout"."~3.2.0" =
-    self.by-version."knockout"."3.2.0";
-  by-version."knockout"."3.2.0" = self.buildNodePackage {
-    name = "knockout-3.2.0";
-    version = "3.2.0";
+  by-spec."kind-of"."^1.0.0" =
+    self.by-version."kind-of"."1.1.0";
+  by-version."kind-of"."1.1.0" = self.buildNodePackage {
+    name = "kind-of-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/knockout/-/knockout-3.2.0.tgz";
-      name = "knockout-3.2.0.tgz";
-      sha1 = "3f394eb67d721bea115e2d0d7be082256ca46a11";
+      url = "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz";
+      name = "kind-of-1.1.0.tgz";
+      sha1 = "140a3d2d41a36d2efcfa9377b62c24f8495a5c44";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."kind-of"."^1.1.0" =
+    self.by-version."kind-of"."1.1.0";
+  by-spec."knockout"."~3.3.0" =
+    self.by-version."knockout"."3.3.0";
+  by-version."knockout"."3.3.0" = self.buildNodePackage {
+    name = "knockout-3.3.0";
+    version = "3.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/knockout/-/knockout-3.3.0.tgz";
+      name = "knockout-3.3.0.tgz";
+      sha1 = "50502a4e2f1fe2bdfa0e52843cdfcbbd43bc374c";
     };
     deps = {
     };
@@ -20059,7 +22015,7 @@
     };
     deps = {
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
+      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "stream-counter-1.0.0" = self.by-version."stream-counter"."1.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
@@ -20072,25 +22028,27 @@
   };
   "knox" = self.by-version."knox"."0.9.2";
   by-spec."kue"."*" =
-    self.by-version."kue"."0.8.11";
-  by-version."kue"."0.8.11" = self.buildNodePackage {
-    name = "kue-0.8.11";
-    version = "0.8.11";
+    self.by-version."kue"."0.8.12";
+  by-version."kue"."0.8.12" = self.buildNodePackage {
+    name = "kue-0.8.12";
+    version = "0.8.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kue/-/kue-0.8.11.tgz";
-      name = "kue-0.8.11.tgz";
-      sha1 = "0e18c6f827b73deb68a6ee06b55c14d4797450b0";
+      url = "http://registry.npmjs.org/kue/-/kue-0.8.12.tgz";
+      name = "kue-0.8.12.tgz";
+      sha1 = "93cd035487289640b8f1e77e09dc62d2c6658918";
     };
     deps = {
-      "redis-0.10.3" = self.by-version."redis"."0.10.3";
+      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
       "express-3.1.2" = self.by-version."express"."3.1.2";
       "jade-1.1.5" = self.by-version."jade"."1.1.5";
-      "stylus-0.42.2" = self.by-version."stylus"."0.42.2";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "lodash-deep-1.5.3" = self.by-version."lodash-deep"."1.5.3";
+      "lodash-deep-1.6.0" = self.by-version."lodash-deep"."1.6.0";
       "nib-0.5.0" = self.by-version."nib"."0.5.0";
+      "redis-0.12.1" = self.by-version."redis"."0.12.1";
       "reds-0.2.5" = self.by-version."reds"."0.2.5";
+      "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
+      "stylus-0.42.2" = self.by-version."stylus"."0.42.2";
     };
     optionalDependencies = {
     };
@@ -20098,7 +22056,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "kue" = self.by-version."kue"."0.8.11";
+  "kue" = self.by-version."kue"."0.8.12";
   by-spec."labeled-stream-splicer"."^1.0.0" =
     self.by-version."labeled-stream-splicer"."1.0.2";
   by-version."labeled-stream-splicer"."1.0.2" = self.buildNodePackage {
@@ -20121,26 +22079,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."latest-version"."^0.2.0" =
-    self.by-version."latest-version"."0.2.0";
-  by-version."latest-version"."0.2.0" = self.buildNodePackage {
-    name = "latest-version-0.2.0";
-    version = "0.2.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz";
-      name = "latest-version-0.2.0.tgz";
-      sha1 = "adaf898d5f22380d3f9c45386efdff0a1b5b7501";
-    };
-    deps = {
-      "package-json-0.2.0" = self.by-version."package-json"."0.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."latest-version"."^1.0.0" =
     self.by-version."latest-version"."1.0.0";
   by-version."latest-version"."1.0.0" = self.buildNodePackage {
@@ -20231,7 +22169,7 @@
       sha1 = "a7a1cf861daf32deb39949c2eee8c9a9ed475c18";
     };
     deps = {
-      "through2-0.6.3" = self.by-version."through2"."0.6.3";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
       "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13";
     };
@@ -20268,6 +22206,34 @@
     cpu = [ ];
   };
   by-spec."less"."*" =
+    self.by-version."less"."2.5.0";
+  by-version."less"."2.5.0" = self.buildNodePackage {
+    name = "less-2.5.0";
+    version = "2.5.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/less/-/less-2.5.0.tgz";
+      name = "less-2.5.0.tgz";
+      sha1 = "11d6d611586de6d5f808220649bc9bbfe7ad5e17";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+      "errno-0.1.2" = self.by-version."errno"."0.1.2";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "image-size-0.3.5" = self.by-version."image-size"."0.3.5";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "promise-6.1.0" = self.by-version."promise"."6.1.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "less" = self.by-version."less"."2.5.0";
+  by-spec."less"."~2.4.0" =
     self.by-version."less"."2.4.0";
   by-version."less"."2.4.0" = self.buildNodePackage {
     name = "less-2.4.0";
@@ -20281,22 +22247,162 @@
     deps = {
     };
     optionalDependencies = {
-      "errno-0.1.1" = self.by-version."errno"."0.1.1";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "errno-0.1.2" = self.by-version."errno"."0.1.2";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "image-size-0.3.5" = self.by-version."image-size"."0.3.5";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "promise-6.1.0" = self.by-version."promise"."6.1.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "source-map-0.2.0" = self.by-version."source-map"."0.2.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "less" = self.by-version."less"."2.4.0";
-  by-spec."less"."^2.1.0" =
-    self.by-version."less"."2.4.0";
+  by-spec."level"."^0.18.0" =
+    self.by-version."level"."0.18.0";
+  by-version."level"."0.18.0" = self.buildNodePackage {
+    name = "level-0.18.0";
+    version = "0.18.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/level/-/level-0.18.0.tgz";
+      name = "level-0.18.0.tgz";
+      sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf";
+    };
+    deps = {
+      "leveldown-0.10.4" = self.by-version."leveldown"."0.10.4";
+      "level-packager-0.18.0" = self.by-version."level-packager"."0.18.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."level-packager"."~0.18.0" =
+    self.by-version."level-packager"."0.18.0";
+  by-version."level-packager"."0.18.0" = self.buildNodePackage {
+    name = "level-packager-0.18.0";
+    version = "0.18.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/level-packager/-/level-packager-0.18.0.tgz";
+      name = "level-packager-0.18.0.tgz";
+      sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5";
+    };
+    deps = {
+      "levelup-0.18.6" = self.by-version."levelup"."0.18.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."level-sublevel"."^6.3.15" =
+    self.by-version."level-sublevel"."6.4.6";
+  by-version."level-sublevel"."6.4.6" = self.buildNodePackage {
+    name = "level-sublevel-6.4.6";
+    version = "6.4.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/level-sublevel/-/level-sublevel-6.4.6.tgz";
+      name = "level-sublevel-6.4.6.tgz";
+      sha1 = "fdf5f65d1355b8a92a6792ede3a4f214b2594e9e";
+    };
+    deps = {
+      "pull-stream-2.21.0" = self.by-version."pull-stream"."2.21.0";
+      "ltgt-2.0.0" = self.by-version."ltgt"."2.0.0";
+      "levelup-0.19.0" = self.by-version."levelup"."0.19.0";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "bytewise-0.7.1" = self.by-version."bytewise"."0.7.1";
+      "typewiselite-1.0.0" = self.by-version."typewiselite"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."leveldown"."^0.10.2" =
+    self.by-version."leveldown"."0.10.4";
+  by-version."leveldown"."0.10.4" = self.buildNodePackage {
+    name = "leveldown-0.10.4";
+    version = "0.10.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/leveldown/-/leveldown-0.10.4.tgz";
+      name = "leveldown-0.10.4.tgz";
+      sha1 = "a35a18e20dd9754a53683d1a4851ff1b46bd2de7";
+    };
+    deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."leveldown"."~0.10.0" =
+    self.by-version."leveldown"."0.10.4";
+  by-spec."levelup"."^0.18.5" =
+    self.by-version."levelup"."0.18.6";
+  by-version."levelup"."0.18.6" = self.buildNodePackage {
+    name = "levelup-0.18.6";
+    version = "0.18.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz";
+      name = "levelup-0.18.6.tgz";
+      sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb";
+    };
+    deps = {
+      "bl-0.8.2" = self.by-version."bl"."0.8.2";
+      "deferred-leveldown-0.2.0" = self.by-version."deferred-leveldown"."0.2.0";
+      "errno-0.1.2" = self.by-version."errno"."0.1.2";
+      "prr-0.0.0" = self.by-version."prr"."0.0.0";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "semver-2.3.2" = self.by-version."semver"."2.3.2";
+      "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."levelup"."~0.18.0" =
+    self.by-version."levelup"."0.18.6";
+  by-spec."levelup"."~0.19.0" =
+    self.by-version."levelup"."0.19.0";
+  by-version."levelup"."0.19.0" = self.buildNodePackage {
+    name = "levelup-0.19.0";
+    version = "0.19.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/levelup/-/levelup-0.19.0.tgz";
+      name = "levelup-0.19.0.tgz";
+      sha1 = "f6b60a168c86c2fe5d5953476cbe9786ccf0a3f7";
+    };
+    deps = {
+      "bl-0.8.2" = self.by-version."bl"."0.8.2";
+      "deferred-leveldown-0.2.0" = self.by-version."deferred-leveldown"."0.2.0";
+      "errno-0.1.2" = self.by-version."errno"."0.1.2";
+      "prr-0.0.0" = self.by-version."prr"."0.0.0";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "semver-2.3.2" = self.by-version."semver"."2.3.2";
+      "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."levn"."~0.2.5" =
     self.by-version."levn"."0.2.5";
   by-version."levn"."0.2.5" = self.buildNodePackage {
@@ -20378,6 +22484,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lexicographic-integer"."^1.1.0" =
+    self.by-version."lexicographic-integer"."1.1.0";
+  by-version."lexicographic-integer"."1.1.0" = self.buildNodePackage {
+    name = "lexicographic-integer-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lexicographic-integer/-/lexicographic-integer-1.1.0.tgz";
+      name = "lexicographic-integer-1.1.0.tgz";
+      sha1 = "52ca6d998a572e6322b515f5b80e396c6043e9b8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."libbase64"."^0.1.0" =
     self.by-version."libbase64"."0.1.0";
   by-version."libbase64"."0.1.0" = self.buildNodePackage {
@@ -20397,7 +22522,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libmime"."^0.1.3" =
+  by-spec."libmime"."^0.1.5" =
     self.by-version."libmime"."0.1.7";
   by-version."libmime"."0.1.7" = self.buildNodePackage {
     name = "libmime-0.1.7";
@@ -20409,7 +22534,7 @@
       sha1 = "827b8d4df349e08c6cff1bc6d6b51ec57d349cb2";
     };
     deps = {
-      "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
+      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
       "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
       "libqp-0.1.1" = self.by-version."libqp"."0.1.1";
     };
@@ -20419,8 +22544,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libmime"."^0.1.5" =
-    self.by-version."libmime"."0.1.7";
+  by-spec."libmime"."^1.0.0" =
+    self.by-version."libmime"."1.0.0";
+  by-version."libmime"."1.0.0" = self.buildNodePackage {
+    name = "libmime-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/libmime/-/libmime-1.0.0.tgz";
+      name = "libmime-1.0.0.tgz";
+      sha1 = "d3351e4a7e402f34804eaf1a6558a8c985dabd31";
+    };
+    deps = {
+      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
+      "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
+      "libqp-1.0.0" = self.by-version."libqp"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."libqp"."^0.1.1" =
     self.by-version."libqp"."0.1.1";
   by-version."libqp"."0.1.1" = self.buildNodePackage {
@@ -20440,20 +22585,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libxmljs"."~0.10.0" =
-    self.by-version."libxmljs"."0.10.0";
-  by-version."libxmljs"."0.10.0" = self.buildNodePackage {
-    name = "libxmljs-0.10.0";
-    version = "0.10.0";
+  by-spec."libqp"."^1.0.0" =
+    self.by-version."libqp"."1.0.0";
+  by-version."libqp"."1.0.0" = self.buildNodePackage {
+    name = "libqp-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/libqp/-/libqp-1.0.0.tgz";
+      name = "libqp-1.0.0.tgz";
+      sha1 = "aded044d83970c152de5b983d39c3b2d291f9a74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."libxmljs"."^0.13.0" =
+    self.by-version."libxmljs"."0.13.0";
+  by-version."libxmljs"."0.13.0" = self.buildNodePackage {
+    name = "libxmljs-0.13.0";
+    version = "0.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.10.0.tgz";
-      name = "libxmljs-0.10.0.tgz";
-      sha1 = "847eb4b0545b02d1c235e1f8371818cf709d3256";
+      url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.13.0.tgz";
+      name = "libxmljs-0.13.0.tgz";
+      sha1 = "04df28df57a0927452f860148e5f462cbaed08ff";
     };
     deps = {
       "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
-      "nan-1.1.2" = self.by-version."nan"."1.1.2";
+      "nan-1.5.1" = self.by-version."nan"."1.5.1";
     };
     optionalDependencies = {
     };
@@ -20462,22 +22626,22 @@
     cpu = [ ];
   };
   by-spec."liftoff"."^2.0.1" =
-    self.by-version."liftoff"."2.0.1";
-  by-version."liftoff"."2.0.1" = self.buildNodePackage {
-    name = "liftoff-2.0.1";
-    version = "2.0.1";
+    self.by-version."liftoff"."2.0.3";
+  by-version."liftoff"."2.0.3" = self.buildNodePackage {
+    name = "liftoff-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/liftoff/-/liftoff-2.0.1.tgz";
-      name = "liftoff-2.0.1.tgz";
-      sha1 = "caa1ebe02fe5dc81660e50f7896173ea88908abe";
+      url = "http://registry.npmjs.org/liftoff/-/liftoff-2.0.3.tgz";
+      name = "liftoff-2.0.3.tgz";
+      sha1 = "fbab25362a506ac28a3db0c55cde9562fbd70456";
     };
     deps = {
-      "extend-1.3.0" = self.by-version."extend"."1.3.0";
+      "extend-2.0.0" = self.by-version."extend"."2.0.0";
       "findup-sync-0.2.1" = self.by-version."findup-sync"."0.2.1";
       "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
-      "resolve-1.0.0" = self.by-version."resolve"."1.0.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
     };
     optionalDependencies = {
     };
@@ -20485,7 +22649,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lockfile"."~1.0.0" =
+  by-spec."linkify-it"."~1.0.1" =
+    self.by-version."linkify-it"."1.0.1";
+  by-version."linkify-it"."1.0.1" = self.buildNodePackage {
+    name = "linkify-it-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/linkify-it/-/linkify-it-1.0.1.tgz";
+      name = "linkify-it-1.0.1.tgz";
+      sha1 = "73b32a4854d52438f59c6e09b6ded5be0abdd94a";
+    };
+    deps = {
+      "uc.micro-1.0.0" = self.by-version."uc.micro"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lockfile"."^1.0.0" =
     self.by-version."lockfile"."1.0.0";
   by-version."lockfile"."1.0.0" = self.buildNodePackage {
     name = "lockfile-1.0.0";
@@ -20504,16 +22688,37 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lockfile"."~0.4.0" =
+    self.by-version."lockfile"."0.4.3";
+  by-version."lockfile"."0.4.3" = self.buildNodePackage {
+    name = "lockfile-0.4.3";
+    version = "0.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.3.tgz";
+      name = "lockfile-0.4.3.tgz";
+      sha1 = "79b965ee9b32d9dd24b59cf81205e6dcb6d3b224";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lockfile"."~1.0.0" =
+    self.by-version."lockfile"."1.0.0";
   by-spec."lodash"."*" =
-    self.by-version."lodash"."3.3.0";
-  by-version."lodash"."3.3.0" = self.buildNodePackage {
-    name = "lodash-3.3.0";
-    version = "3.3.0";
+    self.by-version."lodash"."3.7.0";
+  by-version."lodash"."3.7.0" = self.buildNodePackage {
+    name = "lodash-3.7.0";
+    version = "3.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-3.3.0.tgz";
-      name = "lodash-3.3.0.tgz";
-      sha1 = "011ce52d01b14e60eaeea76acb9b8ba42c70581b";
+      url = "http://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
+      name = "lodash-3.7.0.tgz";
+      sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
     };
     deps = {
     };
@@ -20542,12 +22747,37 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lodash"."2.4.x" =
+    self.by-version."lodash"."2.4.1";
+  by-spec."lodash"."3.6.x" =
+    self.by-version."lodash"."3.6.0";
+  by-version."lodash"."3.6.0" = self.buildNodePackage {
+    name = "lodash-3.6.0";
+    version = "3.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz";
+      name = "lodash-3.6.0.tgz";
+      sha1 = "5266a8f49dd989be4f9f681b6f2a0c55285d0d9a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash".">= 3.2.0 < 4.0.0" =
+    self.by-version."lodash"."3.7.0";
   by-spec."lodash".">=2.4.1" =
-    self.by-version."lodash"."3.3.0";
+    self.by-version."lodash"."3.7.0";
   by-spec."lodash"."^2.4.1" =
     self.by-version."lodash"."2.4.1";
   by-spec."lodash"."^3.2.0" =
-    self.by-version."lodash"."3.3.0";
+    self.by-version."lodash"."3.7.0";
+  by-spec."lodash"."^3.3.1" =
+    self.by-version."lodash"."3.7.0";
   by-spec."lodash"."~0.9.2" =
     self.by-version."lodash"."0.9.2";
   by-version."lodash"."0.9.2" = self.buildNodePackage {
@@ -20568,15 +22798,15 @@
     cpu = [ ];
   };
   by-spec."lodash"."~1.0.1" =
-    self.by-version."lodash"."1.0.1";
-  by-version."lodash"."1.0.1" = self.buildNodePackage {
-    name = "lodash-1.0.1";
-    version = "1.0.1";
+    self.by-version."lodash"."1.0.2";
+  by-version."lodash"."1.0.2" = self.buildNodePackage {
+    name = "lodash-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-1.0.1.tgz";
-      name = "lodash-1.0.1.tgz";
-      sha1 = "57945732498d92310e5bd4b1ff4f273a79e6c9fc";
+      url = "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
+      name = "lodash-1.0.2.tgz";
+      sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
     };
     deps = {
     };
@@ -20607,16 +22837,16 @@
   };
   by-spec."lodash"."~2.4.1" =
     self.by-version."lodash"."2.4.1";
-  by-spec."lodash"."~3.2" =
-    self.by-version."lodash"."3.2.0";
-  by-version."lodash"."3.2.0" = self.buildNodePackage {
-    name = "lodash-3.2.0";
-    version = "3.2.0";
+  by-spec."lodash"."~3.5.0" =
+    self.by-version."lodash"."3.5.0";
+  by-version."lodash"."3.5.0" = self.buildNodePackage {
+    name = "lodash-3.5.0";
+    version = "3.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";
-      name = "lodash-3.2.0.tgz";
-      sha1 = "4bf50a3243f9aeb0bac41a55d3d5990675a462fb";
+      url = "http://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz";
+      name = "lodash-3.5.0.tgz";
+      sha1 = "19bb3f4d51278f0b8c818ed145c74ecf9fe40e6d";
     };
     deps = {
     };
@@ -20626,21 +22856,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash"."~3.3.0" =
-    self.by-version."lodash"."3.3.0";
+  by-spec."lodash"."~3.6.0" =
+    self.by-version."lodash"."3.6.0";
   by-spec."lodash-deep"."^1.1.0" =
-    self.by-version."lodash-deep"."1.5.3";
-  by-version."lodash-deep"."1.5.3" = self.buildNodePackage {
-    name = "lodash-deep-1.5.3";
-    version = "1.5.3";
+    self.by-version."lodash-deep"."1.6.0";
+  by-version."lodash-deep"."1.6.0" = self.buildNodePackage {
+    name = "lodash-deep-1.6.0";
+    version = "1.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.5.3.tgz";
-      name = "lodash-deep-1.5.3.tgz";
-      sha1 = "eeddfdd937ed24c2c903fc242cb15a26362321d2";
+      url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.6.0.tgz";
+      name = "lodash-deep-1.6.0.tgz";
+      sha1 = "a7ce672759472b91d12b193c69d8a24a02d8428d";
     };
     deps = {
-      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
+      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
     };
     optionalDependencies = {
     };
@@ -20668,15 +22898,15 @@
     cpu = [ ];
   };
   by-spec."lodash._basecopy"."^3.0.0" =
-    self.by-version."lodash._basecopy"."3.0.0";
-  by-version."lodash._basecopy"."3.0.0" = self.buildNodePackage {
-    name = "lodash._basecopy-3.0.0";
-    version = "3.0.0";
+    self.by-version."lodash._basecopy"."3.0.1";
+  by-version."lodash._basecopy"."3.0.1" = self.buildNodePackage {
+    name = "lodash._basecopy-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.0.tgz";
-      name = "lodash._basecopy-3.0.0.tgz";
-      sha1 = "4e9d01a982cf7f2bac7ba5adb85bb3ae069cb8e6";
+      url = "http://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz";
+      name = "lodash._basecopy-3.0.1.tgz";
+      sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36";
     };
     deps = {
     };
@@ -20724,16 +22954,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash._createpad"."^3.0.0" =
-    self.by-version."lodash._createpad"."3.0.1";
-  by-version."lodash._createpad"."3.0.1" = self.buildNodePackage {
-    name = "lodash._createpad-3.0.1";
-    version = "3.0.1";
+  by-spec."lodash._createpadding"."^3.0.0" =
+    self.by-version."lodash._createpadding"."3.6.0";
+  by-version."lodash._createpadding"."3.6.0" = self.buildNodePackage {
+    name = "lodash._createpadding-3.6.0";
+    version = "3.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._createpad/-/lodash._createpad-3.0.1.tgz";
-      name = "lodash._createpad-3.0.1.tgz";
-      sha1 = "90c6bdbc84c48edfa026896e31856b1a0ec50842";
+      url = "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz";
+      name = "lodash._createpadding-3.6.0.tgz";
+      sha1 = "c466850dd1a05e6bfec54fd0cf0db28b68332d5e";
     };
     deps = {
       "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0";
@@ -20745,53 +22975,15 @@
     cpu = [ ];
   };
   by-spec."lodash._isiterateecall"."^3.0.0" =
-    self.by-version."lodash._isiterateecall"."3.0.2";
-  by-version."lodash._isiterateecall"."3.0.2" = self.buildNodePackage {
-    name = "lodash._isiterateecall-3.0.2";
-    version = "3.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.2.tgz";
-      name = "lodash._isiterateecall-3.0.2.tgz";
-      sha1 = "08287668d0cb67dcd4e25194be3f4f563b16c013";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash._isnative"."~2.4.1" =
-    self.by-version."lodash._isnative"."2.4.1";
-  by-version."lodash._isnative"."2.4.1" = self.buildNodePackage {
-    name = "lodash._isnative-2.4.1";
-    version = "2.4.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz";
-      name = "lodash._isnative-2.4.1.tgz";
-      sha1 = "3ea6404b784a7be836c7b57580e1cdf79b14832c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash._objecttypes"."~2.4.1" =
-    self.by-version."lodash._objecttypes"."2.4.1";
-  by-version."lodash._objecttypes"."2.4.1" = self.buildNodePackage {
-    name = "lodash._objecttypes-2.4.1";
-    version = "2.4.1";
+    self.by-version."lodash._isiterateecall"."3.0.6";
+  by-version."lodash._isiterateecall"."3.0.6" = self.buildNodePackage {
+    name = "lodash._isiterateecall-3.0.6";
+    version = "3.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz";
-      name = "lodash._objecttypes-2.4.1.tgz";
-      sha1 = "7c0b7f69d98a1f76529f890b0cdb1b4dfec11c11";
+      url = "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.6.tgz";
+      name = "lodash._isiterateecall-3.0.6.tgz";
+      sha1 = "1dd246f647750123cba90f6826acf3eeb673ad41";
     };
     deps = {
     };
@@ -20858,21 +23050,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.debounce"."^2.4.1" =
-    self.by-version."lodash.debounce"."2.4.1";
-  by-version."lodash.debounce"."2.4.1" = self.buildNodePackage {
-    name = "lodash.debounce-2.4.1";
-    version = "2.4.1";
+  by-spec."lodash.debounce"."^3.0.1" =
+    self.by-version."lodash.debounce"."3.0.3";
+  by-version."lodash.debounce"."3.0.3" = self.buildNodePackage {
+    name = "lodash.debounce-3.0.3";
+    version = "3.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz";
-      name = "lodash.debounce-2.4.1.tgz";
-      sha1 = "d8cead246ec4b926e8b85678fc396bfeba8cc6fc";
+      url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.0.3.tgz";
+      name = "lodash.debounce-3.0.3.tgz";
+      sha1 = "f696762aedfa649c937c05a64e8a013ffd219c67";
     };
     deps = {
-      "lodash.isfunction-2.4.1" = self.by-version."lodash.isfunction"."2.4.1";
-      "lodash.isobject-2.4.1" = self.by-version."lodash.isobject"."2.4.1";
-      "lodash.now-2.4.1" = self.by-version."lodash.now"."2.4.1";
+      "lodash.isnative-3.0.2" = self.by-version."lodash.isnative"."3.0.2";
     };
     optionalDependencies = {
     };
@@ -20901,15 +23091,15 @@
     cpu = [ ];
   };
   by-spec."lodash.isarguments"."^3.0.0" =
-    self.by-version."lodash.isarguments"."3.0.0";
-  by-version."lodash.isarguments"."3.0.0" = self.buildNodePackage {
-    name = "lodash.isarguments-3.0.0";
-    version = "3.0.0";
+    self.by-version."lodash.isarguments"."3.0.1";
+  by-version."lodash.isarguments"."3.0.1" = self.buildNodePackage {
+    name = "lodash.isarguments-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.0.tgz";
-      name = "lodash.isarguments-3.0.0.tgz";
-      sha1 = "e94b8658069e52f924a8ea8be6718d2d0baf480f";
+      url = "http://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz";
+      name = "lodash.isarguments-3.0.1.tgz";
+      sha1 = "06fbbff019b5627837af7212f17f58c9f4f90e20";
     };
     deps = {
     };
@@ -20920,34 +23110,15 @@
     cpu = [ ];
   };
   by-spec."lodash.isarray"."^3.0.0" =
-    self.by-version."lodash.isarray"."3.0.0";
-  by-version."lodash.isarray"."3.0.0" = self.buildNodePackage {
-    name = "lodash.isarray-3.0.0";
-    version = "3.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.0.tgz";
-      name = "lodash.isarray-3.0.0.tgz";
-      sha1 = "356d4a93ffd7869a03292d8452c29ea398e68aa4";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash.isfunction"."~2.4.1" =
-    self.by-version."lodash.isfunction"."2.4.1";
-  by-version."lodash.isfunction"."2.4.1" = self.buildNodePackage {
-    name = "lodash.isfunction-2.4.1";
-    version = "2.4.1";
+    self.by-version."lodash.isarray"."3.0.2";
+  by-version."lodash.isarray"."3.0.2" = self.buildNodePackage {
+    name = "lodash.isarray-3.0.2";
+    version = "3.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz";
-      name = "lodash.isfunction-2.4.1.tgz";
-      sha1 = "2cfd575c73e498ab57e319b77fa02adef13a94d1";
+      url = "http://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz";
+      name = "lodash.isarray-3.0.2.tgz";
+      sha1 = "e12e08059abd32a640e024d2c8a0f673264326a8";
     };
     deps = {
     };
@@ -20958,37 +23129,17 @@
     cpu = [ ];
   };
   by-spec."lodash.isnative"."^3.0.0" =
-    self.by-version."lodash.isnative"."3.0.0";
-  by-version."lodash.isnative"."3.0.0" = self.buildNodePackage {
-    name = "lodash.isnative-3.0.0";
-    version = "3.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.0.tgz";
-      name = "lodash.isnative-3.0.0.tgz";
-      sha1 = "39e0a695377296528c14c36793f3801f6d6d0214";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash.isobject"."~2.4.1" =
-    self.by-version."lodash.isobject"."2.4.1";
-  by-version."lodash.isobject"."2.4.1" = self.buildNodePackage {
-    name = "lodash.isobject-2.4.1";
-    version = "2.4.1";
+    self.by-version."lodash.isnative"."3.0.2";
+  by-version."lodash.isnative"."3.0.2" = self.buildNodePackage {
+    name = "lodash.isnative-3.0.2";
+    version = "3.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz";
-      name = "lodash.isobject-2.4.1.tgz";
-      sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5";
+      url = "http://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz";
+      name = "lodash.isnative-3.0.2.tgz";
+      sha1 = "7fefcd1af13f1bd2bcb6b45a4597337a22b32ce1";
     };
     deps = {
-      "lodash._objecttypes-2.4.1" = self.by-version."lodash._objecttypes"."2.4.1";
     };
     optionalDependencies = {
     };
@@ -20997,40 +23148,20 @@
     cpu = [ ];
   };
   by-spec."lodash.keys"."^3.0.0" =
-    self.by-version."lodash.keys"."3.0.3";
-  by-version."lodash.keys"."3.0.3" = self.buildNodePackage {
-    name = "lodash.keys-3.0.3";
-    version = "3.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.3.tgz";
-      name = "lodash.keys-3.0.3.tgz";
-      sha1 = "5089c0bd05d3ade6aba807c9b2b7521c4c344d1c";
-    };
-    deps = {
-      "lodash.isarguments-3.0.0" = self.by-version."lodash.isarguments"."3.0.0";
-      "lodash.isarray-3.0.0" = self.by-version."lodash.isarray"."3.0.0";
-      "lodash.isnative-3.0.0" = self.by-version."lodash.isnative"."3.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash.now"."~2.4.1" =
-    self.by-version."lodash.now"."2.4.1";
-  by-version."lodash.now"."2.4.1" = self.buildNodePackage {
-    name = "lodash.now-2.4.1";
-    version = "2.4.1";
+    self.by-version."lodash.keys"."3.0.6";
+  by-version."lodash.keys"."3.0.6" = self.buildNodePackage {
+    name = "lodash.keys-3.0.6";
+    version = "3.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz";
-      name = "lodash.now-2.4.1.tgz";
-      sha1 = "6872156500525185faf96785bb7fe7fe15b562c6";
+      url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.6.tgz";
+      name = "lodash.keys-3.0.6.tgz";
+      sha1 = "8865dd881571c08484f4b6e0e8dede1bd2daf81e";
     };
     deps = {
-      "lodash._isnative-2.4.1" = self.by-version."lodash._isnative"."2.4.1";
+      "lodash.isarguments-3.0.1" = self.by-version."lodash.isarguments"."3.0.1";
+      "lodash.isarray-3.0.2" = self.by-version."lodash.isarray"."3.0.2";
+      "lodash.isnative-3.0.2" = self.by-version."lodash.isnative"."3.0.2";
     };
     optionalDependencies = {
     };
@@ -21039,19 +23170,19 @@
     cpu = [ ];
   };
   by-spec."lodash.pad"."^3.0.0" =
-    self.by-version."lodash.pad"."3.0.0";
-  by-version."lodash.pad"."3.0.0" = self.buildNodePackage {
-    name = "lodash.pad-3.0.0";
-    version = "3.0.0";
+    self.by-version."lodash.pad"."3.1.0";
+  by-version."lodash.pad"."3.1.0" = self.buildNodePackage {
+    name = "lodash.pad-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.0.0.tgz";
-      name = "lodash.pad-3.0.0.tgz";
-      sha1 = "1824e4756a3504b3af7b7a5b9d1f7501b43b2c25";
+      url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz";
+      name = "lodash.pad-3.1.0.tgz";
+      sha1 = "9f18b1f3749a95e197b5ff2ae752ea9851ada965";
     };
     deps = {
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
-      "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1";
+      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
     };
     optionalDependencies = {
     };
@@ -21060,19 +23191,19 @@
     cpu = [ ];
   };
   by-spec."lodash.padleft"."^3.0.0" =
-    self.by-version."lodash.padleft"."3.0.0";
-  by-version."lodash.padleft"."3.0.0" = self.buildNodePackage {
-    name = "lodash.padleft-3.0.0";
-    version = "3.0.0";
+    self.by-version."lodash.padleft"."3.1.0";
+  by-version."lodash.padleft"."3.1.0" = self.buildNodePackage {
+    name = "lodash.padleft-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.0.0.tgz";
-      name = "lodash.padleft-3.0.0.tgz";
-      sha1 = "448ac9e28ceb15d0ce9ae8e59dc9311ad17b4390";
+      url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.0.tgz";
+      name = "lodash.padleft-3.1.0.tgz";
+      sha1 = "ac94eeeb3ec4df6394b893c6f4f7faa5cb96a5c1";
     };
     deps = {
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
-      "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1";
+      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
     };
     optionalDependencies = {
     };
@@ -21081,39 +23212,19 @@
     cpu = [ ];
   };
   by-spec."lodash.padright"."^3.0.0" =
-    self.by-version."lodash.padright"."3.0.0";
-  by-version."lodash.padright"."3.0.0" = self.buildNodePackage {
-    name = "lodash.padright-3.0.0";
-    version = "3.0.0";
+    self.by-version."lodash.padright"."3.1.0";
+  by-version."lodash.padright"."3.1.0" = self.buildNodePackage {
+    name = "lodash.padright-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.0.0.tgz";
-      name = "lodash.padright-3.0.0.tgz";
-      sha1 = "caf2c8222c36d448fe0407b028630e6c5d1b06c6";
+      url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.0.tgz";
+      name = "lodash.padright-3.1.0.tgz";
+      sha1 = "155aa4ed10f4103829031a14516dcb5f3f6c777f";
     };
     deps = {
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
-      "lodash._createpad-3.0.1" = self.by-version."lodash._createpad"."3.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash.reescape"."^3.0.0" =
-    self.by-version."lodash.reescape"."3.0.1";
-  by-version."lodash.reescape"."3.0.1" = self.buildNodePackage {
-    name = "lodash.reescape-3.0.1";
-    version = "3.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.reescape/-/lodash.reescape-3.0.1.tgz";
-      name = "lodash.reescape-3.0.1.tgz";
-      sha1 = "16d27d4591a839a10b13cdff61dc9624ed237a23";
-    };
-    deps = {
-      "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0";
+      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
     };
     optionalDependencies = {
     };
@@ -21121,19 +23232,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.reevaluate"."^3.0.0" =
-    self.by-version."lodash.reevaluate"."3.0.1";
-  by-version."lodash.reevaluate"."3.0.1" = self.buildNodePackage {
-    name = "lodash.reevaluate-3.0.1";
-    version = "3.0.1";
+  by-spec."lodash.repeat"."^3.0.0" =
+    self.by-version."lodash.repeat"."3.0.0";
+  by-version."lodash.repeat"."3.0.0" = self.buildNodePackage {
+    name = "lodash.repeat-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.reevaluate/-/lodash.reevaluate-3.0.1.tgz";
-      name = "lodash.reevaluate-3.0.1.tgz";
-      sha1 = "6f67caca85c95bfd48f1df259e253d40988ca764";
+      url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz";
+      name = "lodash.repeat-3.0.0.tgz";
+      sha1 = "c340f4136c99dc5b2e397b3fd50cffbd172a94b0";
     };
     deps = {
-      "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0";
+      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
     };
     optionalDependencies = {
     };
@@ -21141,39 +23252,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.reinterpolate"."^3.0.0" =
-    self.by-version."lodash.reinterpolate"."3.0.1";
-  by-version."lodash.reinterpolate"."3.0.1" = self.buildNodePackage {
-    name = "lodash.reinterpolate-3.0.1";
-    version = "3.0.1";
+  by-spec."lodash.restparam"."^3.0.0" =
+    self.by-version."lodash.restparam"."3.6.1";
+  by-version."lodash.restparam"."3.6.1" = self.buildNodePackage {
+    name = "lodash.restparam-3.6.1";
+    version = "3.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.reinterpolate/-/lodash.reinterpolate-3.0.1.tgz";
-      name = "lodash.reinterpolate-3.0.1.tgz";
-      sha1 = "61aaa0667f0a5c521a9f8c31a06c72b8b684d6b0";
+      url = "http://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz";
+      name = "lodash.restparam-3.6.1.tgz";
+      sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805";
     };
     deps = {
-      "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash.repeat"."^3.0.0" =
-    self.by-version."lodash.repeat"."3.0.0";
-  by-version."lodash.repeat"."3.0.0" = self.buildNodePackage {
-    name = "lodash.repeat-3.0.0";
-    version = "3.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz";
-      name = "lodash.repeat-3.0.0.tgz";
-      sha1 = "c340f4136c99dc5b2e397b3fd50cffbd172a94b0";
-    };
-    deps = {
-      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
     };
     optionalDependencies = {
     };
@@ -21182,24 +23272,26 @@
     cpu = [ ];
   };
   by-spec."lodash.template"."^3.0.0" =
-    self.by-version."lodash.template"."3.3.0";
-  by-version."lodash.template"."3.3.0" = self.buildNodePackage {
-    name = "lodash.template-3.3.0";
-    version = "3.3.0";
+    self.by-version."lodash.template"."3.5.0";
+  by-version."lodash.template"."3.5.0" = self.buildNodePackage {
+    name = "lodash.template-3.5.0";
+    version = "3.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.template/-/lodash.template-3.3.0.tgz";
-      name = "lodash.template-3.3.0.tgz";
-      sha1 = "7392a42a6f18cf3cbaac587c01b7f922a0529b09";
+      url = "http://registry.npmjs.org/lodash.template/-/lodash.template-3.5.0.tgz";
+      name = "lodash.template-3.5.0.tgz";
+      sha1 = "79a4fa335599e7ab649db8d1637b3ecaeed07aef";
     };
     deps = {
-      "lodash._basecopy-3.0.0" = self.by-version."lodash._basecopy"."3.0.0";
+      "lodash._basecopy-3.0.1" = self.by-version."lodash._basecopy"."3.0.1";
       "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
       "lodash._basevalues-3.0.0" = self.by-version."lodash._basevalues"."3.0.0";
-      "lodash._isiterateecall-3.0.2" = self.by-version."lodash._isiterateecall"."3.0.2";
+      "lodash._isiterateecall-3.0.6" = self.by-version."lodash._isiterateecall"."3.0.6";
       "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
       "lodash.escape-3.0.0" = self.by-version."lodash.escape"."3.0.0";
-      "lodash.keys-3.0.3" = self.by-version."lodash.keys"."3.0.3";
+      "lodash.isnative-3.0.2" = self.by-version."lodash.isnative"."3.0.2";
+      "lodash.keys-3.0.6" = self.by-version."lodash.keys"."3.0.6";
+      "lodash.restparam-3.6.1" = self.by-version."lodash.restparam"."3.6.1";
       "lodash.templatesettings-3.1.0" = self.by-version."lodash.templatesettings"."3.1.0";
     };
     optionalDependencies = {
@@ -21249,20 +23341,21 @@
     cpu = [ ];
   };
   by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.22";
-  by-version."log4js"."0.6.22" = self.buildNodePackage {
-    name = "log4js-0.6.22";
-    version = "0.6.22";
+    self.by-version."log4js"."0.6.24";
+  by-version."log4js"."0.6.24" = self.buildNodePackage {
+    name = "log4js-0.6.24";
+    version = "0.6.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/log4js/-/log4js-0.6.22.tgz";
-      name = "log4js-0.6.22.tgz";
-      sha1 = "dd0ed7c961eec19eaf47dad9f39fee2b7dc71a4c";
+      url = "http://registry.npmjs.org/log4js/-/log4js-0.6.24.tgz";
+      name = "log4js-0.6.24.tgz";
+      sha1 = "33cb11f14d3a48834867037aff292a046f6aae50";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "semver-1.1.4" = self.by-version."semver"."1.1.4";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
     };
     optionalDependencies = {
     };
@@ -21368,15 +23461,15 @@
     cpu = [ ];
   };
   by-spec."lru-cache"."2" =
-    self.by-version."lru-cache"."2.5.0";
-  by-version."lru-cache"."2.5.0" = self.buildNodePackage {
-    name = "lru-cache-2.5.0";
-    version = "2.5.0";
+    self.by-version."lru-cache"."2.6.1";
+  by-version."lru-cache"."2.6.1" = self.buildNodePackage {
+    name = "lru-cache-2.6.1";
+    version = "2.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.0.tgz";
-      name = "lru-cache-2.5.0.tgz";
-      sha1 = "d82388ae9c960becbea0c73bb9eb79b6c6ce9aeb";
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz";
+      name = "lru-cache-2.6.1.tgz";
+      sha1 = "9933eff15453fae1d27096365143c724e85c6cbd";
     };
     deps = {
     };
@@ -21424,37 +23517,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lru-cache"."2.3.0" =
-    self.by-version."lru-cache"."2.3.0";
-  by-version."lru-cache"."2.3.0" = self.buildNodePackage {
-    name = "lru-cache-2.3.0";
-    version = "2.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.0.tgz";
-      name = "lru-cache-2.3.0.tgz";
-      sha1 = "1cee12d5a9f28ed1ee37e9c332b8888e6b85412a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."lru-cache"."2.5.x" =
-    self.by-version."lru-cache"."2.5.0";
-  by-spec."lru-cache"."~1.0.2" =
-    self.by-version."lru-cache"."1.0.6";
-  by-version."lru-cache"."1.0.6" = self.buildNodePackage {
-    name = "lru-cache-1.0.6";
-    version = "1.0.6";
+    self.by-version."lru-cache"."2.5.2";
+  by-version."lru-cache"."2.5.2" = self.buildNodePackage {
+    name = "lru-cache-2.5.2";
+    version = "2.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
-      name = "lru-cache-1.0.6.tgz";
-      sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz";
+      name = "lru-cache-2.5.2.tgz";
+      sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c";
     };
     deps = {
     };
@@ -21464,6 +23536,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lru-cache"."^2.5.0" =
+    self.by-version."lru-cache"."2.6.1";
   by-spec."lru-cache"."~2.3.0" =
     self.by-version."lru-cache"."2.3.1";
   by-version."lru-cache"."2.3.1" = self.buildNodePackage {
@@ -21484,7 +23558,9 @@
     cpu = [ ];
   };
   by-spec."lru-cache"."~2.5.0" =
-    self.by-version."lru-cache"."2.5.0";
+    self.by-version."lru-cache"."2.5.2";
+  by-spec."lru-cache"."~2.6.1" =
+    self.by-version."lru-cache"."2.6.1";
   by-spec."lru-queue"."0.1" =
     self.by-version."lru-queue"."0.1.0";
   by-version."lru-queue"."0.1.0" = self.buildNodePackage {
@@ -21524,6 +23600,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ltgt"."~1.0.2" =
+    self.by-version."ltgt"."1.0.2";
+  by-version."ltgt"."1.0.2" = self.buildNodePackage {
+    name = "ltgt-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ltgt/-/ltgt-1.0.2.tgz";
+      name = "ltgt-1.0.2.tgz";
+      sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ltgt"."~2.0.0" =
+    self.by-version."ltgt"."2.0.0";
+  by-version."ltgt"."2.0.0" = self.buildNodePackage {
+    name = "ltgt-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ltgt/-/ltgt-2.0.0.tgz";
+      name = "ltgt-2.0.0.tgz";
+      sha1 = "b40ed1e337caf577c0a963f9cffbc680318009c2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ltx"."*" =
     self.by-version."ltx"."0.9.0";
   by-version."ltx"."0.9.0" = self.buildNodePackage {
@@ -21537,7 +23651,7 @@
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
+      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -21548,8 +23662,6 @@
   "ltx" = self.by-version."ltx"."0.9.0";
   by-spec."ltx"."0.x" =
     self.by-version."ltx"."0.9.0";
-  by-spec."ltx".">= 0.2.0" =
-    self.by-version."ltx"."0.9.0";
   by-spec."ltx"."^0.5.2" =
     self.by-version."ltx"."0.5.2";
   by-version."ltx"."0.5.2" = self.buildNodePackage {
@@ -21563,7 +23675,7 @@
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
+      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -21573,43 +23685,22 @@
   };
   by-spec."ltx"."^0.9.0" =
     self.by-version."ltx"."0.9.0";
-  by-spec."ltx"."~0.3.2" =
-    self.by-version."ltx"."0.3.4";
-  by-version."ltx"."0.3.4" = self.buildNodePackage {
-    name = "ltx-0.3.4";
-    version = "0.3.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ltx/-/ltx-0.3.4.tgz";
-      name = "ltx-0.3.4.tgz";
-      sha1 = "3cc8d3af3cf08914383b19e8ab60b1f396e1e984";
-    };
-    deps = {
-      "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "node-expat-2.1.4" = self.by-version."node-expat"."2.1.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ltx"."~0.3.3" =
-    self.by-version."ltx"."0.3.4";
-  by-spec."ltx"."~0.6.0" =
-    self.by-version."ltx"."0.6.0";
-  by-version."ltx"."0.6.0" = self.buildNodePackage {
-    name = "ltx-0.6.0";
-    version = "0.6.0";
+  by-spec."ltx"."~0.9.0" =
+    self.by-version."ltx"."0.9.0";
+  by-spec."ltx"."~0.x" =
+    self.by-version."ltx"."0.9.0";
+  by-spec."lunr".">=0.5.2 <1.0.0-0" =
+    self.by-version."lunr"."0.5.8";
+  by-version."lunr"."0.5.8" = self.buildNodePackage {
+    name = "lunr-0.5.8";
+    version = "0.5.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ltx/-/ltx-0.6.0.tgz";
-      name = "ltx-0.6.0.tgz";
-      sha1 = "16470236570a2c436744a3c4adb8a4b15ea1acc7";
+      url = "http://registry.npmjs.org/lunr/-/lunr-0.5.8.tgz";
+      name = "lunr-0.5.8.tgz";
+      sha1 = "1e491cdce223fcea988ea117acdf3f6bd628f9ec";
     };
     deps = {
-      "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
     };
     optionalDependencies = {
     };
@@ -21617,8 +23708,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ltx"."~0.x" =
-    self.by-version."ltx"."0.9.0";
   by-spec."m8".">= 0.4.3" =
     self.by-version."m8"."0.4.4";
   by-version."m8"."0.4.4" = self.buildNodePackage {
@@ -21658,6 +23747,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."magnet-uri"."^4.0.0" =
+    self.by-version."magnet-uri"."4.2.2";
+  by-version."magnet-uri"."4.2.2" = self.buildNodePackage {
+    name = "magnet-uri-4.2.2";
+    version = "4.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.2.tgz";
+      name = "magnet-uri-4.2.2.tgz";
+      sha1 = "26a445b7d9acb3da29ba8cda85cf0fc0dbf07d24";
+    };
+    deps = {
+      "flatten-0.0.1" = self.by-version."flatten"."0.0.1";
+      "thirty-two-0.0.2" = self.by-version."thirty-two"."0.0.2";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."magnet-uri"."~2.0.0" =
     self.by-version."magnet-uri"."2.0.1";
   by-spec."mailchimp".">=1.1.0" =
@@ -21672,7 +23783,7 @@
       sha1 = "253220f0091724b1033fadcf9f8aaad68dcad309";
     };
     deps = {
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "qs-0.5.6" = self.by-version."qs"."0.5.6";
     };
     optionalDependencies = {
@@ -21708,15 +23819,15 @@
   by-spec."mailcomposer"."~0.2.10" =
     self.by-version."mailcomposer"."0.2.12";
   by-spec."mailgun-js"."^0.6.7" =
-    self.by-version."mailgun-js"."0.6.8";
-  by-version."mailgun-js"."0.6.8" = self.buildNodePackage {
-    name = "mailgun-js-0.6.8";
-    version = "0.6.8";
+    self.by-version."mailgun-js"."0.6.9";
+  by-version."mailgun-js"."0.6.9" = self.buildNodePackage {
+    name = "mailgun-js-0.6.9";
+    version = "0.6.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mailgun-js/-/mailgun-js-0.6.8.tgz";
-      name = "mailgun-js-0.6.8.tgz";
-      sha1 = "64a1aab7036b8161a7c619037d820d6c50fe83ab";
+      url = "http://registry.npmjs.org/mailgun-js/-/mailgun-js-0.6.9.tgz";
+      name = "mailgun-js-0.6.9.tgz";
+      sha1 = "1bdc22b636a249b6870e920695b8338370b2cf98";
     };
     deps = {
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
@@ -21725,7 +23836,7 @@
       "proxy-agent-1.1.0" = self.by-version."proxy-agent"."1.1.0";
       "q-1.1.2" = self.by-version."q"."1.1.2";
       "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -21752,6 +23863,30 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."markdown-it"."4.x" =
+    self.by-version."markdown-it"."4.1.2";
+  by-version."markdown-it"."4.1.2" = self.buildNodePackage {
+    name = "markdown-it-4.1.2";
+    version = "4.1.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/markdown-it/-/markdown-it-4.1.2.tgz";
+      name = "markdown-it-4.1.2.tgz";
+      sha1 = "f6fe57e03618f36f49bc6312928c83cedf77c6ac";
+    };
+    deps = {
+      "argparse-1.0.2" = self.by-version."argparse"."1.0.2";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+      "linkify-it-1.0.1" = self.by-version."linkify-it"."1.0.1";
+      "mdurl-1.0.0" = self.by-version."mdurl"."1.0.0";
+      "uc.micro-1.0.0" = self.by-version."uc.micro"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."marked"."*" =
     self.by-version."marked"."0.3.3";
   by-version."marked"."0.3.3" = self.buildNodePackage {
@@ -21797,42 +23932,21 @@
     cpu = [ ];
   };
   by-spec."maxmin"."^1.0.0" =
-    self.by-version."maxmin"."1.0.0";
-  by-version."maxmin"."1.0.0" = self.buildNodePackage {
-    name = "maxmin-1.0.0";
-    version = "1.0.0";
+    self.by-version."maxmin"."1.1.0";
+  by-version."maxmin"."1.1.0" = self.buildNodePackage {
+    name = "maxmin-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/maxmin/-/maxmin-1.0.0.tgz";
-      name = "maxmin-1.0.0.tgz";
-      sha1 = "040b7a15ba5c6f3b08581cbf201df0bdd64e19f0";
+      url = "http://registry.npmjs.org/maxmin/-/maxmin-1.1.0.tgz";
+      name = "maxmin-1.1.0.tgz";
+      sha1 = "71365e84a99dd8f8b3f7d5fde2f00d1e7f73be61";
     };
     deps = {
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
       "figures-1.3.5" = self.by-version."figures"."1.3.5";
       "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0";
-      "pretty-bytes-1.0.3" = self.by-version."pretty-bytes"."1.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mdns-js"."git+https://github.com/guerrerocarlos/node-mdns-js" =
-    self.by-version."mdns-js"."0.2.5";
-  by-version."mdns-js"."0.2.5" = self.buildNodePackage {
-    name = "mdns-js-0.2.5";
-    version = "0.2.5";
-    bin = false;
-    src = fetchgit {
-      url = "https://github.com/guerrerocarlos/node-mdns-js";
-      rev = "1d50693cc1f193eadea8c723ceafd6ed565ad8bb";
-      sha256 = "b5e989409eb45288271f11970ce6f9e7668c5ab20991f9326a679aaaff8685ae";
-    };
-    deps = {
-      "debug-0.8.1" = self.by-version."debug"."0.8.1";
-      "mdns-js-packet-0.1.9" = self.by-version."mdns-js-packet"."0.1.9";
+      "pretty-bytes-1.0.4" = self.by-version."pretty-bytes"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -21840,21 +23954,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mdns-js"."git+https://github.com/xat/node-mdns-js#reuseAddr" =
-    self.by-version."mdns-js"."0.2.9";
-  by-version."mdns-js"."0.2.9" = self.buildNodePackage {
-    name = "mdns-js-0.2.9";
-    version = "0.2.9";
+  by-spec."mdns-js"."*" =
+    self.by-version."mdns-js"."0.3.1";
+  by-version."mdns-js"."0.3.1" = self.buildNodePackage {
+    name = "mdns-js-0.3.1";
+    version = "0.3.1";
     bin = false;
-    src = fetchgit {
-      url = "https://github.com/xat/node-mdns-js";
-      rev = "bc5598ff86c441cb256503e3d951e8b6b8079e8a";
-      sha256 = "93595e09e7802a67c1923630be4ac20410f0ac8b89c34e200b943f7157f395f6";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mdns-js/-/mdns-js-0.3.1.tgz";
+      name = "mdns-js-0.3.1.tgz";
+      sha1 = "a2bcf301d23f271a9432505fff22103352510ae3";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -21874,7 +23988,7 @@
       sha1 = "e5a205c6e26e22a1df58e5f38057e80a6f84ee26";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "qap-3.1.3" = self.by-version."qap"."3.1.3";
     };
     optionalDependencies = {
@@ -21883,20 +23997,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mdns-js-packet"."guerrerocarlos/node-mdns-js-packet" =
-    self.by-version."mdns-js-packet"."0.1.9";
-  by-version."mdns-js-packet"."0.1.9" = self.buildNodePackage {
-    name = "mdns-js-packet-0.1.9";
-    version = "0.1.9";
+  by-spec."mdurl"."~1.0.0" =
+    self.by-version."mdurl"."1.0.0";
+  by-version."mdurl"."1.0.0" = self.buildNodePackage {
+    name = "mdurl-1.0.0";
+    version = "1.0.0";
     bin = false;
-    src = fetchgit {
-      url = "git://github.com/guerrerocarlos/node-mdns-js-packet";
-      rev = "7f26b7010e589462713d0c8a46b040e0adf424f9";
-      sha256 = "f5a40610eb321ea411a8fa9fe9af21edb1282c062fb63692ffee4d30590ae995";
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mdurl/-/mdurl-1.0.0.tgz";
+      name = "mdurl-1.0.0.tgz";
+      sha1 = "307f6d36dbf2777bf0c6278a7101e6f5b05cb2b3";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "qap-3.1.3" = self.by-version."qap"."3.1.3";
     };
     optionalDependencies = {
     };
@@ -21968,7 +24080,29 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."memoizee"."0.3.x" =
+  by-spec."memdown"."^0.10.2" =
+    self.by-version."memdown"."0.10.2";
+  by-version."memdown"."0.10.2" = self.buildNodePackage {
+    name = "memdown-0.10.2";
+    version = "0.10.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/memdown/-/memdown-0.10.2.tgz";
+      name = "memdown-0.10.2.tgz";
+      sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608";
+    };
+    deps = {
+      "abstract-leveldown-0.12.4" = self.by-version."abstract-leveldown"."0.12.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "ltgt-1.0.2" = self.by-version."ltgt"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."memoizee"."~0.3.8" =
     self.by-version."memoizee"."0.3.8";
   by-version."memoizee"."0.3.8" = self.buildNodePackage {
     name = "memoizee-0.3.8";
@@ -21982,7 +24116,7 @@
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
       "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
-      "es6-weak-map-0.1.2" = self.by-version."es6-weak-map"."0.1.2";
+      "es6-weak-map-0.1.4" = self.by-version."es6-weak-map"."0.1.4";
       "event-emitter-0.3.3" = self.by-version."event-emitter"."0.3.3";
       "lru-queue-0.1.0" = self.by-version."lru-queue"."0.1.0";
       "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2";
@@ -22035,20 +24169,20 @@
     cpu = [ ];
   };
   by-spec."meow"."*" =
-    self.by-version."meow"."3.0.0";
-  by-version."meow"."3.0.0" = self.buildNodePackage {
-    name = "meow-3.0.0";
-    version = "3.0.0";
+    self.by-version."meow"."3.1.0";
+  by-version."meow"."3.1.0" = self.buildNodePackage {
+    name = "meow-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/meow/-/meow-3.0.0.tgz";
-      name = "meow-3.0.0.tgz";
-      sha1 = "07c0edaade76c77498618d119aebb18a28d91b6d";
+      url = "http://registry.npmjs.org/meow/-/meow-3.1.0.tgz";
+      name = "meow-3.1.0.tgz";
+      sha1 = "5974708a0fe0dcbf27e0e6a49120b4c5e82c3cea";
     };
     deps = {
       "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
       "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
       "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
     };
     optionalDependencies = {
@@ -22058,7 +24192,9 @@
     cpu = [ ];
   };
   by-spec."meow"."^3.0.0" =
-    self.by-version."meow"."3.0.0";
+    self.by-version."meow"."3.1.0";
+  by-spec."meow"."^3.1.0" =
+    self.by-version."meow"."3.1.0";
   by-spec."merge-descriptors"."0.0.2" =
     self.by-version."merge-descriptors"."0.0.2";
   by-version."merge-descriptors"."0.0.2" = self.buildNodePackage {
@@ -22078,6 +24214,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."merge-descriptors"."1.0.0" =
+    self.by-version."merge-descriptors"."1.0.0";
+  by-version."merge-descriptors"."1.0.0" = self.buildNodePackage {
+    name = "merge-descriptors-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
+      name = "merge-descriptors-1.0.0.tgz";
+      sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."method-override"."1.0.0" =
     self.by-version."method-override"."1.0.0";
   by-version."method-override"."1.0.0" = self.buildNodePackage {
@@ -22141,19 +24296,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."method-override"."~2.3.1" =
-    self.by-version."method-override"."2.3.1";
-  by-version."method-override"."2.3.1" = self.buildNodePackage {
-    name = "method-override-2.3.1";
-    version = "2.3.1";
+  by-spec."method-override"."~2.3.2" =
+    self.by-version."method-override"."2.3.2";
+  by-version."method-override"."2.3.2" = self.buildNodePackage {
+    name = "method-override-2.3.2";
+    version = "2.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/method-override/-/method-override-2.3.1.tgz";
-      name = "method-override-2.3.1.tgz";
-      sha1 = "59796b7ce565ae9f77f3b312447d2c0f938f93c6";
+      url = "http://registry.npmjs.org/method-override/-/method-override-2.3.2.tgz";
+      name = "method-override-2.3.2.tgz";
+      sha1 = "f2433fb27b6c087efb8812628727fb8cfd93a793";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "methods-1.1.1" = self.by-version."methods"."1.1.1";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
       "vary-1.0.0" = self.by-version."vary"."1.0.0";
@@ -22278,8 +24433,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."methods"."1.1.1" =
-    self.by-version."methods"."1.1.1";
   by-spec."methods"."1.x" =
     self.by-version."methods"."1.1.1";
   by-spec."methods"."~1.1.1" =
@@ -22303,6 +24456,35 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."micromatch"."^2.1.0" =
+    self.by-version."micromatch"."2.1.6";
+  by-version."micromatch"."2.1.6" = self.buildNodePackage {
+    name = "micromatch-2.1.6";
+    version = "2.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/micromatch/-/micromatch-2.1.6.tgz";
+      name = "micromatch-2.1.6.tgz";
+      sha1 = "51a65a9dcbfb92113292a071e04da35a81e9050e";
+    };
+    deps = {
+      "arr-diff-1.0.1" = self.by-version."arr-diff"."1.0.1";
+      "braces-1.8.0" = self.by-version."braces"."1.8.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "expand-brackets-0.1.1" = self.by-version."expand-brackets"."0.1.1";
+      "filename-regex-2.0.0" = self.by-version."filename-regex"."2.0.0";
+      "is-glob-1.1.3" = self.by-version."is-glob"."1.1.3";
+      "kind-of-1.1.0" = self.by-version."kind-of"."1.1.0";
+      "object.omit-0.2.1" = self.by-version."object.omit"."0.2.1";
+      "parse-glob-3.0.1" = self.by-version."parse-glob"."3.0.1";
+      "regex-cache-0.4.2" = self.by-version."regex-cache"."0.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."miller-rabin"."^1.1.2" =
     self.by-version."miller-rabin"."1.1.5";
   by-version."miller-rabin"."1.1.5" = self.buildNodePackage {
@@ -22400,29 +24582,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime"."1.2.9" =
-    self.by-version."mime"."1.2.9";
-  by-version."mime"."1.2.9" = self.buildNodePackage {
-    name = "mime-1.2.9";
-    version = "1.2.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.9.tgz";
-      name = "mime-1.2.9.tgz";
-      sha1 = "009cd40867bd35de521b3b966f04e2f8d4d13d09";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."mime"."1.2.x" =
+    self.by-version."mime"."1.2.11";
   by-spec."mime"."1.3.4" =
     self.by-version."mime"."1.3.4";
   by-spec."mime".">= 0.0.1" =
     self.by-version."mime"."1.3.4";
+  by-spec."mime".">= 1.2.6" =
+    self.by-version."mime"."1.3.4";
   by-spec."mime".">=1.2.11" =
     self.by-version."mime"."1.3.4";
   by-spec."mime"."^1.2.11" =
@@ -22436,15 +24603,34 @@
   by-spec."mime"."~1.2.9" =
     self.by-version."mime"."1.2.11";
   by-spec."mime-db".">= 1.1.2 < 2" =
-    self.by-version."mime-db"."1.7.0";
-  by-version."mime-db"."1.7.0" = self.buildNodePackage {
-    name = "mime-db-1.7.0";
-    version = "1.7.0";
+    self.by-version."mime-db"."1.9.1";
+  by-version."mime-db"."1.9.1" = self.buildNodePackage {
+    name = "mime-db-1.9.1";
+    version = "1.9.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz";
+      name = "mime-db-1.9.1.tgz";
+      sha1 = "1431049a71791482c29f37bafc8ea2cb3a6dd3e8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.8.0" =
+    self.by-version."mime-db"."1.8.0";
+  by-version."mime-db"."1.8.0" = self.buildNodePackage {
+    name = "mime-db-1.8.0";
+    version = "1.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.7.0.tgz";
-      name = "mime-db-1.7.0.tgz";
-      sha1 = "36cf66a6c52ea71827bde287f77c254f5ef1b8d3";
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz";
+      name = "mime-db-1.8.0.tgz";
+      sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25";
     };
     deps = {
     };
@@ -22454,21 +24640,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-db"."~1.7.0" =
-    self.by-version."mime-db"."1.7.0";
   by-spec."mime-types"."^2.0.3" =
-    self.by-version."mime-types"."2.0.9";
-  by-version."mime-types"."2.0.9" = self.buildNodePackage {
-    name = "mime-types-2.0.9";
-    version = "2.0.9";
+    self.by-version."mime-types"."2.0.10";
+  by-version."mime-types"."2.0.10" = self.buildNodePackage {
+    name = "mime-types-2.0.10";
+    version = "2.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.9.tgz";
-      name = "mime-types-2.0.9.tgz";
-      sha1 = "e8449aff27b1245ddc6641b524439ae80c4b78a6";
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz";
+      name = "mime-types-2.0.10.tgz";
+      sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d";
     };
     deps = {
-      "mime-db-1.7.0" = self.by-version."mime-db"."1.7.0";
+      "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0";
     };
     optionalDependencies = {
     };
@@ -22498,13 +24682,15 @@
   by-spec."mime-types"."~1.0.1" =
     self.by-version."mime-types"."1.0.2";
   by-spec."mime-types"."~2.0.1" =
-    self.by-version."mime-types"."2.0.9";
+    self.by-version."mime-types"."2.0.10";
+  by-spec."mime-types"."~2.0.10" =
+    self.by-version."mime-types"."2.0.10";
   by-spec."mime-types"."~2.0.3" =
-    self.by-version."mime-types"."2.0.9";
+    self.by-version."mime-types"."2.0.10";
   by-spec."mime-types"."~2.0.4" =
-    self.by-version."mime-types"."2.0.9";
+    self.by-version."mime-types"."2.0.10";
   by-spec."mime-types"."~2.0.9" =
-    self.by-version."mime-types"."2.0.9";
+    self.by-version."mime-types"."2.0.10";
   by-spec."mimelib"."~0.2.15" =
     self.by-version."mimelib"."0.2.19";
   by-version."mimelib"."0.2.19" = self.buildNodePackage {
@@ -22546,15 +24732,15 @@
     cpu = [ ];
   };
   by-spec."minilog"."~2.0.2" =
-    self.by-version."minilog"."2.0.6";
-  by-version."minilog"."2.0.6" = self.buildNodePackage {
-    name = "minilog-2.0.6";
-    version = "2.0.6";
+    self.by-version."minilog"."2.0.7";
+  by-version."minilog"."2.0.7" = self.buildNodePackage {
+    name = "minilog-2.0.7";
+    version = "2.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minilog/-/minilog-2.0.6.tgz";
-      name = "minilog-2.0.6.tgz";
-      sha1 = "665601f32a08bda58406c0e933b08713b3a50ad4";
+      url = "http://registry.npmjs.org/minilog/-/minilog-2.0.7.tgz";
+      name = "minilog-2.0.7.tgz";
+      sha1 = "4f6d258a5e5fbe30afaccc641c2a5c3b726d3dc5";
     };
     deps = {
       "microee-0.0.2" = self.by-version."microee"."0.0.2";
@@ -22584,19 +24770,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."minimatch"."0.0.x" =
-    self.by-version."minimatch"."0.0.5";
-  by-version."minimatch"."0.0.5" = self.buildNodePackage {
-    name = "minimatch-0.0.5";
-    version = "0.0.5";
+  by-spec."minimatch"."0" =
+    self.by-version."minimatch"."0.4.0";
+  by-version."minimatch"."0.4.0" = self.buildNodePackage {
+    name = "minimatch-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
-      name = "minimatch-0.0.5.tgz";
-      sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
+      name = "minimatch-0.4.0.tgz";
+      sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
     };
     deps = {
-      "lru-cache-1.0.6" = self.by-version."lru-cache"."1.0.6";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
+      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -22616,7 +24803,7 @@
       sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
     };
     deps = {
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
     optionalDependencies = {
@@ -22627,25 +24814,6 @@
   };
   by-spec."minimatch"."0.x" =
     self.by-version."minimatch"."0.4.0";
-  by-version."minimatch"."0.4.0" = self.buildNodePackage {
-    name = "minimatch-0.4.0";
-    version = "0.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
-      name = "minimatch-0.4.0.tgz";
-      sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
-    };
-    deps = {
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
-      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."minimatch"."1" =
     self.by-version."minimatch"."1.0.0";
   by-version."minimatch"."1.0.0" = self.buildNodePackage {
@@ -22658,7 +24826,7 @@
       sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d";
     };
     deps = {
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
     optionalDependencies = {
@@ -22667,18 +24835,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."minimatch"."1.0.x" =
-    self.by-version."minimatch"."1.0.0";
-  by-spec."minimatch".">=0.2.4" =
-    self.by-version."minimatch"."2.0.1";
-  by-version."minimatch"."2.0.1" = self.buildNodePackage {
-    name = "minimatch-2.0.1";
-    version = "2.0.1";
+  by-spec."minimatch"."2.0.x" =
+    self.by-version."minimatch"."2.0.4";
+  by-version."minimatch"."2.0.4" = self.buildNodePackage {
+    name = "minimatch-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz";
-      name = "minimatch-2.0.1.tgz";
-      sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37";
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz";
+      name = "minimatch-2.0.4.tgz";
+      sha1 = "83bea115803e7a097a78022427287edb762fafed";
     };
     deps = {
       "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
@@ -22689,10 +24855,14 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."minimatch".">=0.2.14 <2.0.0-0" =
+    self.by-version."minimatch"."1.0.0";
+  by-spec."minimatch".">=0.2.4" =
+    self.by-version."minimatch"."2.0.4";
   by-spec."minimatch"."^1.0.0" =
     self.by-version."minimatch"."1.0.0";
   by-spec."minimatch"."^2.0.1" =
-    self.by-version."minimatch"."2.0.1";
+    self.by-version."minimatch"."2.0.4";
   by-spec."minimatch"."~0.2" =
     self.by-version."minimatch"."0.2.14";
   by-version."minimatch"."0.2.14" = self.buildNodePackage {
@@ -22705,7 +24875,7 @@
       sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
     };
     deps = {
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
       "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
     };
     optionalDependencies = {
@@ -22726,8 +24896,8 @@
     self.by-version."minimatch"."0.3.0";
   by-spec."minimatch"."~1.0.0" =
     self.by-version."minimatch"."1.0.0";
-  by-spec."minimatch"."~2.0.1" =
-    self.by-version."minimatch"."2.0.1";
+  by-spec."minimatch"."~2.0.4" =
+    self.by-version."minimatch"."2.0.4";
   by-spec."minimist"."0.0.8" =
     self.by-version."minimist"."0.0.8";
   by-version."minimist"."0.0.8" = self.buildNodePackage {
@@ -22766,8 +24936,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."minimist"."^0.2.0" =
+    self.by-version."minimist"."0.2.0";
+  by-version."minimist"."0.2.0" = self.buildNodePackage {
+    name = "minimist-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
+      name = "minimist-0.2.0.tgz";
+      sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."minimist"."^1.1.0" =
-    self.by-version."minimist"."1.1.0";
+    self.by-version."minimist"."1.1.1";
+  by-version."minimist"."1.1.1" = self.buildNodePackage {
+    name = "minimist-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
+      name = "minimist-1.1.1.tgz";
+      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."minimist"."~0.0.1" =
     self.by-version."minimist"."0.0.10";
   by-version."minimist"."0.0.10" = self.buildNodePackage {
@@ -22793,25 +24999,8 @@
     self.by-version."minimist"."0.0.10";
   by-spec."minimist"."~0.2.0" =
     self.by-version."minimist"."0.2.0";
-  by-version."minimist"."0.2.0" = self.buildNodePackage {
-    name = "minimist-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
-      name = "minimist-0.2.0.tgz";
-      sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."minimist"."~1.1.0" =
-    self.by-version."minimist"."1.1.0";
+    self.by-version."minimist"."1.1.1";
   by-spec."ministyle"."~0.1.3" =
     self.by-version."ministyle"."0.1.4";
   by-version."ministyle"."0.1.4" = self.buildNodePackage {
@@ -22872,6 +25061,8 @@
     cpu = [ ];
   };
   "mkdirp" = self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp"."0" =
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."0.0.x" =
     self.by-version."mkdirp"."0.0.7";
   by-version."mkdirp"."0.0.7" = self.buildNodePackage {
@@ -22960,6 +25151,8 @@
     self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp".">=0.3.5" =
     self.by-version."mkdirp"."0.5.0";
+  by-spec."mkdirp".">=0.3.5 <1.0.0-0" =
+    self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp".">=0.5 0" =
     self.by-version."mkdirp"."0.5.0";
   by-spec."mkdirp"."^0.3.5" =
@@ -22976,7 +25169,7 @@
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.5.0" =
     self.by-version."mkdirp"."0.5.0";
-  by-spec."mkpath"."~0.1.0" =
+  by-spec."mkpath"."^0.1.0" =
     self.by-version."mkpath"."0.1.0";
   by-version."mkpath"."0.1.0" = self.buildNodePackage {
     name = "mkpath-0.1.0";
@@ -22996,15 +25189,15 @@
     cpu = [ ];
   };
   by-spec."mocha"."*" =
-    self.by-version."mocha"."2.1.0";
-  by-version."mocha"."2.1.0" = self.buildNodePackage {
-    name = "mocha-2.1.0";
-    version = "2.1.0";
+    self.by-version."mocha"."2.2.4";
+  by-version."mocha"."2.2.4" = self.buildNodePackage {
+    name = "mocha-2.2.4";
+    version = "2.2.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mocha/-/mocha-2.1.0.tgz";
-      name = "mocha-2.1.0.tgz";
-      sha1 = "77752fe592fb9092756827af46cd3eae1b83671c";
+      url = "http://registry.npmjs.org/mocha/-/mocha-2.2.4.tgz";
+      name = "mocha-2.2.4.tgz";
+      sha1 = "192b0edc0e17e56613bc66e5fc7e81c00413a98d";
     };
     deps = {
       "commander-2.3.0" = self.by-version."commander"."2.3.0";
@@ -23015,6 +25208,7 @@
       "growl-1.8.1" = self.by-version."growl"."1.8.1";
       "jade-0.26.3" = self.by-version."jade"."0.26.3";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -23022,7 +25216,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "mocha" = self.by-version."mocha"."2.1.0";
+  "mocha" = self.by-version."mocha"."2.2.4";
   by-spec."mocha"."~1.20.1" =
     self.by-version."mocha"."1.20.1";
   by-version."mocha"."1.20.1" = self.buildNodePackage {
@@ -23039,7 +25233,7 @@
       "growl-1.7.0" = self.by-version."growl"."1.7.0";
       "jade-0.26.3" = self.by-version."jade"."0.26.3";
       "diff-1.0.7" = self.by-version."diff"."1.0.7";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "glob-3.2.3" = self.by-version."glob"."3.2.3";
     };
@@ -23067,7 +25261,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."phantomjs"."1.9.15"];
+      self.by-version."phantomjs"."1.9.16"];
     os = [ ];
     cpu = [ ];
   };
@@ -23097,27 +25291,28 @@
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
   by-spec."module-deps"."^3.6.3" =
-    self.by-version."module-deps"."3.7.2";
-  by-version."module-deps"."3.7.2" = self.buildNodePackage {
-    name = "module-deps-3.7.2";
-    version = "3.7.2";
+    self.by-version."module-deps"."3.7.6";
+  by-version."module-deps"."3.7.6" = self.buildNodePackage {
+    name = "module-deps-3.7.6";
+    version = "3.7.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/module-deps/-/module-deps-3.7.2.tgz";
-      name = "module-deps-3.7.2.tgz";
-      sha1 = "bd4ceaca556b16032ac5abbf47ac61bc0ff5c349";
+      url = "http://registry.npmjs.org/module-deps/-/module-deps-3.7.6.tgz";
+      name = "module-deps-3.7.6.tgz";
+      sha1 = "c1e596de260a26e78b9399ec32a989cdff71c1a0";
     };
     deps = {
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "browser-resolve-1.7.2" = self.by-version."browser-resolve"."1.7.2";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "browser-resolve-1.8.2" = self.by-version."browser-resolve"."1.8.2";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
+      "defined-0.0.0" = self.by-version."defined"."0.0.0";
       "detective-4.0.0" = self.by-version."detective"."4.0.0";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "resolve-1.1.5" = self.by-version."resolve"."1.1.5";
+      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
       "stream-combiner2-1.0.2" = self.by-version."stream-combiner2"."1.0.2";
       "subarg-0.0.1" = self.by-version."subarg"."0.0.1";
@@ -23131,7 +25326,7 @@
     cpu = [ ];
   };
   by-spec."module-deps"."^3.7.0" =
-    self.by-version."module-deps"."3.7.2";
+    self.by-version."module-deps"."3.7.6";
   by-spec."module-deps"."~1.2.2" =
     self.by-version."module-deps"."1.2.2";
   by-version."module-deps"."1.2.2" = self.buildNodePackage {
@@ -23144,12 +25339,12 @@
       sha1 = "6e73959b7973af964de33a02437b76a8edfb2fc5";
     };
     deps = {
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
       "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4";
       "resolve-0.6.3" = self.by-version."resolve"."0.6.3";
       "detective-2.1.2" = self.by-version."detective"."2.1.2";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
       "parents-0.0.2" = self.by-version."parents"."0.0.2";
     };
@@ -23171,11 +25366,11 @@
       sha1 = "cc48c5f88a087c6d9ec1973167c2c9fee2f80314";
     };
     deps = {
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
       "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4";
       "resolve-0.6.3" = self.by-version."resolve"."0.6.3";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
       "parents-0.0.2" = self.by-version."parents"."0.0.2";
       "mine-0.0.2" = self.by-version."mine"."0.0.2";
@@ -23206,15 +25401,15 @@
     cpu = [ ];
   };
   by-spec."moment".">= 2.1.0" =
-    self.by-version."moment"."2.9.0";
-  by-version."moment"."2.9.0" = self.buildNodePackage {
-    name = "moment-2.9.0";
-    version = "2.9.0";
+    self.by-version."moment"."2.10.2";
+  by-version."moment"."2.10.2" = self.buildNodePackage {
+    name = "moment-2.10.2";
+    version = "2.10.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.9.0.tgz";
-      name = "moment-2.9.0.tgz";
-      sha1 = "77ec1175fa294f42627f10c8e6de6302c036f6d5";
+      url = "http://registry.npmjs.org/moment/-/moment-2.10.2.tgz";
+      name = "moment-2.10.2.tgz";
+      sha1 = "faf8c09ca82f03f94962e3b5a7239263ea50d087";
     };
     deps = {
     };
@@ -23225,13 +25420,13 @@
     cpu = [ ];
   };
   by-spec."moment".">= 2.6.0" =
-    self.by-version."moment"."2.9.0";
+    self.by-version."moment"."2.10.2";
   by-spec."moment".">=2.4.0" =
-    self.by-version."moment"."2.9.0";
+    self.by-version."moment"."2.10.2";
   by-spec."moment".">=2.5.0" =
-    self.by-version."moment"."2.9.0";
+    self.by-version."moment"."2.10.2";
   by-spec."moment"."^2.8.4" =
-    self.by-version."moment"."2.9.0";
+    self.by-version."moment"."2.10.2";
   by-spec."moment"."~2.4.0" =
     self.by-version."moment"."2.4.0";
   by-version."moment"."2.4.0" = self.buildNodePackage {
@@ -23251,7 +25446,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."moment"."~2.5.1" =
+  by-spec."moment"."~2.5.0" =
     self.by-version."moment"."2.5.1";
   by-version."moment"."2.5.1" = self.buildNodePackage {
     name = "moment-2.5.1";
@@ -23270,16 +25465,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."moment"."~2.8.4" =
-    self.by-version."moment"."2.8.4";
-  by-version."moment"."2.8.4" = self.buildNodePackage {
-    name = "moment-2.8.4";
-    version = "2.8.4";
+  by-spec."moment"."~2.5.1" =
+    self.by-version."moment"."2.5.1";
+  by-spec."moment"."~2.9.0" =
+    self.by-version."moment"."2.9.0";
+  by-version."moment"."2.9.0" = self.buildNodePackage {
+    name = "moment-2.9.0";
+    version = "2.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.8.4.tgz";
-      name = "moment-2.8.4.tgz";
-      sha1 = "cc174aabb19223efff5699a9467805a2789838bf";
+      url = "http://registry.npmjs.org/moment/-/moment-2.9.0.tgz";
+      name = "moment-2.9.0.tgz";
+      sha1 = "77ec1175fa294f42627f10c8e6de6302c036f6d5";
     };
     deps = {
     };
@@ -23301,7 +25498,7 @@
       sha1 = "ebbd95f9220eba1c1b5e562d078db6c7d971e7ac";
     };
     deps = {
-      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+      "moment-2.10.2" = self.by-version."moment"."2.10.2";
     };
     optionalDependencies = {
     };
@@ -23321,7 +25518,27 @@
       sha1 = "331a9dbecf965a8fb185ee30a6ed3fe32ee93012";
     };
     deps = {
-      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+      "moment-2.10.2" = self.by-version."moment"."2.10.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."moment-timezone"."^0.3.0" =
+    self.by-version."moment-timezone"."0.3.1";
+  by-version."moment-timezone"."0.3.1" = self.buildNodePackage {
+    name = "moment-timezone-0.3.1";
+    version = "0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.3.1.tgz";
+      name = "moment-timezone-0.3.1.tgz";
+      sha1 = "3ef47856b02d53b718a10a5ec2023aa299e07bf5";
+    };
+    deps = {
+      "moment-2.10.2" = self.by-version."moment"."2.10.2";
     };
     optionalDependencies = {
     };
@@ -23329,6 +25546,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."moment-timezone"."~0.3.0" =
+    self.by-version."moment-timezone"."0.3.1";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = self.buildNodePackage {
@@ -23382,7 +25601,7 @@
       sha1 = "65cdd46ec127861e941168fdccf82bf17ad71c4d";
     };
     deps = {
-      "bson-0.2.19" = self.by-version."bson"."0.2.19";
+      "bson-0.2.21" = self.by-version."bson"."0.2.21";
     };
     optionalDependencies = {
       "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4";
@@ -23392,22 +25611,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mongodb"."1.4.28" =
-    self.by-version."mongodb"."1.4.28";
-  by-version."mongodb"."1.4.28" = self.buildNodePackage {
-    name = "mongodb-1.4.28";
-    version = "1.4.28";
+  by-spec."mongodb"."1.4.32" =
+    self.by-version."mongodb"."1.4.32";
+  by-version."mongodb"."1.4.32" = self.buildNodePackage {
+    name = "mongodb-1.4.32";
+    version = "1.4.32";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.28.tgz";
-      name = "mongodb-1.4.28.tgz";
-      sha1 = "4308333aa9b369cc8214a67602527d138bf74e1f";
+      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.32.tgz";
+      name = "mongodb-1.4.32.tgz";
+      sha1 = "23043d743e507e73e37c3eef03916af5ba0333b8";
     };
     deps = {
-      "bson-0.2.19" = self.by-version."bson"."0.2.19";
+      "bson-0.2.21" = self.by-version."bson"."0.2.21";
     };
     optionalDependencies = {
-      "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7";
+      "kerberos-0.0.9" = self.by-version."kerberos"."0.0.9";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
@@ -23415,18 +25634,18 @@
     cpu = [ ];
   };
   by-spec."mongodb".">= 1.2.0 <2.1.0" =
-    self.by-version."mongodb"."2.0.16";
-  by-version."mongodb"."2.0.16" = self.buildNodePackage {
-    name = "mongodb-2.0.16";
-    version = "2.0.16";
+    self.by-version."mongodb"."2.0.27";
+  by-version."mongodb"."2.0.27" = self.buildNodePackage {
+    name = "mongodb-2.0.27";
+    version = "2.0.27";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.16.tgz";
-      name = "mongodb-2.0.16.tgz";
-      sha1 = "54acb07b0d27d542901ea05359a19b142272b36d";
+      url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.27.tgz";
+      name = "mongodb-2.0.27.tgz";
+      sha1 = "12f70e98286d0f5cfd2fc2fc2c99963e3bd408f5";
     };
     deps = {
-      "mongodb-core-1.1.12" = self.by-version."mongodb-core"."1.1.12";
+      "mongodb-core-1.1.21" = self.by-version."mongodb-core"."1.1.21";
       "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
     };
     optionalDependencies = {
@@ -23436,25 +25655,25 @@
     cpu = [ ];
   };
   by-spec."mongodb"."~2.0" =
-    self.by-version."mongodb"."2.0.16";
-  by-spec."mongodb-core"."1.1.12" =
-    self.by-version."mongodb-core"."1.1.12";
-  by-version."mongodb-core"."1.1.12" = self.buildNodePackage {
-    name = "mongodb-core-1.1.12";
-    version = "1.1.12";
+    self.by-version."mongodb"."2.0.27";
+  by-spec."mongodb-core"."1.1.21" =
+    self.by-version."mongodb-core"."1.1.21";
+  by-version."mongodb-core"."1.1.21" = self.buildNodePackage {
+    name = "mongodb-core-1.1.21";
+    version = "1.1.21";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.12.tgz";
-      name = "mongodb-core-1.1.12.tgz";
-      sha1 = "6f83a64210ab43995d295116736b0a051ce2bdcd";
+      url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.21.tgz";
+      name = "mongodb-core-1.1.21.tgz";
+      sha1 = "11c313f0474315e8a200c4dbb89b5fc6442c8f7c";
     };
     deps = {
-      "bson-0.2.19" = self.by-version."bson"."0.2.19";
+      "bson-0.3.1" = self.by-version."bson"."0.3.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "rimraf-2.2.6" = self.by-version."rimraf"."2.2.6";
     };
     optionalDependencies = {
-      "kerberos-0.0.9" = self.by-version."kerberos"."0.0.9";
+      "kerberos-0.0.10" = self.by-version."kerberos"."0.0.10";
     };
     peerDependencies = [];
     os = [ ];
@@ -23515,18 +25734,18 @@
   };
   "mongoose" = self.by-version."mongoose"."3.6.20";
   by-spec."mongoose"."3.8.x" =
-    self.by-version."mongoose"."3.8.23";
-  by-version."mongoose"."3.8.23" = self.buildNodePackage {
-    name = "mongoose-3.8.23";
-    version = "3.8.23";
+    self.by-version."mongoose"."3.8.26";
+  by-version."mongoose"."3.8.26" = self.buildNodePackage {
+    name = "mongoose-3.8.26";
+    version = "3.8.26";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.23.tgz";
-      name = "mongoose-3.8.23.tgz";
-      sha1 = "c2dbee69d9d3776006330165f6e2681174c2ce6b";
+      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.26.tgz";
+      name = "mongoose-3.8.26.tgz";
+      sha1 = "28ba382c9b37dd5555c06632f1d8fd1d4c5dca1f";
     };
     deps = {
-      "mongodb-1.4.28" = self.by-version."mongodb"."1.4.28";
+      "mongodb-1.4.32" = self.by-version."mongodb"."1.4.32";
       "hooks-0.2.1" = self.by-version."hooks"."0.2.1";
       "ms-0.1.0" = self.by-version."ms"."0.1.0";
       "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
@@ -23534,7 +25753,7 @@
       "mpromise-0.4.3" = self.by-version."mpromise"."0.4.3";
       "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
-      "mquery-0.8.0" = self.by-version."mquery"."0.8.0";
+      "mquery-1.4.0" = self.by-version."mquery"."1.4.0";
     };
     optionalDependencies = {
     };
@@ -23719,21 +25938,21 @@
   };
   by-spec."morgan"."~1.3.2" =
     self.by-version."morgan"."1.3.2";
-  by-spec."morgan"."~1.5.1" =
-    self.by-version."morgan"."1.5.1";
-  by-version."morgan"."1.5.1" = self.buildNodePackage {
-    name = "morgan-1.5.1";
-    version = "1.5.1";
+  by-spec."morgan"."~1.5.2" =
+    self.by-version."morgan"."1.5.2";
+  by-version."morgan"."1.5.2" = self.buildNodePackage {
+    name = "morgan-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/morgan/-/morgan-1.5.1.tgz";
-      name = "morgan-1.5.1.tgz";
-      sha1 = "a9688eed9187ab648d816fc09c696fae882e16f6";
+      url = "http://registry.npmjs.org/morgan/-/morgan-1.5.2.tgz";
+      name = "morgan-1.5.2.tgz";
+      sha1 = "34c1a0e7c2d5ad3ed78f0ef3257b8ac7c35d7cff";
     };
     deps = {
       "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
     };
     optionalDependencies = {
@@ -23762,6 +25981,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."mout"."^0.11.0" =
+    self.by-version."mout"."0.11.0";
+  by-version."mout"."0.11.0" = self.buildNodePackage {
+    name = "mout-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mout/-/mout-0.11.0.tgz";
+      name = "mout-0.11.0.tgz";
+      sha1 = "93cdf0791ac8a24873ceeb42a5b016b7c867abee";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."mout"."~0.9.0" =
     self.by-version."mout"."0.9.1";
   by-version."mout"."0.9.1" = self.buildNodePackage {
@@ -23878,16 +26116,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mquery"."0.8.0" =
-    self.by-version."mquery"."0.8.0";
-  by-version."mquery"."0.8.0" = self.buildNodePackage {
-    name = "mquery-0.8.0";
-    version = "0.8.0";
+  by-spec."mquery"."1.0.0" =
+    self.by-version."mquery"."1.0.0";
+  by-version."mquery"."1.0.0" = self.buildNodePackage {
+    name = "mquery-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mquery/-/mquery-0.8.0.tgz";
-      name = "mquery-0.8.0.tgz";
-      sha1 = "1e5b8c2a5a52f5583bd08932700b85440ee25f60";
+      url = "http://registry.npmjs.org/mquery/-/mquery-1.0.0.tgz";
+      name = "mquery-1.0.0.tgz";
+      sha1 = "6940a46d643368fe8e5abddeb94bd8dd32013f5b";
     };
     deps = {
       "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
@@ -23900,21 +26138,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mquery"."1.0.0" =
-    self.by-version."mquery"."1.0.0";
-  by-version."mquery"."1.0.0" = self.buildNodePackage {
-    name = "mquery-1.0.0";
-    version = "1.0.0";
+  by-spec."mquery"."1.4.0" =
+    self.by-version."mquery"."1.4.0";
+  by-version."mquery"."1.4.0" = self.buildNodePackage {
+    name = "mquery-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mquery/-/mquery-1.0.0.tgz";
-      name = "mquery-1.0.0.tgz";
-      sha1 = "6940a46d643368fe8e5abddeb94bd8dd32013f5b";
+      url = "http://registry.npmjs.org/mquery/-/mquery-1.4.0.tgz";
+      name = "mquery-1.4.0.tgz";
+      sha1 = "d49b1c1ca89d1a06ebb6f000316fadba56c2469d";
     };
     deps = {
-      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
+      "bluebird-2.3.2" = self.by-version."bluebird"."2.3.2";
       "debug-0.7.4" = self.by-version."debug"."0.7.4";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
+      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
     };
     optionalDependencies = {
     };
@@ -23991,7 +26230,7 @@
       sha1 = "e0eda501c43972efabb48eb34ee9daaeffd8eb4c";
     };
     deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -24022,6 +26261,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."multicast-dns"."^2.0.0" =
+    self.by-version."multicast-dns"."2.1.0";
+  by-version."multicast-dns"."2.1.0" = self.buildNodePackage {
+    name = "multicast-dns-2.1.0";
+    version = "2.1.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/multicast-dns/-/multicast-dns-2.1.0.tgz";
+      name = "multicast-dns-2.1.0.tgz";
+      sha1 = "f0f93e7584bb4e0f59d8f838b2ded055ff77f535";
+    };
+    deps = {
+      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."multiparty"."2.2.0" =
     self.by-version."multiparty"."2.2.0";
   by-version."multiparty"."2.2.0" = self.buildNodePackage {
@@ -24105,6 +26364,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."murl"."0.4.x" =
+    self.by-version."murl"."0.4.1";
+  by-version."murl"."0.4.1" = self.buildNodePackage {
+    name = "murl-0.4.1";
+    version = "0.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/murl/-/murl-0.4.1.tgz";
+      name = "murl-0.4.1.tgz";
+      sha1 = "489fbcc7f1b2b77e689c84120a51339c3849c939";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."mustache"."1.0.0" =
     self.by-version."mustache"."1.0.0";
   by-version."mustache"."1.0.0" = self.buildNodePackage {
@@ -24228,15 +26506,15 @@
     cpu = [ ];
   };
   by-spec."nan"."*" =
-    self.by-version."nan"."1.6.2";
-  by-version."nan"."1.6.2" = self.buildNodePackage {
-    name = "nan-1.6.2";
-    version = "1.6.2";
+    self.by-version."nan"."1.7.0";
+  by-version."nan"."1.7.0" = self.buildNodePackage {
+    name = "nan-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz";
-      name = "nan-1.6.2.tgz";
-      sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8";
+      url = "http://registry.npmjs.org/nan/-/nan-1.7.0.tgz";
+      name = "nan-1.7.0.tgz";
+      sha1 = "755b997404e83cbe7bc08bc3c5c56291bce87438";
     };
     deps = {
     };
@@ -24246,16 +26524,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.1.2" =
-    self.by-version."nan"."1.1.2";
-  by-version."nan"."1.1.2" = self.buildNodePackage {
-    name = "nan-1.1.2";
-    version = "1.1.2";
+  by-spec."nan"."1 >=1.6.2" =
+    self.by-version."nan"."1.7.0";
+  by-spec."nan"."1.4.x" =
+    self.by-version."nan"."1.4.3";
+  by-version."nan"."1.4.3" = self.buildNodePackage {
+    name = "nan-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.1.2.tgz";
-      name = "nan-1.1.2.tgz";
-      sha1 = "bbd48552fc0758673ebe8fada360b60278a6636b";
+      url = "http://registry.npmjs.org/nan/-/nan-1.4.3.tgz";
+      name = "nan-1.4.3.tgz";
+      sha1 = "c56b5404698063696f597435f9163c312aea5009";
     };
     deps = {
     };
@@ -24265,16 +26545,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.3.0" =
-    self.by-version."nan"."1.3.0";
-  by-version."nan"."1.3.0" = self.buildNodePackage {
-    name = "nan-1.3.0";
-    version = "1.3.0";
+  by-spec."nan"."1.5.0" =
+    self.by-version."nan"."1.5.0";
+  by-version."nan"."1.5.0" = self.buildNodePackage {
+    name = "nan-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
-      name = "nan-1.3.0.tgz";
-      sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742";
+      url = "http://registry.npmjs.org/nan/-/nan-1.5.0.tgz";
+      name = "nan-1.5.0.tgz";
+      sha1 = "2b3c05bc361f52e50aea2c49077783aa67c5b7fb";
     };
     deps = {
     };
@@ -24284,16 +26564,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.5.0" =
-    self.by-version."nan"."1.5.0";
-  by-version."nan"."1.5.0" = self.buildNodePackage {
-    name = "nan-1.5.0";
-    version = "1.5.0";
+  by-spec."nan"."1.5.1" =
+    self.by-version."nan"."1.5.1";
+  by-version."nan"."1.5.1" = self.buildNodePackage {
+    name = "nan-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.5.0.tgz";
-      name = "nan-1.5.0.tgz";
-      sha1 = "2b3c05bc361f52e50aea2c49077783aa67c5b7fb";
+      url = "http://registry.npmjs.org/nan/-/nan-1.5.1.tgz";
+      name = "nan-1.5.1.tgz";
+      sha1 = "a565e4d4143cb49afdd3fe07e4c8aeaa1e7e0603";
     };
     deps = {
     };
@@ -24303,28 +26583,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.6.2" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan"."1.6.x" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan".">=1.3.0" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan"."^1.3.0" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan"."^1.5.1" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan"."^1.6.2" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan"."~0.3.0" =
-    self.by-version."nan"."0.3.2";
-  by-version."nan"."0.3.2" = self.buildNodePackage {
-    name = "nan-0.3.2";
-    version = "0.3.2";
+  by-spec."nan"."1.5.x" =
+    self.by-version."nan"."1.5.3";
+  by-version."nan"."1.5.3" = self.buildNodePackage {
+    name = "nan-1.5.3";
+    version = "1.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
-      name = "nan-0.3.2.tgz";
-      sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
+      url = "http://registry.npmjs.org/nan/-/nan-1.5.3.tgz";
+      name = "nan-1.5.3.tgz";
+      sha1 = "4cd0ecc133b7b0700a492a646add427ae8a318eb";
     };
     deps = {
     };
@@ -24334,16 +26602,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."~0.6.0" =
-    self.by-version."nan"."0.6.0";
-  by-version."nan"."0.6.0" = self.buildNodePackage {
-    name = "nan-0.6.0";
-    version = "0.6.0";
+  by-spec."nan"."1.6.2" =
+    self.by-version."nan"."1.6.2";
+  by-version."nan"."1.6.2" = self.buildNodePackage {
+    name = "nan-1.6.2";
+    version = "1.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-0.6.0.tgz";
-      name = "nan-0.6.0.tgz";
-      sha1 = "a54ebe59717b467c77425302bd7c17574c887aaa";
+      url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz";
+      name = "nan-1.6.2.tgz";
+      sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8";
     };
     deps = {
     };
@@ -24353,16 +26621,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."~0.7.0" =
-    self.by-version."nan"."0.7.1";
-  by-version."nan"."0.7.1" = self.buildNodePackage {
-    name = "nan-0.7.1";
-    version = "0.7.1";
+  by-spec."nan"."1.6.x" =
+    self.by-version."nan"."1.6.2";
+  by-spec."nan"."1.7.0" =
+    self.by-version."nan"."1.7.0";
+  by-spec."nan".">=1.3.0" =
+    self.by-version."nan"."1.7.0";
+  by-spec."nan"."^1.3.0" =
+    self.by-version."nan"."1.7.0";
+  by-spec."nan"."^1.5.1" =
+    self.by-version."nan"."1.7.0";
+  by-spec."nan"."^1.6.2" =
+    self.by-version."nan"."1.7.0";
+  by-spec."nan"."~0.3.0" =
+    self.by-version."nan"."0.3.2";
+  by-version."nan"."0.3.2" = self.buildNodePackage {
+    name = "nan-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-0.7.1.tgz";
-      name = "nan-0.7.1.tgz";
-      sha1 = "fc576184a1037b3e5675f2ba3740dee2044ff8f4";
+      url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
+      name = "nan-0.3.2.tgz";
+      sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
     };
     deps = {
     };
@@ -24412,16 +26692,14 @@
   };
   by-spec."nan"."~1.3.0" =
     self.by-version."nan"."1.3.0";
-  by-spec."nan"."~1.5.0" =
-    self.by-version."nan"."1.5.3";
-  by-version."nan"."1.5.3" = self.buildNodePackage {
-    name = "nan-1.5.3";
-    version = "1.5.3";
+  by-version."nan"."1.3.0" = self.buildNodePackage {
+    name = "nan-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.5.3.tgz";
-      name = "nan-1.5.3.tgz";
-      sha1 = "4cd0ecc133b7b0700a492a646add427ae8a318eb";
+      url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
+      name = "nan-1.3.0.tgz";
+      sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742";
     };
     deps = {
     };
@@ -24431,10 +26709,18 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."nan"."~1.5.0" =
+    self.by-version."nan"."1.5.3";
+  by-spec."nan"."~1.5.1" =
+    self.by-version."nan"."1.5.3";
   by-spec."nan"."~1.5.3" =
     self.by-version."nan"."1.5.3";
+  by-spec."nan"."~1.6" =
+    self.by-version."nan"."1.6.2";
   by-spec."nan"."~1.6.2" =
     self.by-version."nan"."1.6.2";
+  by-spec."nan"."~1.7.0" =
+    self.by-version."nan"."1.7.0";
   by-spec."native-buffer-browserify"."~2.0.0" =
     self.by-version."native-buffer-browserify"."2.0.17";
   by-version."native-buffer-browserify"."2.0.17" = self.buildNodePackage {
@@ -24470,7 +26756,7 @@
       sha1 = "f7d2a3c5464bb6f09d9167e35a7350bd7ffe9b82";
     };
     deps = {
-      "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
+      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
       "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2";
       "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
     };
@@ -24514,7 +26800,7 @@
     };
     deps = {
       "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
+      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -24563,20 +26849,20 @@
     cpu = [ ];
   };
   by-spec."natural"."^0.2.0" =
-    self.by-version."natural"."0.2.0";
-  by-version."natural"."0.2.0" = self.buildNodePackage {
-    name = "natural-0.2.0";
-    version = "0.2.0";
+    self.by-version."natural"."0.2.1";
+  by-version."natural"."0.2.1" = self.buildNodePackage {
+    name = "natural-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/natural/-/natural-0.2.0.tgz";
-      name = "natural-0.2.0.tgz";
-      sha1 = "42f4ff5f17ae54c439e7c61b45ff3a6bce9a0a8a";
+      url = "http://registry.npmjs.org/natural/-/natural-0.2.1.tgz";
+      name = "natural-0.2.1.tgz";
+      sha1 = "1eb5156a9d90b4591949e20e94ebc77bb2339eda";
     };
     deps = {
       "sylvester-0.0.21" = self.by-version."sylvester"."0.0.21";
-      "apparatus-0.0.8" = self.by-version."apparatus"."0.0.8";
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "apparatus-0.0.9" = self.by-version."apparatus"."0.0.9";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
     };
     optionalDependencies = {
     };
@@ -24631,25 +26917,6 @@
   };
   by-spec."nconf"."~0.6.9" =
     self.by-version."nconf"."0.6.9";
-  by-spec."ncp"."0.2.x" =
-    self.by-version."ncp"."0.2.7";
-  by-version."ncp"."0.2.7" = self.buildNodePackage {
-    name = "ncp-0.2.7";
-    version = "0.2.7";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
-      name = "ncp-0.2.7.tgz";
-      sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."ncp"."0.4.x" =
     self.by-version."ncp"."0.4.2";
   by-version."ncp"."0.4.2" = self.buildNodePackage {
@@ -24690,18 +26957,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."negotiator"."0.2.5" =
-    self.by-version."negotiator"."0.2.5";
-  by-version."negotiator"."0.2.5" = self.buildNodePackage {
-    name = "negotiator-0.2.5";
-    version = "0.2.5";
+  by-spec."ndjson"."^1.2.3" =
+    self.by-version."ndjson"."1.3.0";
+  by-version."ndjson"."1.3.0" = self.buildNodePackage {
+    name = "ndjson-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.2.5.tgz";
-      name = "negotiator-0.2.5.tgz";
-      sha1 = "12ec7b4a9f3b4c894c31d8c4ec015925ba547eec";
+      url = "http://registry.npmjs.org/ndjson/-/ndjson-1.3.0.tgz";
+      name = "ndjson-1.3.0.tgz";
+      sha1 = "84f4d197986919620a763aa36c7058cbbdcf7351";
     };
     deps = {
+      "split2-0.2.1" = self.by-version."split2"."0.2.1";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
     };
     optionalDependencies = {
     };
@@ -24804,6 +27073,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."negotiator"."^0.4.5" =
+    self.by-version."negotiator"."0.4.9";
+  by-spec."nested-error-stacks"."^1.0.0" =
+    self.by-version."nested-error-stacks"."1.0.0";
+  by-version."nested-error-stacks"."1.0.0" = self.buildNodePackage {
+    name = "nested-error-stacks-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.0.tgz";
+      name = "nested-error-stacks-1.0.0.tgz";
+      sha1 = "3bd2785bb1fa9ebbf608e293e9ccb9ea765254c7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."net-ping"."1.1.7" =
     self.by-version."net-ping"."1.1.7";
   by-version."net-ping"."1.1.7" = self.buildNodePackage {
@@ -24862,6 +27152,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."network-address"."0.0.x" =
+    self.by-version."network-address"."0.0.5";
+  by-spec."network-address"."^1.0.0" =
+    self.by-version."network-address"."1.0.0";
+  by-version."network-address"."1.0.0" = self.buildNodePackage {
+    name = "network-address-1.0.0";
+    version = "1.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/network-address/-/network-address-1.0.0.tgz";
+      name = "network-address-1.0.0.tgz";
+      sha1 = "246e82910c9e49d8842f1515d8341973a8db642f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."next-tick"."~0.2.2" =
     self.by-version."next-tick"."0.2.2";
   by-version."next-tick"."0.2.2" = self.buildNodePackage {
@@ -24922,15 +27233,15 @@
     cpu = [ ];
   };
   by-spec."nijs"."*" =
-    self.by-version."nijs"."0.0.22";
-  by-version."nijs"."0.0.22" = self.buildNodePackage {
-    name = "nijs-0.0.22";
-    version = "0.0.22";
+    self.by-version."nijs"."0.0.23";
+  by-version."nijs"."0.0.23" = self.buildNodePackage {
+    name = "nijs-0.0.23";
+    version = "0.0.23";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nijs/-/nijs-0.0.22.tgz";
-      name = "nijs-0.0.22.tgz";
-      sha1 = "41f162cfd4b8e99b56da26b3170307381916718a";
+      url = "http://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
+      name = "nijs-0.0.23.tgz";
+      sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
     };
     deps = {
       "optparse-1.0.5" = self.by-version."optparse"."1.0.5";
@@ -24942,31 +27253,31 @@
     os = [ ];
     cpu = [ ];
   };
-  "nijs" = self.by-version."nijs"."0.0.22";
-  by-spec."node-appc"."0.2.24" =
-    self.by-version."node-appc"."0.2.24";
-  by-version."node-appc"."0.2.24" = self.buildNodePackage {
-    name = "node-appc-0.2.24";
-    version = "0.2.24";
+  "nijs" = self.by-version."nijs"."0.0.23";
+  by-spec."node-appc"."0.2.26" =
+    self.by-version."node-appc"."0.2.26";
+  by-version."node-appc"."0.2.26" = self.buildNodePackage {
+    name = "node-appc-0.2.26";
+    version = "0.2.26";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.24.tgz";
-      name = "node-appc-0.2.24.tgz";
-      sha1 = "09bcc9a887bda6a9f26bc6b597094dff1ccaf0aa";
+      url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.26.tgz";
+      name = "node-appc-0.2.26.tgz";
+      sha1 = "7744e585d10a69b090ce6d983efda6131d8c3e31";
     };
     deps = {
       "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "diff-1.0.8" = self.by-version."diff"."1.0.8";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "request-2.40.0" = self.by-version."request"."2.40.0";
       "semver-3.0.1" = self.by-version."semver"."3.0.1";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
       "temp-0.8.1" = self.by-version."temp"."0.8.1";
       "wrench-1.5.8" = self.by-version."wrench"."1.5.8";
-      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
+      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
     };
     optionalDependencies = {
@@ -24976,15 +27287,15 @@
     cpu = [ ];
   };
   by-spec."node-craigslist"."^0.1.7" =
-    self.by-version."node-craigslist"."0.1.7";
-  by-version."node-craigslist"."0.1.7" = self.buildNodePackage {
-    name = "node-craigslist-0.1.7";
-    version = "0.1.7";
+    self.by-version."node-craigslist"."0.1.8";
+  by-version."node-craigslist"."0.1.8" = self.buildNodePackage {
+    name = "node-craigslist-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-craigslist/-/node-craigslist-0.1.7.tgz";
-      name = "node-craigslist-0.1.7.tgz";
-      sha1 = "f0cf7dbed75dcd67aa068fa5750bdb082a212777";
+      url = "http://registry.npmjs.org/node-craigslist/-/node-craigslist-0.1.8.tgz";
+      name = "node-craigslist-0.1.8.tgz";
+      sha1 = "2c69ba5869a2461070cd296dcf3b1dd2e3032227";
     };
     deps = {
       "cheerio-0.17.0" = self.by-version."cheerio"."0.17.0";
@@ -25007,7 +27318,7 @@
       sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea";
     };
     deps = {
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
     };
     optionalDependencies = {
     };
@@ -25016,21 +27327,21 @@
     cpu = [ ];
   };
   by-spec."node-expat"."*" =
-    self.by-version."node-expat"."2.3.6";
-  by-version."node-expat"."2.3.6" = self.buildNodePackage {
-    name = "node-expat-2.3.6";
-    version = "2.3.6";
+    self.by-version."node-expat"."2.3.7";
+  by-version."node-expat"."2.3.7" = self.buildNodePackage {
+    name = "node-expat-2.3.7";
+    version = "2.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.6.tgz";
-      name = "node-expat-2.3.6.tgz";
-      sha1 = "b934025a9fc48b91557bb618cf3f4603a1eeb48c";
+      url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.7.tgz";
+      name = "node-expat-2.3.7.tgz";
+      sha1 = "7d8811989c52c90578a70d8ea6335692a7f14c8a";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "iconv-2.1.6" = self.by-version."iconv"."2.1.6";
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -25038,37 +27349,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-expat" = self.by-version."node-expat"."2.3.6";
+  "node-expat" = self.by-version."node-expat"."2.3.7";
   by-spec."node-expat".">=1.4.1" =
-    self.by-version."node-expat"."2.3.6";
+    self.by-version."node-expat"."2.3.7";
   by-spec."node-expat"."^2.3.0" =
-    self.by-version."node-expat"."2.3.6";
+    self.by-version."node-expat"."2.3.7";
   by-spec."node-expat"."^2.3.6" =
-    self.by-version."node-expat"."2.3.6";
-  by-spec."node-expat"."~2.1.4" =
-    self.by-version."node-expat"."2.1.4";
-  by-version."node-expat"."2.1.4" = self.buildNodePackage {
-    name = "node-expat-2.1.4";
-    version = "2.1.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-expat/-/node-expat-2.1.4.tgz";
-      name = "node-expat-2.1.4.tgz";
-      sha1 = "e55a82249b71afbce09ffa880705ec37553c5121";
-    };
-    deps = {
-      "nan-0.6.0" = self.by-version."nan"."0.6.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."node-expat"."2.3.7";
   by-spec."node-expat"."~2.3.0" =
-    self.by-version."node-expat"."2.3.6";
-  by-spec."node-expat"."~2.3.1" =
-    self.by-version."node-expat"."2.3.6";
+    self.by-version."node-expat"."2.3.7";
+  by-spec."node-expat"."~2.3.7" =
+    self.by-version."node-expat"."2.3.7";
   by-spec."node-fs"."^0.1.7" =
     self.by-version."node-fs"."0.1.7";
   by-version."node-fs"."0.1.7" = self.buildNodePackage {
@@ -25089,30 +27380,63 @@
     cpu = [ ];
   };
   by-spec."node-gyp"."*" =
-    self.by-version."node-gyp"."1.0.2";
-  by-version."node-gyp"."1.0.2" = self.buildNodePackage {
-    name = "node-gyp-1.0.2";
-    version = "1.0.2";
+    self.by-version."node-gyp"."1.0.3";
+  by-version."node-gyp"."1.0.3" = self.buildNodePackage {
+    name = "node-gyp-1.0.3";
+    version = "1.0.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.2.tgz";
-      name = "node-gyp-1.0.2.tgz";
-      sha1 = "b0bb6d2d762271408dd904853e7aa3000ed2eb57";
+      url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.3.tgz";
+      name = "node-gyp-1.0.3.tgz";
+      sha1 = "a2f63f2df0b1f6cc69fa54bce3cc298aa769cbd8";
     };
     deps = {
       "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
       "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "tar-1.0.3" = self.by-version."tar"."1.0.3";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "node-gyp" = self.by-version."node-gyp"."1.0.3";
+  by-spec."node-gyp"."~0.10.6" =
+    self.by-version."node-gyp"."0.10.10";
+  by-version."node-gyp"."0.10.10" = self.buildNodePackage {
+    name = "node-gyp-0.10.10";
+    version = "0.10.10";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz";
+      name = "node-gyp-0.10.10.tgz";
+      sha1 = "74290b46b72046d648d301fae3813feb0d07edd9";
+    };
+    deps = {
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
+      "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "semver-2.1.0" = self.by-version."semver"."2.1.0";
+      "tar-0.1.20" = self.by-version."tar"."0.1.20";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
     };
     optionalDependencies = {
     };
@@ -25120,11 +27444,8 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-gyp" = self.by-version."node-gyp"."1.0.2";
-  by-spec."node-gyp"."~1.0.1" =
-    self.by-version."node-gyp"."1.0.2";
-  by-spec."node-gyp"."~1.0.2" =
-    self.by-version."node-gyp"."1.0.2";
+  by-spec."node-gyp"."~1.0.3" =
+    self.by-version."node-gyp"."1.0.3";
   by-spec."node-icu-charset-detector"."0.0.7" =
     self.by-version."node-icu-charset-detector"."0.0.7";
   by-version."node-icu-charset-detector"."0.0.7" = self.buildNodePackage {
@@ -25145,29 +27466,29 @@
     cpu = [ ];
   };
   by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.9.0";
-  by-version."node-inspector"."0.9.0" = self.buildNodePackage {
-    name = "node-inspector-0.9.0";
-    version = "0.9.0";
+    self.by-version."node-inspector"."0.9.2";
+  by-version."node-inspector"."0.9.2" = self.buildNodePackage {
+    name = "node-inspector-0.9.2";
+    version = "0.9.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.9.0.tgz";
-      name = "node-inspector-0.9.0.tgz";
-      sha1 = "af3bc431f1e2a2814fe5d790d44b09f145e2f950";
+      url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.9.2.tgz";
+      name = "node-inspector-0.9.2.tgz";
+      sha1 = "f25e2be0dbd672f7f09b50af01ef81da3157ae7c";
     };
     deps = {
-      "express-4.12.0" = self.by-version."express"."4.12.0";
+      "express-4.12.3" = self.by-version."express"."4.12.3";
       "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
       "rc-0.5.5" = self.by-version."rc"."0.5.5";
       "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "ws-0.4.32" = self.by-version."ws"."0.4.32";
-      "biased-opener-0.2.2" = self.by-version."biased-opener"."0.2.2";
+      "biased-opener-0.2.5" = self.by-version."biased-opener"."0.2.5";
       "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
-      "v8-debug-0.3.5" = self.by-version."v8-debug"."0.3.5";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "v8-debug-0.4.2" = self.by-version."v8-debug"."0.4.2";
       "v8-profiler-5.2.4" = self.by-version."v8-profiler"."5.2.4";
       "semver-3.0.1" = self.by-version."semver"."3.0.1";
     };
@@ -25177,42 +27498,42 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.9.0";
+  "node-inspector" = self.by-version."node-inspector"."0.9.2";
   by-spec."node-libs-browser"."~0.4.0" =
-    self.by-version."node-libs-browser"."0.4.1";
-  by-version."node-libs-browser"."0.4.1" = self.buildNodePackage {
-    name = "node-libs-browser-0.4.1";
-    version = "0.4.1";
+    self.by-version."node-libs-browser"."0.4.3";
+  by-version."node-libs-browser"."0.4.3" = self.buildNodePackage {
+    name = "node-libs-browser-0.4.3";
+    version = "0.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.4.1.tgz";
-      name = "node-libs-browser-0.4.1.tgz";
-      sha1 = "9d063c7f3bdc2eab8d184578b5bcb5785e63ad3a";
+      url = "http://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.4.3.tgz";
+      name = "node-libs-browser-0.4.3.tgz";
+      sha1 = "4c6f784411ecc1b383c8d5fb6c2490ae5a546099";
     };
     deps = {
+      "assert-1.3.0" = self.by-version."assert"."1.3.0";
+      "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
+      "buffer-3.1.2" = self.by-version."buffer"."3.1.2";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
-      "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
-      "crypto-browserify-3.3.0" = self.by-version."crypto-browserify"."3.3.0";
+      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
+      "crypto-browserify-3.2.8" = self.by-version."crypto-browserify"."3.2.8";
+      "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
+      "events-1.0.2" = self.by-version."events"."1.0.2";
       "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
-      "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
       "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
-      "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
+      "process-0.10.1" = self.by-version."process"."0.10.1";
+      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
-      "timers-browserify-1.3.0" = self.by-version."timers-browserify"."1.3.0";
-      "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
-      "events-1.0.2" = self.by-version."events"."1.0.2";
+      "timers-browserify-1.4.0" = self.by-version."timers-browserify"."1.4.0";
+      "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
+      "url-0.10.3" = self.by-version."url"."0.10.3";
       "util-0.10.3" = self.by-version."util"."0.10.3";
-      "assert-1.3.0" = self.by-version."assert"."1.3.0";
-      "buffer-2.8.2" = self.by-version."buffer"."2.8.2";
-      "url-0.10.2" = self.by-version."url"."0.10.2";
-      "process-0.8.0" = self.by-version."process"."0.8.0";
+      "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
     };
     optionalDependencies = {
     };
@@ -25253,7 +27574,7 @@
     deps = {
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "semver-4.1.1" = self.by-version."semver"."4.1.1";
       "tar-1.0.3" = self.by-version."tar"."1.0.3";
       "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0";
@@ -25267,7 +27588,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-pre-gyp"."^0.6.2" =
+  by-spec."node-pre-gyp"."^0.6.4" =
     self.by-version."node-pre-gyp"."0.6.4";
   by-version."node-pre-gyp"."0.6.4" = self.buildNodePackage {
     name = "node-pre-gyp-0.6.4";
@@ -25281,8 +27602,8 @@
     deps = {
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "tar-1.0.3" = self.by-version."tar"."1.0.3";
       "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
@@ -25295,22 +27616,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-pre-gyp"."^0.6.4" =
+  by-spec."node-pre-gyp"."https://github.com/mongodb-js/node-pre-gyp/archive/v0.6.5-appveyor.tar.gz" =
     self.by-version."node-pre-gyp"."0.6.4";
   by-spec."node-protobuf"."*" =
-    self.by-version."node-protobuf"."1.2.2";
-  by-version."node-protobuf"."1.2.2" = self.buildNodePackage {
-    name = "node-protobuf-1.2.2";
-    version = "1.2.2";
+    self.by-version."node-protobuf"."1.2.3";
+  by-version."node-protobuf"."1.2.3" = self.buildNodePackage {
+    name = "node-protobuf-1.2.3";
+    version = "1.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.2.tgz";
-      name = "node-protobuf-1.2.2.tgz";
-      sha1 = "8d512499fe012358c1fd89d6b4d84ad80317acb3";
+      url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.3.tgz";
+      name = "node-protobuf-1.2.3.tgz";
+      sha1 = "a38cf84db610822aff0803db45a400de6ec80835";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -25318,17 +27639,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-protobuf" = self.by-version."node-protobuf"."1.2.2";
+  "node-protobuf" = self.by-version."node-protobuf"."1.2.3";
   by-spec."node-red"."*" =
-    self.by-version."node-red"."0.10.2";
-  by-version."node-red"."0.10.2" = self.buildNodePackage {
-    name = "node-red-0.10.2";
-    version = "0.10.2";
-    bin = false;
+    self.by-version."node-red"."0.10.6";
+  by-version."node-red"."0.10.6" = self.buildNodePackage {
+    name = "node-red-0.10.6";
+    version = "0.10.6";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-red/-/node-red-0.10.2.tgz";
-      name = "node-red-0.10.2.tgz";
-      sha1 = "b0ce6fc3786754e04378e6b0bb6aa4b9b9022c33";
+      url = "http://registry.npmjs.org/node-red/-/node-red-0.10.6.tgz";
+      name = "node-red-0.10.6.tgz";
+      sha1 = "42a8a8e609bedf1c2972c50bf7deeda3d89bed3c";
     };
     deps = {
       "express-3.17.2" = self.by-version."express"."3.17.2";
@@ -25366,12 +27687,13 @@
       "oauth2orize-1.0.1" = self.by-version."oauth2orize"."1.0.1";
     };
     optionalDependencies = {
+      "bcrypt-0.8.1" = self.by-version."bcrypt"."0.8.1";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "node-red" = self.by-version."node-red"."0.10.2";
+  "node-red" = self.by-version."node-red"."0.10.6";
   by-spec."node-stringprep"."*" =
     self.by-version."node-stringprep"."0.7.0";
   by-version."node-stringprep"."0.7.0" = self.buildNodePackage {
@@ -25386,7 +27708,7 @@
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -25419,49 +27741,8 @@
   };
   by-spec."node-stringprep"."^0.7.0" =
     self.by-version."node-stringprep"."0.7.0";
-  by-spec."node-stringprep"."~0.2.0" =
-    self.by-version."node-stringprep"."0.2.3";
-  by-version."node-stringprep"."0.2.3" = self.buildNodePackage {
-    name = "node-stringprep-0.2.3";
-    version = "0.2.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.2.3.tgz";
-      name = "node-stringprep-0.2.3.tgz";
-      sha1 = "deab53eacbb2744eb65a3ab76f49a53a6d7f6b1c";
-    };
-    deps = {
-      "nan-0.7.1" = self.by-version."nan"."0.7.1";
-      "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."node-stringprep"."~0.6.0" =
-    self.by-version."node-stringprep"."0.6.2";
-  by-version."node-stringprep"."0.6.2" = self.buildNodePackage {
-    name = "node-stringprep-0.6.2";
-    version = "0.6.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.6.2.tgz";
-      name = "node-stringprep-0.6.2.tgz";
-      sha1 = "c266853e5c22dfb53d99bcc68b02218c889ccdc7";
-    };
-    deps = {
-      "nan-1.2.0" = self.by-version."nan"."1.2.0";
-      "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."node-stringprep"."~0.7.0" =
+    self.by-version."node-stringprep"."0.7.0";
   by-spec."node-stringprep"."~0.x" =
     self.by-version."node-stringprep"."0.7.0";
   by-spec."node-swt".">=0.1.1" =
@@ -25483,23 +27764,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-syslog"."1.1.7" =
+  by-spec."node-syslog"."schamane/node-syslog#30d44555" =
     self.by-version."node-syslog"."1.1.7";
   by-version."node-syslog"."1.1.7" = self.buildNodePackage {
     name = "node-syslog-1.1.7";
     version = "1.1.7";
     bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-syslog/-/node-syslog-1.1.7.tgz";
-      name = "node-syslog-1.1.7.tgz";
-      sha1 = "f2b1dfce095c39f5a6d056659862ca134a08a4cb";
+    src = fetchgit {
+      url = "git://github.com/schamane/node-syslog.git";
+      rev = "30d445559617d439714418cdc1e847efbb49c5a0";
+      sha256 = "d24a821603d8a4745839f5d90dc6bf63b5e286acf29a149ba3e412c5755a88ca";
     };
     deps = {
     };
     optionalDependencies = {
     };
     peerDependencies = [];
-    os = [ ];
+    os = [ "!win32" ];
     cpu = [ ];
   };
   by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" =
@@ -25537,15 +27818,15 @@
   };
   "node-uptime" = self.by-version."node-uptime"."3.2.0";
   by-spec."node-uuid"."*" =
-    self.by-version."node-uuid"."1.4.2";
-  by-version."node-uuid"."1.4.2" = self.buildNodePackage {
-    name = "node-uuid-1.4.2";
-    version = "1.4.2";
+    self.by-version."node-uuid"."1.4.3";
+  by-version."node-uuid"."1.4.3" = self.buildNodePackage {
+    name = "node-uuid-1.4.3";
+    version = "1.4.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz";
-      name = "node-uuid-1.4.2.tgz";
-      sha1 = "907db3d11b7b6a2cf4f905fb7199f14ae7379ba0";
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
+      name = "node-uuid-1.4.3.tgz";
+      sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
     };
     deps = {
     };
@@ -25555,7 +27836,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-uuid" = self.by-version."node-uuid"."1.4.2";
+  "node-uuid" = self.by-version."node-uuid"."1.4.3";
   by-spec."node-uuid"."1.3.3" =
     self.by-version."node-uuid"."1.3.3";
   by-version."node-uuid"."1.3.3" = self.buildNodePackage {
@@ -25575,25 +27856,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-uuid"."1.4.0" =
-    self.by-version."node-uuid"."1.4.0";
-  by-version."node-uuid"."1.4.0" = self.buildNodePackage {
-    name = "node-uuid-1.4.0";
-    version = "1.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.0.tgz";
-      name = "node-uuid-1.4.0.tgz";
-      sha1 = "07f9b2337572ff6275c775e1d48513f3a45d7a65";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."node-uuid"."1.4.1" =
     self.by-version."node-uuid"."1.4.1";
   by-version."node-uuid"."1.4.1" = self.buildNodePackage {
@@ -25614,15 +27876,17 @@
     cpu = [ ];
   };
   by-spec."node-uuid"."^1.3.3" =
-    self.by-version."node-uuid"."1.4.2";
+    self.by-version."node-uuid"."1.4.3";
   by-spec."node-uuid"."^1.4.1" =
-    self.by-version."node-uuid"."1.4.2";
+    self.by-version."node-uuid"."1.4.3";
   by-spec."node-uuid"."~1.4.0" =
-    self.by-version."node-uuid"."1.4.2";
+    self.by-version."node-uuid"."1.4.3";
   by-spec."node-uuid"."~1.4.1" =
-    self.by-version."node-uuid"."1.4.2";
+    self.by-version."node-uuid"."1.4.3";
   by-spec."node-uuid"."~1.4.2" =
-    self.by-version."node-uuid"."1.4.2";
+    self.by-version."node-uuid"."1.4.3";
+  by-spec."node-uuid"."~1.4.3" =
+    self.by-version."node-uuid"."1.4.3";
   by-spec."node-wsfederation".">=0.1.1" =
     self.by-version."node-wsfederation"."0.1.1";
   by-version."node-wsfederation"."0.1.1" = self.buildNodePackage {
@@ -25635,7 +27899,7 @@
       sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b";
     };
     deps = {
-      "xml2js-0.4.5" = self.by-version."xml2js"."0.4.5";
+      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
     };
     optionalDependencies = {
     };
@@ -25655,17 +27919,17 @@
       sha1 = "349041a9041d3bcc608cdbf57e60f5b301e7a8c0";
     };
     deps = {
-      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
+      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
       "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-      "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3";
+      "faye-websocket-0.9.4" = self.by-version."faye-websocket"."0.9.4";
       "browserify-3.19.1" = self.by-version."browserify"."3.19.1";
       "brfs-0.0.8" = self.by-version."brfs"."0.0.8";
       "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1";
       "node-xmpp-client-1.0.0-alpha20" = self.by-version."node-xmpp-client"."1.0.0-alpha20";
-      "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11";
-      "node-xmpp-core-1.0.0-alpha13" = self.by-version."node-xmpp-core"."1.0.0-alpha13";
+      "node-xmpp-server-1.0.0-alpha12" = self.by-version."node-xmpp-server"."1.0.0-alpha12";
+      "node-xmpp-core-1.0.0-alpha14" = self.by-version."node-xmpp-core"."1.0.0-alpha14";
     };
     optionalDependencies = {
     };
@@ -25674,36 +27938,8 @@
     cpu = [ ];
   };
   "node-xmpp" = self.by-version."node-xmpp"."1.0.0-alpha2";
-  by-spec."node-xmpp"."~0.15.0" =
-    self.by-version."node-xmpp"."0.15.0";
-  by-version."node-xmpp"."0.15.0" = self.buildNodePackage {
-    name = "node-xmpp-0.15.0";
-    version = "0.15.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-0.15.0.tgz";
-      name = "node-xmpp-0.15.0.tgz";
-      sha1 = "b4e1adf6b4ea859f0d06e12daca9f850286cbb14";
-    };
-    deps = {
-      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
-      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
-      "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-      "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3";
-      "browserify-3.19.1" = self.by-version."browserify"."3.19.1";
-      "brfs-0.0.8" = self.by-version."brfs"."0.0.8";
-      "node-xmpp-component-0.3.0" = self.by-version."node-xmpp-component"."0.3.0";
-      "node-xmpp-client-0.4.0" = self.by-version."node-xmpp-client"."0.4.0";
-      "node-xmpp-server-0.6.0" = self.by-version."node-xmpp-server"."0.6.0";
-      "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."node-xmpp"."~1.0.0-alpha2" =
+    self.by-version."node-xmpp"."1.0.0-alpha2";
   by-spec."node-xmpp-client"."*" =
     self.by-version."node-xmpp-client"."1.0.0-alpha9";
   by-version."node-xmpp-client"."1.0.0-alpha9" = self.buildNodePackage {
@@ -25738,7 +27974,7 @@
     bin = false;
     src = fetchgit {
       url = "https://github.com/node-xmpp/node-xmpp-client.git";
-      rev = "3be5ccc42a13377edad060b39980de70b0dd981a";
+      rev = "15685d8ad8ae9767281c74939cbec1500d9b0745";
       sha256 = "1e0cba0ec6b58a73533d723e9f5100676229d27c3fcb0799cc64bf79f97c687f";
     };
     deps = {
@@ -25755,30 +27991,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-xmpp-client"."~0.4.0" =
-    self.by-version."node-xmpp-client"."0.4.0";
-  by-version."node-xmpp-client"."0.4.0" = self.buildNodePackage {
-    name = "node-xmpp-client-0.4.0";
-    version = "0.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-0.4.0.tgz";
-      name = "node-xmpp-client-0.4.0.tgz";
-      sha1 = "350def1797eaca28c592321cd16173f93167f90b";
-    };
-    deps = {
-      "request-2.27.0" = self.by-version."request"."2.27.0";
-      "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
-      "faye-websocket-0.7.3" = self.by-version."faye-websocket"."0.7.3";
-      "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
-      "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."node-xmpp-component"."*" =
     self.by-version."node-xmpp-component"."1.0.0-alpha1";
   by-version."node-xmpp-component"."1.0.0-alpha1" = self.buildNodePackage {
@@ -25803,27 +28015,6 @@
   "node-xmpp-component" = self.by-version."node-xmpp-component"."1.0.0-alpha1";
   by-spec."node-xmpp-component"."git+https://github.com/node-xmpp/node-xmpp-component.git" =
     self.by-version."node-xmpp-component"."1.0.0-alpha1";
-  by-spec."node-xmpp-component"."~0.3.0" =
-    self.by-version."node-xmpp-component"."0.3.0";
-  by-version."node-xmpp-component"."0.3.0" = self.buildNodePackage {
-    name = "node-xmpp-component-0.3.0";
-    version = "0.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-0.3.0.tgz";
-      name = "node-xmpp-component-0.3.0.tgz";
-      sha1 = "353fb4d8250beb7f55df17805d20c81d4ea0d3c7";
-    };
-    deps = {
-      "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
-      "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."node-xmpp-core"."*" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-version."node-xmpp-core"."1.0.0-alpha9" = self.buildNodePackage {
@@ -25875,49 +28066,29 @@
   };
   by-spec."node-xmpp-core"."^1.0.0-alpha13" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
+  by-spec."node-xmpp-core"."^1.0.0-alpha14" =
+    self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-spec."node-xmpp-core"."^1.0.0-alpha6" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-spec."node-xmpp-core"."^1.0.0-alpha9" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-spec."node-xmpp-core"."git+https://github.com/node-xmpp/node-xmpp-core.git" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha13";
-  by-version."node-xmpp-core"."1.0.0-alpha13" = self.buildNodePackage {
-    name = "node-xmpp-core-1.0.0-alpha13";
-    version = "1.0.0-alpha13";
+    self.by-version."node-xmpp-core"."1.0.0-alpha14";
+  by-version."node-xmpp-core"."1.0.0-alpha14" = self.buildNodePackage {
+    name = "node-xmpp-core-1.0.0-alpha14";
+    version = "1.0.0-alpha14";
     bin = false;
     src = fetchgit {
       url = "https://github.com/node-xmpp/node-xmpp-core.git";
-      rev = "f90ae47cc977aeb52d343a7c7286aac94439dfeb";
-      sha256 = "0434a31d0e68ad4b02c66940571e7a0fed21bb488c3f246f1c4168092c60680c";
+      rev = "e4bb484de051e76383608b41e45ea54af9c8f053";
+      sha256 = "51ff9b4accbd617357a394726dd8d7afbdd9d2dbeebe155ecfc0ae54c3bec662";
     };
     deps = {
       "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0";
       "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
       "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
       "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."node-xmpp-core"."~0.5.0" =
-    self.by-version."node-xmpp-core"."0.5.0";
-  by-version."node-xmpp-core"."0.5.0" = self.buildNodePackage {
-    name = "node-xmpp-core-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-0.5.0.tgz";
-      name = "node-xmpp-core-0.5.0.tgz";
-      sha1 = "d3a453bf7bc029b7b5f10b1941e8a9e2952cf3db";
-    };
-    deps = {
-      "node-stringprep-0.2.3" = self.by-version."node-stringprep"."0.2.3";
-      "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
-      "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -25927,25 +28098,27 @@
   };
   by-spec."node-xmpp-core"."~1.0.0-alpha10" =
     self.by-version."node-xmpp-core"."1.0.0-alpha9";
+  by-spec."node-xmpp-core"."~1.0.0-alpha14" =
+    self.by-version."node-xmpp-core"."1.0.0-alpha9";
   by-spec."node-xmpp-joap"."*" =
-    self.by-version."node-xmpp-joap"."0.0.17";
-  by-version."node-xmpp-joap"."0.0.17" = self.buildNodePackage {
-    name = "node-xmpp-joap-0.0.17";
-    version = "0.0.17";
+    self.by-version."node-xmpp-joap"."0.0.18";
+  by-version."node-xmpp-joap"."0.0.18" = self.buildNodePackage {
+    name = "node-xmpp-joap-0.0.18";
+    version = "0.0.18";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.17.tgz";
-      name = "node-xmpp-joap-0.0.17.tgz";
-      sha1 = "d6d4fce1148f3fa158ed2a381787c51be3168fff";
+      url = "http://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.18.tgz";
+      name = "node-xmpp-joap-0.0.18.tgz";
+      sha1 = "208c86f23789f1409e3888ad40bf7f61138a2db9";
     };
     deps = {
-      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
-      "node-xmpp-0.15.0" = self.by-version."node-xmpp"."0.15.0";
-      "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2";
-      "ltx-0.6.0" = self.by-version."ltx"."0.6.0";
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "toobusy-0.2.4" = self.by-version."toobusy"."0.2.4";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
+      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
+      "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-xmpp-1.0.0-alpha2" = self.by-version."node-xmpp"."1.0.0-alpha2";
+      "toobusy-js-0.4.1" = self.by-version."toobusy-js"."0.4.1";
     };
     optionalDependencies = {
     };
@@ -25953,7 +28126,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.17";
+  "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.18";
   by-spec."node-xmpp-server"."*" =
     self.by-version."node-xmpp-server"."1.0.0-alpha9";
   by-version."node-xmpp-server"."1.0.0-alpha9" = self.buildNodePackage {
@@ -25978,20 +28151,20 @@
   };
   "node-xmpp-server" = self.by-version."node-xmpp-server"."1.0.0-alpha9";
   by-spec."node-xmpp-server"."git+https://github.com/node-xmpp/node-xmpp-server.git" =
-    self.by-version."node-xmpp-server"."1.0.0-alpha11";
-  by-version."node-xmpp-server"."1.0.0-alpha11" = self.buildNodePackage {
-    name = "node-xmpp-server-1.0.0-alpha11";
-    version = "1.0.0-alpha11";
+    self.by-version."node-xmpp-server"."1.0.0-alpha12";
+  by-version."node-xmpp-server"."1.0.0-alpha12" = self.buildNodePackage {
+    name = "node-xmpp-server-1.0.0-alpha12";
+    version = "1.0.0-alpha12";
     bin = false;
     src = fetchgit {
       url = "https://github.com/node-xmpp/node-xmpp-server.git";
-      rev = "1d4103d7b784a79c1c6b242e479533f4d3b4745e";
-      sha256 = "7816f60125b151430c0c38573f9adb493c75fe2f44cd41d89f0c6749a8aa6907";
+      rev = "db748d1e8c2510a6a834b9ebf179175c33c3dfba";
+      sha256 = "d0f3e91a045e3afda26ab3a276e95b15e29c099cb48f468a30185cfee3d96ce0";
     };
     deps = {
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "ws-0.7.1" = self.by-version."ws"."0.7.1";
     };
     optionalDependencies = {
@@ -26000,41 +28173,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-xmpp-server"."~0.6.0" =
-    self.by-version."node-xmpp-server"."0.6.0";
-  by-version."node-xmpp-server"."0.6.0" = self.buildNodePackage {
-    name = "node-xmpp-server-0.6.0";
-    version = "0.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-0.6.0.tgz";
-      name = "node-xmpp-server-0.6.0.tgz";
-      sha1 = "66f7102d9b0c9aa34e2d37aa2f78811964f1298e";
-    };
-    deps = {
-      "ltx-0.3.4" = self.by-version."ltx"."0.3.4";
-      "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
-      "node-xmpp-client-0.4.0" = self.by-version."node-xmpp-client"."0.4.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."node-xmpp-serviceadmin"."*" =
-    self.by-version."node-xmpp-serviceadmin"."0.1.6";
-  by-version."node-xmpp-serviceadmin"."0.1.6" = self.buildNodePackage {
-    name = "node-xmpp-serviceadmin-0.1.6";
-    version = "0.1.6";
+    self.by-version."node-xmpp-serviceadmin"."0.2.0";
+  by-version."node-xmpp-serviceadmin"."0.2.0" = self.buildNodePackage {
+    name = "node-xmpp-serviceadmin-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.1.6.tgz";
-      name = "node-xmpp-serviceadmin-0.1.6.tgz";
-      sha1 = "c67be0926b56b12c050d7caf8e2522b36ea84c00";
+      url = "http://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.2.0.tgz";
+      name = "node-xmpp-serviceadmin-0.2.0.tgz";
+      sha1 = "35f8b07cf6d96c27fe292f1b0cb9ac73f69e6315";
     };
     deps = {
-      "node-xmpp-core-0.5.0" = self.by-version."node-xmpp-core"."0.5.0";
+      "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
+      "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0";
+      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
+      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
+      "coffee-script-1.9.2" = self.by-version."coffee-script"."1.9.2";
     };
     optionalDependencies = {
     };
@@ -26042,7 +28197,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-serviceadmin" = self.by-version."node-xmpp-serviceadmin"."0.1.6";
+  "node-xmpp-serviceadmin" = self.by-version."node-xmpp-serviceadmin"."0.2.0";
   by-spec."node.extend"."1.0.0" =
     self.by-version."node.extend"."1.0.0";
   by-version."node.extend"."1.0.0" = self.buildNodePackage {
@@ -26122,10 +28277,10 @@
       sha1 = "a6e4c507b2f776a03d46e9be8d40b5be916f290a";
     };
     deps = {
-      "buildmail-1.2.0" = self.by-version."buildmail"."1.2.0";
+      "buildmail-1.2.4" = self.by-version."buildmail"."1.2.4";
       "hyperquest-0.3.0" = self.by-version."hyperquest"."0.3.0";
       "libmime-0.1.7" = self.by-version."libmime"."0.1.7";
-      "nodemailer-direct-transport-1.0.1" = self.by-version."nodemailer-direct-transport"."1.0.1";
+      "nodemailer-direct-transport-1.0.2" = self.by-version."nodemailer-direct-transport"."1.0.2";
       "nodemailer-smtp-transport-0.1.13" = self.by-version."nodemailer-smtp-transport"."0.1.13";
     };
     optionalDependencies = {
@@ -26135,18 +28290,18 @@
     cpu = [ ];
   };
   by-spec."nodemailer-direct-transport"."^1.0.0" =
-    self.by-version."nodemailer-direct-transport"."1.0.1";
-  by-version."nodemailer-direct-transport"."1.0.1" = self.buildNodePackage {
-    name = "nodemailer-direct-transport-1.0.1";
-    version = "1.0.1";
+    self.by-version."nodemailer-direct-transport"."1.0.2";
+  by-version."nodemailer-direct-transport"."1.0.2" = self.buildNodePackage {
+    name = "nodemailer-direct-transport-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.0.1.tgz";
-      name = "nodemailer-direct-transport-1.0.1.tgz";
-      sha1 = "72e41f5a419f774ba07f7f3506d1dacd1b564c2b";
+      url = "http://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.0.2.tgz";
+      name = "nodemailer-direct-transport-1.0.2.tgz";
+      sha1 = "cec0fb03bb7828c64faacc5344b28911807cdba1";
     };
     deps = {
-      "smtp-connection-1.1.0" = self.by-version."smtp-connection"."1.1.0";
+      "smtp-connection-1.2.0" = self.by-version."smtp-connection"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -26167,7 +28322,7 @@
     };
     deps = {
       "nodemailer-wellknown-0.1.5" = self.by-version."nodemailer-wellknown"."0.1.5";
-      "smtp-connection-1.1.0" = self.by-version."smtp-connection"."1.1.0";
+      "smtp-connection-1.2.0" = self.by-version."smtp-connection"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -26209,7 +28364,7 @@
       "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
       "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
       "touch-0.0.3" = self.by-version."touch"."0.0.3";
-      "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0";
+      "update-notifier-0.3.2" = self.by-version."update-notifier"."0.3.2";
     };
     optionalDependencies = {
     };
@@ -26323,6 +28478,8 @@
     self.by-version."nopt"."3.0.1";
   by-spec."nopt"."3.x" =
     self.by-version."nopt"."3.0.1";
+  by-spec."nopt"."^3.0.1" =
+    self.by-version."nopt"."3.0.1";
   by-spec."nopt"."~1.0.10" =
     self.by-version."nopt"."1.0.10";
   by-version."nopt"."1.0.10" = self.buildNodePackage {
@@ -26345,10 +28502,26 @@
   };
   by-spec."nopt"."~2" =
     self.by-version."nopt"."2.2.1";
-  by-spec."nopt"."~2.2.0" =
-    self.by-version."nopt"."2.2.1";
-  by-spec."nopt"."~3.0.0" =
-    self.by-version."nopt"."3.0.1";
+  by-spec."nopt"."~2.1.1" =
+    self.by-version."nopt"."2.1.2";
+  by-version."nopt"."2.1.2" = self.buildNodePackage {
+    name = "nopt-2.1.2";
+    version = "2.1.2";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
+      name = "nopt-2.1.2.tgz";
+      sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+    };
+    deps = {
+      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."nopt"."~3.0.1" =
     self.by-version."nopt"."3.0.1";
   by-spec."normalize-git-url"."~1.0.0" =
@@ -26370,6 +28543,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."normalize-package-data"."^0.2.13" =
+    self.by-version."normalize-package-data"."0.2.13";
+  by-version."normalize-package-data"."0.2.13" = self.buildNodePackage {
+    name = "normalize-package-data-0.2.13";
+    version = "0.2.13";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.13.tgz";
+      name = "normalize-package-data-0.2.13.tgz";
+      sha1 = "50f9fd9e77b1c8411cd231db2962e73963de774d";
+    };
+    deps = {
+      "github-url-from-git-1.1.1" = self.by-version."github-url-from-git"."1.1.1";
+      "github-url-from-username-repo-0.1.0" = self.by-version."github-url-from-username-repo"."0.1.0";
+      "semver-2.3.2" = self.by-version."semver"."2.3.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."normalize-package-data"."^1.0.0" =
     self.by-version."normalize-package-data"."1.0.3";
   by-version."normalize-package-data"."1.0.3" = self.buildNodePackage {
@@ -26384,7 +28579,28 @@
     deps = {
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."normalize-package-data"."^2.0.0" =
+    self.by-version."normalize-package-data"."2.0.0";
+  by-version."normalize-package-data"."2.0.0" = self.buildNodePackage {
+    name = "normalize-package-data-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.0.0.tgz";
+      name = "normalize-package-data-2.0.0.tgz";
+      sha1 = "8795d0d5c70c0e9ca36f419548aac0abf1f638bc";
+    };
+    deps = {
+      "hosted-git-info-2.1.2" = self.by-version."hosted-git-info"."2.1.2";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -26394,83 +28610,87 @@
   };
   by-spec."normalize-package-data"."~1.0.1" =
     self.by-version."normalize-package-data"."1.0.3";
-  by-spec."normalize-package-data"."~1.0.3" =
-    self.by-version."normalize-package-data"."1.0.3";
+  by-spec."normalize-package-data"."~1.0.1 || ^2.0.0" =
+    self.by-version."normalize-package-data"."2.0.0";
+  by-spec."normalize-package-data"."~2.0.0" =
+    self.by-version."normalize-package-data"."2.0.0";
   by-spec."npm"."*" =
-    self.by-version."npm"."2.6.1";
-  by-version."npm"."2.6.1" = self.buildNodePackage {
-    name = "npm-2.6.1";
-    version = "2.6.1";
+    self.by-version."npm"."2.8.4";
+  by-version."npm"."2.8.4" = self.buildNodePackage {
+    name = "npm-2.8.4";
+    version = "2.8.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm/-/npm-2.6.1.tgz";
-      name = "npm-2.6.1.tgz";
-      sha1 = "22aefa7867d021f63d60fadc1eb48f0adb744242";
+      url = "http://registry.npmjs.org/npm/-/npm-2.8.4.tgz";
+      name = "npm-2.8.4.tgz";
+      sha1 = "f5d84c990466b2b535b7be6ff7706fcf4bf38255";
     };
     deps = {
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
       "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2";
       "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3";
       "archy-1.0.0" = self.by-version."archy"."1.0.0";
       "async-some-1.0.1" = self.by-version."async-some"."1.0.1";
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
       "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1";
-      "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1";
       "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
       "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
       "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1";
-      "columnify-1.4.1" = self.by-version."columnify"."1.4.1";
+      "columnify-1.5.1" = self.by-version."columnify"."1.5.1";
       "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
       "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
       "editor-0.1.0" = self.by-version."editor"."0.1.0";
       "fs-vacuum-1.2.5" = self.by-version."fs-vacuum"."1.2.5";
       "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2";
       "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
-      "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1";
+      "fstream-npm-1.0.2" = self.by-version."fstream-npm"."1.0.2";
       "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
       "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "hosted-git-info-2.1.2" = self.by-version."hosted-git-info"."2.1.2";
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "ini-1.3.3" = self.by-version."ini"."1.3.3";
-      "init-package-json-1.2.0" = self.by-version."init-package-json"."1.2.0";
+      "init-package-json-1.4.1" = self.by-version."init-package-json"."1.4.1";
       "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0";
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "node-gyp-1.0.2" = self.by-version."node-gyp"."1.0.2";
+      "node-gyp-1.0.3" = self.by-version."node-gyp"."1.0.3";
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "normalize-git-url-1.0.0" = self.by-version."normalize-git-url"."1.0.0";
-      "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+      "normalize-package-data-2.0.0" = self.by-version."normalize-package-data"."2.0.0";
       "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1";
       "npm-install-checks-1.0.5" = self.by-version."npm-install-checks"."1.0.5";
-      "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3";
-      "npm-registry-client-6.1.1" = self.by-version."npm-registry-client"."6.1.1";
+      "npm-package-arg-4.0.0" = self.by-version."npm-package-arg"."4.0.0";
+      "npm-registry-client-6.3.2" = self.by-version."npm-registry-client"."6.3.2";
       "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1";
-      "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
+      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
-      "opener-1.4.0" = self.by-version."opener"."1.4.0";
+      "opener-1.4.1" = self.by-version."opener"."1.4.1";
       "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
       "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
       "read-1.0.5" = self.by-version."read"."1.0.5";
-      "read-installed-3.1.5" = self.by-version."read-installed"."3.1.5";
-      "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
+      "read-installed-4.0.0" = self.by-version."read-installed"."4.0.0";
+      "read-package-json-2.0.0" = self.by-version."read-package-json"."2.0.0";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "realize-package-specifier-1.3.0" = self.by-version."realize-package-specifier"."1.3.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "realize-package-specifier-3.0.0" = self.by-version."realize-package-specifier"."3.0.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "sha-1.3.0" = self.by-version."sha"."1.3.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0";
-      "tar-1.0.3" = self.by-version."tar"."1.0.3";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "tar-2.1.0" = self.by-version."tar"."2.1.0";
       "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
       "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6";
       "umask-1.1.0" = self.by-version."umask"."1.1.0";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
       "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0";
     };
@@ -26480,71 +28700,60 @@
     os = [ ];
     cpu = [ ];
   };
-  "npm" = self.by-version."npm"."2.6.1";
-  by-spec."npm"."1.4.28" =
-    self.by-version."npm"."1.4.28";
-  by-version."npm"."1.4.28" = self.buildNodePackage {
-    name = "npm-1.4.28";
-    version = "1.4.28";
+  "npm" = self.by-version."npm"."2.8.4";
+  by-spec."npm"."1.3.4" =
+    self.by-version."npm"."1.3.4";
+  by-version."npm"."1.3.4" = self.buildNodePackage {
+    name = "npm-1.3.4";
+    version = "1.3.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm/-/npm-1.4.28.tgz";
-      name = "npm-1.4.28.tgz";
-      sha1 = "da2a18f871c0cf7edae706b72b2f2b44cf74d7d3";
+      url = "http://registry.npmjs.org/npm/-/npm-1.3.4.tgz";
+      name = "npm-1.3.4.tgz";
+      sha1 = "1dacc91458f2197c362d774d2cbf111680f86ec2";
     };
     deps = {
+      "semver-2.0.11" = self.by-version."semver"."2.0.11";
+      "ini-1.1.0" = self.by-version."ini"."1.1.0";
+      "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
-      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
-      "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2";
-      "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3";
-      "archy-0.0.2" = self.by-version."archy"."0.0.2";
+      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "nopt-2.1.2" = self.by-version."nopt"."2.1.2";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "request-2.21.0" = self.by-version."request"."2.21.0";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "tar-0.1.20" = self.by-version."tar"."0.1.20";
+      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1";
-      "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1";
-      "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
+      "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "read-1.0.5" = self.by-version."read"."1.0.5";
+      "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1";
+      "node-gyp-0.10.10" = self.by-version."node-gyp"."0.10.10";
+      "fstream-npm-0.1.8" = self.by-version."fstream-npm"."0.1.8";
+      "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6";
+      "archy-0.0.2" = self.by-version."archy"."0.0.2";
       "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "cmd-shim-2.0.0" = self.by-version."cmd-shim"."2.0.0";
-      "columnify-1.2.1" = self.by-version."columnify"."1.2.1";
-      "editor-0.1.0" = self.by-version."editor"."0.1.0";
-      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
-      "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1";
-      "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
-      "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-4.0.6" = self.by-version."glob"."4.0.6";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
-      "ini-1.2.1" = self.by-version."ini"."1.2.1";
-      "init-package-json-1.0.1" = self.by-version."init-package-json"."1.0.1";
-      "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0";
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
-      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "node-gyp-1.0.2" = self.by-version."node-gyp"."1.0.2";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1";
-      "npm-install-checks-1.0.5" = self.by-version."npm-install-checks"."1.0.5";
-      "npm-registry-client-2.0.7" = self.by-version."npm-registry-client"."2.0.7";
-      "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1";
-      "npmconf-1.1.9" = self.by-version."npmconf"."1.1.9";
-      "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "opener-1.3.0" = self.by-version."opener"."1.3.0";
+      "npmlog-0.0.4" = self.by-version."npmlog"."0.0.4";
+      "ansi-0.1.2" = self.by-version."ansi"."0.1.2";
+      "npm-registry-client-0.2.31" = self.by-version."npm-registry-client"."0.2.31";
+      "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9";
+      "read-installed-0.2.5" = self.by-version."read-installed"."0.2.5";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "init-package-json-0.0.10" = self.by-version."init-package-json"."0.0.10";
       "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
-      "read-1.0.5" = self.by-version."read"."1.0.5";
-      "read-installed-2.0.7" = self.by-version."read-installed"."2.0.7";
-      "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7";
-      "request-2.42.0" = self.by-version."request"."2.42.0";
+      "lockfile-0.4.3" = self.by-version."lockfile"."0.4.3";
       "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
-      "sha-1.2.4" = self.by-version."sha"."1.2.4";
-      "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0";
-      "tar-1.0.3" = self.by-version."tar"."1.0.3";
-      "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
-      "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "once-1.1.1" = self.by-version."once"."1.1.1";
+      "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16";
+      "opener-1.3.0" = self.by-version."opener"."1.3.0";
+      "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
+      "cmd-shim-1.1.2" = self.by-version."cmd-shim"."1.1.2";
+      "sha-1.0.1" = self.by-version."sha"."1.0.1";
+      "editor-0.0.4" = self.by-version."editor"."0.0.4";
+      "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1";
+      "npm-user-validate-0.0.3" = self.by-version."npm-user-validate"."0.0.3";
     };
     optionalDependencies = {
     };
@@ -26553,8 +28762,8 @@
     cpu = [ ];
   };
   by-spec."npm"."^2.5.1" =
-    self.by-version."npm"."2.6.1";
-  by-spec."npm-cache-filename"."^1.0.0" =
+    self.by-version."npm"."2.8.4";
+  by-spec."npm-cache-filename"."~1.0.1" =
     self.by-version."npm-cache-filename"."1.0.1";
   by-version."npm-cache-filename"."1.0.1" = self.buildNodePackage {
     name = "npm-cache-filename-1.0.1";
@@ -26573,8 +28782,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-cache-filename"."~1.0.1" =
-    self.by-version."npm-cache-filename"."1.0.1";
   by-spec."npm-check-updates"."*" =
     self.by-version."npm-check-updates"."2.0.0-alpha6";
   by-version."npm-check-updates"."2.0.0-alpha6" = self.buildNodePackage {
@@ -26590,11 +28797,11 @@
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "cint-8.2.1" = self.by-version."cint"."8.2.1";
       "closest-package-1.0.0" = self.by-version."closest-package"."1.0.0";
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
-      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
-      "npm-2.6.1" = self.by-version."npm"."2.6.1";
-      "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "commander-2.8.0" = self.by-version."commander"."2.8.0";
+      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
+      "npm-2.8.4" = self.by-version."npm"."2.8.4";
+      "read-package-json-1.3.3" = self.by-version."read-package-json"."1.3.3";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -26603,7 +28810,7 @@
     cpu = [ ];
   };
   "npm-check-updates" = self.by-version."npm-check-updates"."2.0.0-alpha6";
-  by-spec."npm-install-checks"."~1.0.2" =
+  by-spec."npm-install-checks"."~1.0.5" =
     self.by-version."npm-install-checks"."1.0.5";
   by-version."npm-install-checks"."1.0.5" = self.buildNodePackage {
     name = "npm-install-checks-1.0.5";
@@ -26615,8 +28822,8 @@
       sha1 = "a1b5beabfd60e0535b14f763157c410cb6bdae56";
     };
     deps = {
-      "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -26624,21 +28831,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-install-checks"."~1.0.5" =
-    self.by-version."npm-install-checks"."1.0.5";
-  by-spec."npm-package-arg"."^2.1.3" =
-    self.by-version."npm-package-arg"."2.1.3";
-  by-version."npm-package-arg"."2.1.3" = self.buildNodePackage {
-    name = "npm-package-arg-2.1.3";
-    version = "2.1.3";
+  by-spec."npm-package-arg"."^3.0.0" =
+    self.by-version."npm-package-arg"."3.1.1";
+  by-version."npm-package-arg"."3.1.1" = self.buildNodePackage {
+    name = "npm-package-arg-3.1.1";
+    version = "3.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-2.1.3.tgz";
-      name = "npm-package-arg-2.1.3.tgz";
-      sha1 = "dfba34bd82dd327c10cb43a65c8db6ef0b812bf7";
+      url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-3.1.1.tgz";
+      name = "npm-package-arg-3.1.1.tgz";
+      sha1 = "c9e5f7587f8484d1372a9b386fbf8b2443fc1bdb";
     };
     deps = {
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "hosted-git-info-1.6.0" = self.by-version."hosted-git-info"."1.6.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -26646,20 +28852,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-package-arg"."^3.0.0" =
-    self.by-version."npm-package-arg"."3.1.0";
-  by-version."npm-package-arg"."3.1.0" = self.buildNodePackage {
-    name = "npm-package-arg-3.1.0";
-    version = "3.1.0";
+  by-spec."npm-package-arg"."^3.0.0 || ^4.0.0" =
+    self.by-version."npm-package-arg"."4.0.0";
+  by-version."npm-package-arg"."4.0.0" = self.buildNodePackage {
+    name = "npm-package-arg-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-3.1.0.tgz";
-      name = "npm-package-arg-3.1.0.tgz";
-      sha1 = "8ce9d8ad83ae9fcc433783ca813e4e91f885703e";
+      url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.0.tgz";
+      name = "npm-package-arg-4.0.0.tgz";
+      sha1 = "04766dc98dbc19f6d627a5817075f4ce13d64a5d";
     };
     deps = {
-      "hosted-git-info-1.5.3" = self.by-version."hosted-git-info"."1.5.3";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "hosted-git-info-2.1.2" = self.by-version."hosted-git-info"."2.1.2";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -26667,8 +28873,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-package-arg"."~2.1.3" =
-    self.by-version."npm-package-arg"."2.1.3";
+  by-spec."npm-package-arg"."^4.0.0" =
+    self.by-version."npm-package-arg"."4.0.0";
+  by-spec."npm-package-arg"."~4.0.0" =
+    self.by-version."npm-package-arg"."4.0.0";
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = self.buildNodePackage {
@@ -26681,116 +28889,136 @@
       sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
     };
     deps = {
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "semver-2.0.11" = self.by-version."semver"."2.0.11";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
       "retry-0.6.0" = self.by-version."retry"."0.6.0";
       "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20";
     };
     optionalDependencies = {
-      "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
+      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-registry-client"."~2.0.7" =
-    self.by-version."npm-registry-client"."2.0.7";
-  by-version."npm-registry-client"."2.0.7" = self.buildNodePackage {
-    name = "npm-registry-client-2.0.7";
-    version = "2.0.7";
+  by-spec."npm-registry-client"."~0.2.27" =
+    self.by-version."npm-registry-client"."0.2.31";
+  by-version."npm-registry-client"."0.2.31" = self.buildNodePackage {
+    name = "npm-registry-client-0.2.31";
+    version = "0.2.31";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-2.0.7.tgz";
-      name = "npm-registry-client-2.0.7.tgz";
-      sha1 = "97a2cdca5aba753b4b5b334b4ae65669c6641085";
+      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.31.tgz";
+      name = "npm-registry-client-0.2.31.tgz";
+      sha1 = "24a23e24e43246677cb485f8391829e9536563d4";
     };
     deps = {
-      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
-      "retry-0.6.0" = self.by-version."retry"."0.6.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
+      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "retry-0.6.0" = self.by-version."retry"."0.6.0";
+      "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20";
     };
     optionalDependencies = {
-      "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
+      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-registry-client"."~4.0.4" =
-    self.by-version."npm-registry-client"."4.0.5";
-  by-version."npm-registry-client"."4.0.5" = self.buildNodePackage {
-    name = "npm-registry-client-4.0.5";
-    version = "4.0.5";
+  by-spec."npm-registry-client"."~6.1.2" =
+    self.by-version."npm-registry-client"."6.1.2";
+  by-version."npm-registry-client"."6.1.2" = self.buildNodePackage {
+    name = "npm-registry-client-6.1.2";
+    version = "6.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.5.tgz";
-      name = "npm-registry-client-4.0.5.tgz";
-      sha1 = "27d37ca0c7bbd5df14f4ae35223a4d588dd4fea6";
+      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.1.2.tgz";
+      name = "npm-registry-client-6.1.2.tgz";
+      sha1 = "b74ba7efa9bfbbce46a1bd15fa97dc7d784099cb";
     };
     deps = {
       "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+      "npm-package-arg-3.1.1" = self.by-version."npm-package-arg"."3.1.1";
       "once-1.3.1" = self.by-version."once"."1.3.1";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
     optionalDependencies = {
-      "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
+      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-registry-client"."~6.1.1" =
-    self.by-version."npm-registry-client"."6.1.1";
-  by-version."npm-registry-client"."6.1.1" = self.buildNodePackage {
-    name = "npm-registry-client-6.1.1";
-    version = "6.1.1";
+  by-spec."npm-registry-client"."~6.3.2" =
+    self.by-version."npm-registry-client"."6.3.2";
+  by-version."npm-registry-client"."6.3.2" = self.buildNodePackage {
+    name = "npm-registry-client-6.3.2";
+    version = "6.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.1.1.tgz";
-      name = "npm-registry-client-6.1.1.tgz";
-      sha1 = "ffc74d9d85f3228fcd21a7eaad8a8ed134a5dddb";
+      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.3.2.tgz";
+      name = "npm-registry-client-6.3.2.tgz";
+      sha1 = "a662a36c6eda56c184099631cf429ba69b73d65b";
     };
     deps = {
       "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
-      "npm-package-arg-3.1.0" = self.by-version."npm-package-arg"."3.1.0";
+      "normalize-package-data-2.0.0" = self.by-version."normalize-package-data"."2.0.0";
+      "npm-package-arg-4.0.0" = self.by-version."npm-package-arg"."4.0.0";
       "once-1.3.1" = self.by-version."once"."1.3.1";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
     optionalDependencies = {
-      "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
+      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."npm-user-validate"."0.0.3" =
+    self.by-version."npm-user-validate"."0.0.3";
+  by-version."npm-user-validate"."0.0.3" = self.buildNodePackage {
+    name = "npm-user-validate-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
+      name = "npm-user-validate-0.0.3.tgz";
+      sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-user-validate"."~0.1.0" =
+  by-spec."npm-user-validate"."~0.1.1" =
     self.by-version."npm-user-validate"."0.1.1";
   by-version."npm-user-validate"."0.1.1" = self.buildNodePackage {
     name = "npm-user-validate-0.1.1";
@@ -26809,21 +29037,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-user-validate"."~0.1.1" =
-    self.by-version."npm-user-validate"."0.1.1";
-  by-spec."npm2nix"."git://github.com/NixOS/npm2nix.git#5.11.0" =
-    self.by-version."npm2nix"."5.11.0";
-  by-version."npm2nix"."5.11.0" = self.buildNodePackage {
-    name = "npm2nix-5.11.0";
-    version = "5.11.0";
+  by-spec."npm2nix"."git://github.com/NixOS/npm2nix.git#5.12.0" =
+    self.by-version."npm2nix"."5.12.0";
+  by-version."npm2nix"."5.12.0" = self.buildNodePackage {
+    name = "npm2nix-5.12.0";
+    version = "5.12.0";
     bin = true;
     src = fetchgit {
       url = "git://github.com/NixOS/npm2nix.git";
-      rev = "95ebee69a177910f47c661870f1b4b549f5ce796";
-      sha256 = "2a1e675b906a7b176af2953427ac38269c2ebe9ff37e96d9c18da98fa6aae3a7";
+      rev = "0c06be7d278a7f64fc853a5fd42d2031d14496d5";
+      sha256 = "fb79dccb5ca4bfa0c8cc4490be37313367eb98e216d8eb97cb00f9e492e8e7a7";
     };
     deps = {
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
       "npm-registry-client-0.2.27" = self.by-version."npm-registry-client"."0.2.27";
       "npmconf-0.1.1" = self.by-version."npmconf"."0.1.1";
@@ -26831,7 +29057,7 @@
       "temp-0.6.0" = self.by-version."temp"."0.6.0";
       "fs.extra-1.3.2" = self.by-version."fs.extra"."1.3.2";
       "findit-1.2.0" = self.by-version."findit"."1.2.0";
-      "coffee-script-1.9.1" = self.by-version."coffee-script"."1.9.1";
+      "coffee-script-1.9.2" = self.by-version."coffee-script"."1.9.2";
     };
     optionalDependencies = {
     };
@@ -26839,7 +29065,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "npm2nix" = self.by-version."npm2nix"."5.11.0";
+  "npm2nix" = self.by-version."npm2nix"."5.12.0";
   by-spec."npmconf"."0.1.1" =
     self.by-version."npmconf"."0.1.1";
   by-version."npmconf"."0.1.1" = self.buildNodePackage {
@@ -26894,35 +29120,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmconf"."2.0.9" =
-    self.by-version."npmconf"."2.0.9";
-  by-version."npmconf"."2.0.9" = self.buildNodePackage {
-    name = "npmconf-2.0.9";
-    version = "2.0.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/npmconf/-/npmconf-2.0.9.tgz";
-      name = "npmconf-2.0.9.tgz";
-      sha1 = "5c87e5fb308104eceeca781e3d9115d216351ef2";
-    };
-    deps = {
-      "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
-      "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."npmconf"."^2.0.1" =
+  by-spec."npmconf"."2.1.1" =
     self.by-version."npmconf"."2.1.1";
   by-version."npmconf"."2.1.1" = self.buildNodePackage {
     name = "npmconf-2.1.1";
@@ -26941,7 +29139,7 @@
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "once-1.3.1" = self.by-version."once"."1.3.1";
       "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
     };
     optionalDependencies = {
@@ -26950,53 +29148,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."npmconf"."~0.1.1" =
+    self.by-version."npmconf"."0.1.16";
   by-spec."npmconf"."~0.1.2" =
     self.by-version."npmconf"."0.1.16";
-  by-spec."npmconf"."~1.1.8" =
-    self.by-version."npmconf"."1.1.9";
-  by-version."npmconf"."1.1.9" = self.buildNodePackage {
-    name = "npmconf-1.1.9";
-    version = "1.1.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/npmconf/-/npmconf-1.1.9.tgz";
-      name = "npmconf-1.1.9.tgz";
-      sha1 = "0ec71e3c5e604c84facc313cd175636ec11c8a6a";
-    };
-    deps = {
-      "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
-      "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."npmconf"."~2.1.1" =
     self.by-version."npmconf"."2.1.1";
   by-spec."npmlog"."*" =
-    self.by-version."npmlog"."1.1.0";
-  by-version."npmlog"."1.1.0" = self.buildNodePackage {
-    name = "npmlog-1.1.0";
-    version = "1.1.0";
+    self.by-version."npmlog"."1.2.0";
+  by-version."npmlog"."1.2.0" = self.buildNodePackage {
+    name = "npmlog-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmlog/-/npmlog-1.1.0.tgz";
-      name = "npmlog-1.1.0.tgz";
-      sha1 = "8744168148df1ce3f3387c0bc38154883b4af5f4";
+      url = "http://registry.npmjs.org/npmlog/-/npmlog-1.2.0.tgz";
+      name = "npmlog-1.2.0.tgz";
+      sha1 = "b512f18ae8696a0192ada78ba00c06dbbd91bafb";
     };
     deps = {
       "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
-      "are-we-there-yet-1.0.2" = self.by-version."are-we-there-yet"."1.0.2";
-      "gauge-1.1.0" = self.by-version."gauge"."1.1.0";
+      "are-we-there-yet-1.0.4" = self.by-version."are-we-there-yet"."1.0.4";
+      "gauge-1.2.0" = self.by-version."gauge"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -27024,12 +29196,56 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."npmlog"."0 || 1" =
+    self.by-version."npmlog"."1.2.0";
+  by-spec."npmlog"."0.0.4" =
+    self.by-version."npmlog"."0.0.4";
+  by-version."npmlog"."0.0.4" = self.buildNodePackage {
+    name = "npmlog-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz";
+      name = "npmlog-0.0.4.tgz";
+      sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837";
+    };
+    deps = {
+      "ansi-0.1.2" = self.by-version."ansi"."0.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."npmlog"."0.1 || 1" =
-    self.by-version."npmlog"."1.1.0";
+    self.by-version."npmlog"."1.2.0";
   by-spec."npmlog"."~0.1.1" =
     self.by-version."npmlog"."0.1.1";
   by-spec."npmlog"."~1.1.0" =
     self.by-version."npmlog"."1.1.0";
+  by-version."npmlog"."1.1.0" = self.buildNodePackage {
+    name = "npmlog-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/npmlog/-/npmlog-1.1.0.tgz";
+      name = "npmlog-1.1.0.tgz";
+      sha1 = "8744168148df1ce3f3387c0bc38154883b4af5f4";
+    };
+    deps = {
+      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
+      "are-we-there-yet-1.0.4" = self.by-version."are-we-there-yet"."1.0.4";
+      "gauge-1.1.0" = self.by-version."gauge"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."npmlog"."~1.2.0" =
+    self.by-version."npmlog"."1.2.0";
   by-spec."nssocket"."~0.5.1" =
     self.by-version."nssocket"."0.5.3";
   by-version."nssocket"."0.5.3" = self.buildNodePackage {
@@ -27278,25 +29494,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."object-assign"."^0.3.0" =
-    self.by-version."object-assign"."0.3.1";
-  by-version."object-assign"."0.3.1" = self.buildNodePackage {
-    name = "object-assign-0.3.1";
-    version = "0.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz";
-      name = "object-assign-0.3.1.tgz";
-      sha1 = "060e2a2a27d7c0d77ec77b78f11aa47fd88008d2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."object-assign"."^1.0.0" =
     self.by-version."object-assign"."1.0.0";
   by-version."object-assign"."1.0.0" = self.buildNodePackage {
@@ -27354,6 +29551,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."object-inspect"."~0.4.0" =
+    self.by-version."object-inspect"."0.4.0";
+  by-version."object-inspect"."0.4.0" = self.buildNodePackage {
+    name = "object-inspect-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz";
+      name = "object-inspect-0.4.0.tgz";
+      sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."object-keys"."1.0.1" =
+    self.by-version."object-keys"."1.0.1";
+  by-version."object-keys"."1.0.1" = self.buildNodePackage {
+    name = "object-keys-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-keys/-/object-keys-1.0.1.tgz";
+      name = "object-keys-1.0.1.tgz";
+      sha1 = "55802e85842c26bbb5ebbc157abf3be302569ba8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."object-keys"."~0.4.0" =
     self.by-version."object-keys"."0.4.0";
   by-version."object-keys"."0.4.0" = self.buildNodePackage {
@@ -27373,6 +29608,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."object.omit"."^0.2.1" =
+    self.by-version."object.omit"."0.2.1";
+  by-version."object.omit"."0.2.1" = self.buildNodePackage {
+    name = "object.omit-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object.omit/-/object.omit-0.2.1.tgz";
+      name = "object.omit-0.2.1.tgz";
+      sha1 = "ca9af6631df6883fe61bae74df82a4fbc9df2e92";
+    };
+    deps = {
+      "for-own-0.1.3" = self.by-version."for-own"."0.1.3";
+      "isobject-0.2.0" = self.by-version."isobject"."0.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."on-finished"."2.1.0" =
     self.by-version."on-finished"."2.1.0";
   by-version."on-finished"."2.1.0" = self.buildNodePackage {
@@ -27456,25 +29712,6 @@
   };
   by-spec."on-headers"."~1.0.0" =
     self.by-version."on-headers"."1.0.0";
-  by-spec."once"."1.1.1" =
-    self.by-version."once"."1.1.1";
-  by-version."once"."1.1.1" = self.buildNodePackage {
-    name = "once-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
-      name = "once-1.1.1.tgz";
-      sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."once"."1.3.0" =
     self.by-version."once"."1.3.0";
   by-version."once"."1.3.0" = self.buildNodePackage {
@@ -27522,6 +29759,23 @@
     self.by-version."once"."1.3.1";
   by-spec."once"."~1.1.1" =
     self.by-version."once"."1.1.1";
+  by-version."once"."1.1.1" = self.buildNodePackage {
+    name = "once-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
+      name = "once-1.1.1.tgz";
+      sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."once"."~1.2.0" =
     self.by-version."once"."1.2.0";
   by-version."once"."1.2.0" = self.buildNodePackage {
@@ -27608,16 +29862,16 @@
     self.by-version."open"."0.0.5";
   by-spec."open"."~0.0.5" =
     self.by-version."open"."0.0.5";
-  by-spec."opener"."1.4.0" =
-    self.by-version."opener"."1.4.0";
-  by-version."opener"."1.4.0" = self.buildNodePackage {
-    name = "opener-1.4.0";
-    version = "1.4.0";
+  by-spec."opener"."1.4.1" =
+    self.by-version."opener"."1.4.1";
+  by-version."opener"."1.4.1" = self.buildNodePackage {
+    name = "opener-1.4.1";
+    version = "1.4.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz";
-      name = "opener-1.4.0.tgz";
-      sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941";
+      url = "http://registry.npmjs.org/opener/-/opener-1.4.1.tgz";
+      name = "opener-1.4.1.tgz";
+      sha1 = "897590acd1aed3311b703b58bccb4d43f56f2895";
     };
     deps = {
     };
@@ -27646,18 +29900,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."opener"."~1.4.0" =
-    self.by-version."opener"."1.4.0";
+  by-spec."opener"."~1.4.1" =
+    self.by-version."opener"."1.4.1";
   by-spec."openid".">=0.2.0" =
-    self.by-version."openid"."0.5.9";
-  by-version."openid"."0.5.9" = self.buildNodePackage {
-    name = "openid-0.5.9";
-    version = "0.5.9";
+    self.by-version."openid"."0.5.11";
+  by-version."openid"."0.5.11" = self.buildNodePackage {
+    name = "openid-0.5.11";
+    version = "0.5.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/openid/-/openid-0.5.9.tgz";
-      name = "openid-0.5.9.tgz";
-      sha1 = "f44dd2609764c458c65fb22c03db068579e4bfa8";
+      url = "http://registry.npmjs.org/openid/-/openid-0.5.11.tgz";
+      name = "openid-0.5.11.tgz";
+      sha1 = "01fda48f3c1d73d2f073f34240c933747eeac056";
     };
     deps = {
     };
@@ -27667,7 +29921,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."opn"."~1.0.0" =
+  by-spec."opn"."^1.0.1" =
     self.by-version."opn"."1.0.1";
   by-version."opn"."1.0.1" = self.buildNodePackage {
     name = "opn-1.0.1";
@@ -28024,7 +30278,7 @@
       sha1 = "02bee80f3b898aaa88922d2f86e178605974beac";
     };
     deps = {
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -28075,16 +30329,16 @@
   "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4";
   by-spec."owl-deepcopy"."~0.0.1" =
     self.by-version."owl-deepcopy"."0.0.4";
-  by-spec."p-throttler"."0.1.0" =
-    self.by-version."p-throttler"."0.1.0";
-  by-version."p-throttler"."0.1.0" = self.buildNodePackage {
-    name = "p-throttler-0.1.0";
-    version = "0.1.0";
+  by-spec."p-throttler"."0.1.1" =
+    self.by-version."p-throttler"."0.1.1";
+  by-version."p-throttler"."0.1.1" = self.buildNodePackage {
+    name = "p-throttler-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz";
-      name = "p-throttler-0.1.0.tgz";
-      sha1 = "1b16907942c333e6f1ddeabcb3479204b8c417c4";
+      url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.1.1.tgz";
+      name = "p-throttler-0.1.1.tgz";
+      sha1 = "15246409d225d3eefca85c50de710a83a78cca6a";
     };
     deps = {
       "q-0.9.7" = self.by-version."q"."0.9.7";
@@ -28113,7 +30367,7 @@
       "proxy-agent-1.1.0" = self.by-version."proxy-agent"."1.1.0";
       "get-uri-0.1.3" = self.by-version."get-uri"."0.1.3";
       "stream-to-array-1.0.0" = self.by-version."stream-to-array"."1.0.0";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
     };
     optionalDependencies = {
     };
@@ -28135,8 +30389,8 @@
     deps = {
       "co-3.0.6" = self.by-version."co"."3.0.6";
       "netmask-1.0.5" = self.by-version."netmask"."1.0.5";
-      "degenerator-1.0.0" = self.by-version."degenerator"."1.0.0";
-      "regenerator-0.8.14" = self.by-version."regenerator"."0.8.14";
+      "degenerator-1.0.1" = self.by-version."degenerator"."1.0.1";
+      "regenerator-0.8.22" = self.by-version."regenerator"."0.8.22";
       "thunkify-2.1.2" = self.by-version."thunkify"."2.1.2";
     };
     optionalDependencies = {
@@ -28145,27 +30399,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."package-json"."^0.2.0" =
-    self.by-version."package-json"."0.2.0";
-  by-version."package-json"."0.2.0" = self.buildNodePackage {
-    name = "package-json-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz";
-      name = "package-json-0.2.0.tgz";
-      sha1 = "0316e177b8eb149985d34f706b4a5543b274bec5";
-    };
-    deps = {
-      "got-0.3.0" = self.by-version."got"."0.3.0";
-      "registry-url-0.1.1" = self.by-version."registry-url"."0.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."package-json"."^1.0.0" =
     self.by-version."package-json"."1.1.0";
   by-version."package-json"."1.1.0" = self.buildNodePackage {
@@ -28178,8 +30411,8 @@
       sha1 = "32b427c626385ccce180dc73a66d94f35f545e4b";
     };
     deps = {
-      "got-2.4.0" = self.by-version."got"."2.4.0";
-      "registry-url-3.0.0" = self.by-version."registry-url"."3.0.0";
+      "got-2.7.2" = self.by-version."got"."2.7.2";
+      "registry-url-3.0.3" = self.by-version."registry-url"."3.0.3";
     };
     optionalDependencies = {
     };
@@ -28207,15 +30440,15 @@
     cpu = [ ];
   };
   by-spec."pako"."~0.2.0" =
-    self.by-version."pako"."0.2.5";
-  by-version."pako"."0.2.5" = self.buildNodePackage {
-    name = "pako-0.2.5";
-    version = "0.2.5";
+    self.by-version."pako"."0.2.6";
+  by-version."pako"."0.2.6" = self.buildNodePackage {
+    name = "pako-0.2.6";
+    version = "0.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pako/-/pako-0.2.5.tgz";
-      name = "pako-0.2.5.tgz";
-      sha1 = "36df19467a3879152e9adcc44784f07d0a80c525";
+      url = "http://registry.npmjs.org/pako/-/pako-0.2.6.tgz";
+      name = "pako-0.2.6.tgz";
+      sha1 = "3e0c548353b859ab9c8005fac706bdd6c7af505f";
     };
     deps = {
     };
@@ -28286,21 +30519,45 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."parse-asn1"."^2.0.0" =
-    self.by-version."parse-asn1"."2.0.0";
-  by-version."parse-asn1"."2.0.0" = self.buildNodePackage {
-    name = "parse-asn1-2.0.0";
-    version = "2.0.0";
+  by-spec."parse-asn1"."^3.0.0" =
+    self.by-version."parse-asn1"."3.0.0";
+  by-version."parse-asn1"."3.0.0" = self.buildNodePackage {
+    name = "parse-asn1-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz";
+      name = "parse-asn1-3.0.0.tgz";
+      sha1 = "36ea30eb2ad99084e738e92801647910cdbf1ee4";
+    };
+    deps = {
+      "asn1.js-1.0.4" = self.by-version."asn1.js"."1.0.4";
+      "browserify-aes-1.0.0" = self.by-version."browserify-aes"."1.0.0";
+      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
+      "pbkdf2-compat-3.0.2" = self.by-version."pbkdf2-compat"."3.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parse-glob"."^3.0.0" =
+    self.by-version."parse-glob"."3.0.1";
+  by-version."parse-glob"."3.0.1" = self.buildNodePackage {
+    name = "parse-glob-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-2.0.0.tgz";
-      name = "parse-asn1-2.0.0.tgz";
-      sha1 = "c8cbc588abc91ade087c02ecbdfd7b66d9a8405f";
+      url = "http://registry.npmjs.org/parse-glob/-/parse-glob-3.0.1.tgz";
+      name = "parse-glob-3.0.1.tgz";
+      sha1 = "6dc718c0265f41096e106bb9adb40d327b7ab588";
     };
     deps = {
-      "asn1.js-1.0.3" = self.by-version."asn1.js"."1.0.3";
-      "asn1.js-rfc3280-1.0.0" = self.by-version."asn1.js-rfc3280"."1.0.0";
-      "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1";
+      "glob-base-0.2.0" = self.by-version."glob-base"."0.2.0";
+      "is-dotfile-1.0.0" = self.by-version."is-dotfile"."1.0.0";
+      "is-extglob-1.0.0" = self.by-version."is-extglob"."1.0.0";
+      "is-glob-1.1.3" = self.by-version."is-glob"."1.1.3";
     };
     optionalDependencies = {
     };
@@ -28328,6 +30585,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."parse-torrent"."^4.0.0" =
+    self.by-version."parse-torrent"."4.0.0";
+  by-version."parse-torrent"."4.0.0" = self.buildNodePackage {
+    name = "parse-torrent-4.0.0";
+    version = "4.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-4.0.0.tgz";
+      name = "parse-torrent-4.0.0.tgz";
+      sha1 = "bdf118b5e59eadfbf5ad4795dbf1765b2ec46a25";
+    };
+    deps = {
+      "magnet-uri-4.2.2" = self.by-version."magnet-uri"."4.2.2";
+      "parse-torrent-file-2.1.3" = self.by-version."parse-torrent-file"."2.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."parse-torrent"."~1.0.0" =
     self.by-version."parse-torrent"."1.0.0";
   by-version."parse-torrent"."1.0.0" = self.buildNodePackage {
@@ -28349,6 +30627,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."parse-torrent-file"."^2.0.0" =
+    self.by-version."parse-torrent-file"."2.1.3";
+  by-version."parse-torrent-file"."2.1.3" = self.buildNodePackage {
+    name = "parse-torrent-file-2.1.3";
+    version = "2.1.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-2.1.3.tgz";
+      name = "parse-torrent-file-2.1.3.tgz";
+      sha1 = "b537e0b277a76d5652fd1c1d045f7ee7189d88a4";
+    };
+    deps = {
+      "bencode-0.7.0" = self.by-version."bencode"."0.7.0";
+      "simple-sha1-2.0.7" = self.by-version."simple-sha1"."2.0.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."parsejson"."0.0.1" =
     self.by-version."parsejson"."0.0.1";
   by-version."parsejson"."0.0.1" = self.buildNodePackage {
@@ -28409,6 +30708,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."parseuri"."0.0.4" =
+    self.by-version."parseuri"."0.0.4";
+  by-version."parseuri"."0.0.4" = self.buildNodePackage {
+    name = "parseuri-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
+      name = "parseuri-0.0.4.tgz";
+      sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."parseurl"."1.0.1" =
     self.by-version."parseurl"."1.0.1";
   by-version."parseurl"."1.0.1" = self.buildNodePackage {
@@ -28490,7 +30809,7 @@
       "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
       "html5-1.0.5" = self.by-version."html5"."1.0.5";
       "html5-entities-1.0.0" = self.by-version."html5-entities"."1.0.0";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "pegjs-0.8.0" = self.by-version."pegjs"."0.8.0";
       "prfun-1.0.2" = self.by-version."prfun"."1.0.2";
       "request-2.40.0" = self.by-version."request"."2.40.0";
@@ -28619,15 +30938,15 @@
     cpu = [ ];
   };
   by-spec."passport-facebook".">=0.1.5" =
-    self.by-version."passport-facebook"."1.0.3";
-  by-version."passport-facebook"."1.0.3" = self.buildNodePackage {
-    name = "passport-facebook-1.0.3";
-    version = "1.0.3";
+    self.by-version."passport-facebook"."2.0.0";
+  by-version."passport-facebook"."2.0.0" = self.buildNodePackage {
+    name = "passport-facebook-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-facebook/-/passport-facebook-1.0.3.tgz";
-      name = "passport-facebook-1.0.3.tgz";
-      sha1 = "82a95aab0017ab190b815ab1e64ab75482eacdc7";
+      url = "http://registry.npmjs.org/passport-facebook/-/passport-facebook-2.0.0.tgz";
+      name = "passport-facebook-2.0.0.tgz";
+      sha1 = "35a0cd0b5a791d25810a78014f0cc0a9e72e1957";
     };
     deps = {
       "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2";
@@ -28680,19 +30999,19 @@
     cpu = [ ];
   };
   by-spec."passport-google-oauth"."*" =
-    self.by-version."passport-google-oauth"."0.1.5";
-  by-version."passport-google-oauth"."0.1.5" = self.buildNodePackage {
-    name = "passport-google-oauth-0.1.5";
-    version = "0.1.5";
+    self.by-version."passport-google-oauth"."0.2.0";
+  by-version."passport-google-oauth"."0.2.0" = self.buildNodePackage {
+    name = "passport-google-oauth-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-0.1.5.tgz";
-      name = "passport-google-oauth-0.1.5.tgz";
-      sha1 = "fd6b48cf9b20283721c7636e91d094c16a8671d7";
+      url = "http://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-0.2.0.tgz";
+      name = "passport-google-oauth-0.2.0.tgz";
+      sha1 = "e9a87e9cd3bc71b08819fa44825cc5bf464a894a";
     };
     deps = {
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -28701,7 +31020,7 @@
     cpu = [ ];
   };
   by-spec."passport-google-oauth".">=0.1.5" =
-    self.by-version."passport-google-oauth"."0.1.5";
+    self.by-version."passport-google-oauth"."0.2.0";
   by-spec."passport-http"."*" =
     self.by-version."passport-http"."0.2.2";
   by-version."passport-http"."0.2.2" = self.buildNodePackage {
@@ -28844,7 +31163,7 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
       "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -28895,12 +31214,12 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."passport-oauth"."^1.0.0" =
+    self.by-version."passport-oauth"."1.0.0";
   by-spec."passport-oauth"."~0.1.1" =
     self.by-version."passport-oauth"."0.1.15";
   by-spec."passport-oauth"."~0.1.15" =
     self.by-version."passport-oauth"."0.1.15";
-  by-spec."passport-oauth"."~0.1.4" =
-    self.by-version."passport-oauth"."0.1.15";
   by-spec."passport-oauth1"."1.x.x" =
     self.by-version."passport-oauth1"."1.0.1";
   by-version."passport-oauth1"."1.0.1" = self.buildNodePackage {
@@ -29026,15 +31345,15 @@
     cpu = [ ];
   };
   by-spec."passport-twitter".">=0.1.4" =
-    self.by-version."passport-twitter"."1.0.2";
-  by-version."passport-twitter"."1.0.2" = self.buildNodePackage {
-    name = "passport-twitter-1.0.2";
-    version = "1.0.2";
+    self.by-version."passport-twitter"."1.0.3";
+  by-version."passport-twitter"."1.0.3" = self.buildNodePackage {
+    name = "passport-twitter-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.2.tgz";
-      name = "passport-twitter-1.0.2.tgz";
-      sha1 = "6bfe5f9ec259dc363991b0be3cee94bfe4853d2b";
+      url = "http://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.3.tgz";
+      name = "passport-twitter-1.0.3.tgz";
+      sha1 = "887076f265a598cdffde59be2169a040e5908353";
     };
     deps = {
       "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1";
@@ -29088,6 +31407,25 @@
   };
   by-spec."path-browserify"."~0.0.0" =
     self.by-version."path-browserify"."0.0.0";
+  by-spec."path-is-absolute"."^1.0.0" =
+    self.by-version."path-is-absolute"."1.0.0";
+  by-version."path-is-absolute"."1.0.0" = self.buildNodePackage {
+    name = "path-is-absolute-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
+      name = "path-is-absolute-1.0.0.tgz";
+      sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."path-is-inside"."^1.0.1" =
     self.by-version."path-is-inside"."1.0.1";
   by-version."path-is-inside"."1.0.1" = self.buildNodePackage {
@@ -29205,6 +31543,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."pbkdf2"."^3.0.3" =
+    self.by-version."pbkdf2"."3.0.4";
+  by-version."pbkdf2"."3.0.4" = self.buildNodePackage {
+    name = "pbkdf2-3.0.4";
+    version = "3.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz";
+      name = "pbkdf2-3.0.4.tgz";
+      sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc";
+    };
+    deps = {
+      "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pbkdf2-compat"."2.0.1" =
     self.by-version."pbkdf2-compat"."2.0.1";
   by-version."pbkdf2-compat"."2.0.1" = self.buildNodePackage {
@@ -29224,7 +31582,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pbkdf2-compat"."^3.0.1" =
+  by-spec."pbkdf2-compat"."^3.0.0" =
     self.by-version."pbkdf2-compat"."3.0.2";
   by-version."pbkdf2-compat"."3.0.2" = self.buildNodePackage {
     name = "pbkdf2-compat-3.0.2";
@@ -29293,18 +31651,19 @@
   by-spec."peer-wire-swarm"."^0.9.2" =
     self.by-version."peer-wire-swarm"."0.9.2";
   by-spec."peerflix"."*" =
-    self.by-version."peerflix"."0.25.2";
-  by-version."peerflix"."0.25.2" = self.buildNodePackage {
-    name = "peerflix-0.25.2";
-    version = "0.25.2";
+    self.by-version."peerflix"."0.29.2";
+  by-version."peerflix"."0.29.2" = self.buildNodePackage {
+    name = "peerflix-0.29.2";
+    version = "0.29.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/peerflix/-/peerflix-0.25.2.tgz";
-      name = "peerflix-0.25.2.tgz";
-      sha1 = "244997a977c881995a3acce7bd7511c3f4006467";
+      url = "http://registry.npmjs.org/peerflix/-/peerflix-0.29.2.tgz";
+      name = "peerflix-0.29.2.tgz";
+      sha1 = "6a32587260546d42d4d2c0ccc37063d977af105c";
     };
     deps = {
       "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
+      "inquirer-0.8.2" = self.by-version."inquirer"."0.8.2";
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "network-address-0.0.5" = self.by-version."network-address"."0.0.5";
@@ -29314,36 +31673,35 @@
       "pump-0.3.5" = self.by-version."pump"."0.3.5";
       "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
       "rc-0.4.0" = self.by-version."rc"."0.4.0";
-      "read-torrent-1.2.0" = self.by-version."read-torrent"."1.2.0";
-      "torrent-stream-0.16.2" = self.by-version."torrent-stream"."0.16.2";
+      "read-torrent-1.3.0" = self.by-version."read-torrent"."1.3.0";
+      "torrent-stream-0.18.1" = self.by-version."torrent-stream"."0.18.1";
       "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
     optionalDependencies = {
-      "airplay-js-0.2.12" = self.by-version."airplay-js"."0.2.12";
+      "airplay-js-0.2.13" = self.by-version."airplay-js"."0.2.13";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "peerflix" = self.by-version."peerflix"."0.25.2";
-  by-spec."peerflix"."^0.25.2" =
-    self.by-version."peerflix"."0.25.2";
+  "peerflix" = self.by-version."peerflix"."0.29.2";
+  by-spec."peerflix"."^0.29.1" =
+    self.by-version."peerflix"."0.29.2";
   by-spec."peerflix-server"."*" =
-    self.by-version."peerflix-server"."0.0.20";
-  by-version."peerflix-server"."0.0.20" = self.buildNodePackage {
-    name = "peerflix-server-0.0.20";
-    version = "0.0.20";
+    self.by-version."peerflix-server"."0.0.22";
+  by-version."peerflix-server"."0.0.22" = self.buildNodePackage {
+    name = "peerflix-server-0.0.22";
+    version = "0.0.22";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.20.tgz";
-      name = "peerflix-server-0.0.20.tgz";
-      sha1 = "b5545f7f0abf3f13b65bae00eecd344d9973d342";
+      url = "http://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.22.tgz";
+      name = "peerflix-server-0.0.22.tgz";
+      sha1 = "008b0463eb3139729b8787db95131735803ae94d";
     };
     deps = {
       "connect-multiparty-1.2.5" = self.by-version."connect-multiparty"."1.2.5";
       "express-3.5.3" = self.by-version."express"."3.5.3";
-      "fluent-ffmpeg-2.0.0-rc3" = self.by-version."fluent-ffmpeg"."2.0.0-rc3";
       "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "pump-0.3.5" = self.by-version."pump"."0.3.5";
@@ -29353,12 +31711,13 @@
       "torrent-stream-0.13.5" = self.by-version."torrent-stream"."0.13.5";
     };
     optionalDependencies = {
+      "fluent-ffmpeg-2.0.0-rc3" = self.by-version."fluent-ffmpeg"."2.0.0-rc3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "peerflix-server" = self.by-version."peerflix-server"."0.0.20";
+  "peerflix-server" = self.by-version."peerflix-server"."0.0.22";
   by-spec."pegjs"."0.6.2" =
     self.by-version."pegjs"."0.6.2";
   by-version."pegjs"."0.6.2" = self.buildNodePackage {
@@ -29397,18 +31756,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pemstrip"."0.0.1" =
-    self.by-version."pemstrip"."0.0.1";
-  by-version."pemstrip"."0.0.1" = self.buildNodePackage {
-    name = "pemstrip-0.0.1";
-    version = "0.0.1";
-    bin = false;
+  by-spec."phantomjs"."*" =
+    self.by-version."phantomjs"."1.9.16";
+  by-version."phantomjs"."1.9.16" = self.buildNodePackage {
+    name = "phantomjs-1.9.16";
+    version = "1.9.16";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pemstrip/-/pemstrip-0.0.1.tgz";
-      name = "pemstrip-0.0.1.tgz";
-      sha1 = "39f7071720cfa13d542c9bde75f1fa5bf9d08806";
+      url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.16.tgz";
+      name = "phantomjs-1.9.16.tgz";
+      sha1 = "989256190c00f987fc96b7067bdb5cd2e420bac9";
     };
     deps = {
+      "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
+      "fs-extra-0.16.5" = self.by-version."fs-extra"."0.16.5";
+      "kew-0.4.0" = self.by-version."kew"."0.4.0";
+      "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1";
+      "progress-1.1.8" = self.by-version."progress"."1.1.8";
+      "request-2.42.0" = self.by-version."request"."2.42.0";
+      "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
     };
     optionalDependencies = {
     };
@@ -29416,26 +31783,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."phantomjs"."*" =
-    self.by-version."phantomjs"."1.9.15";
-  by-version."phantomjs"."1.9.15" = self.buildNodePackage {
-    name = "phantomjs-1.9.15";
-    version = "1.9.15";
-    bin = true;
+  "phantomjs" = self.by-version."phantomjs"."1.9.16";
+  by-spec."phantomjs"."~1.9.1" =
+    self.by-version."phantomjs"."1.9.16";
+  by-spec."phantomjs"."~1.9.10" =
+    self.by-version."phantomjs"."1.9.16";
+  by-spec."pkgcloud".">=1.1.0" =
+    self.by-version."pkgcloud"."1.1.0";
+  by-version."pkgcloud"."1.1.0" = self.buildNodePackage {
+    name = "pkgcloud-1.1.0";
+    version = "1.1.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.15.tgz";
-      name = "phantomjs-1.9.15.tgz";
-      sha1 = "10032c8b36bd3541ecef953e764d5d177c33f72f";
+      url = "http://registry.npmjs.org/pkgcloud/-/pkgcloud-1.1.0.tgz";
+      name = "pkgcloud-1.1.0.tgz";
+      sha1 = "b67d48d9c39c40c2578eeb255165bbb05d4803d4";
     };
     deps = {
-      "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
-      "fs-extra-0.16.3" = self.by-version."fs-extra"."0.16.3";
-      "kew-0.4.0" = self.by-version."kew"."0.4.0";
-      "npmconf-2.0.9" = self.by-version."npmconf"."2.0.9";
-      "progress-1.1.8" = self.by-version."progress"."1.1.8";
-      "request-2.42.0" = self.by-version."request"."2.42.0";
-      "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1";
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "aws-sdk-2.0.31" = self.by-version."aws-sdk"."2.0.31";
+      "errs-0.3.2" = self.by-version."errs"."0.3.2";
+      "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+      "filed-0.1.0" = self.by-version."filed"."0.1.0";
+      "gcloud-0.10.0" = self.by-version."gcloud"."0.10.0";
+      "ip-0.3.2" = self.by-version."ip"."0.3.2";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "qs-1.2.2" = self.by-version."qs"."1.2.2";
+      "request-2.40.0" = self.by-version."request"."2.40.0";
+      "s3-upload-stream-1.0.7" = self.by-version."s3-upload-stream"."1.0.7";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
+      "underscore-1.6.0" = self.by-version."underscore"."1.6.0";
+      "url-join-0.0.1" = self.by-version."url-join"."0.0.1";
+      "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14";
     };
     optionalDependencies = {
     };
@@ -29443,11 +31822,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "phantomjs" = self.by-version."phantomjs"."1.9.15";
-  by-spec."phantomjs"."~1.9.1" =
-    self.by-version."phantomjs"."1.9.15";
-  by-spec."phantomjs"."~1.9.10" =
-    self.by-version."phantomjs"."1.9.15";
   by-spec."pkginfo"."0.2.x" =
     self.by-version."pkginfo"."0.2.3";
   by-version."pkginfo"."0.2.3" = self.buildNodePackage {
@@ -29467,7 +31841,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pkginfo"."0.3.x" =
+  by-spec."pkginfo"."0.3.0" =
     self.by-version."pkginfo"."0.3.0";
   by-version."pkginfo"."0.3.0" = self.buildNodePackage {
     name = "pkginfo-0.3.0";
@@ -29486,6 +31860,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."pkginfo"."0.3.x" =
+    self.by-version."pkginfo"."0.3.0";
   by-spec."pkginfo"."0.x.x" =
     self.by-version."pkginfo"."0.3.0";
   by-spec."pkginfo"."~0.3.0" =
@@ -29539,18 +31915,18 @@
   by-spec."plist"."^1.0.1" =
     self.by-version."plist"."1.1.0";
   by-spec."plist-native"."*" =
-    self.by-version."plist-native"."0.3.1";
-  by-version."plist-native"."0.3.1" = self.buildNodePackage {
-    name = "plist-native-0.3.1";
-    version = "0.3.1";
+    self.by-version."plist-native"."0.4.0";
+  by-version."plist-native"."0.4.0" = self.buildNodePackage {
+    name = "plist-native-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/plist-native/-/plist-native-0.3.1.tgz";
-      name = "plist-native-0.3.1.tgz";
-      sha1 = "c9cd71ae2ac6aa16c315dde213c65d6cc53dee1a";
+      url = "http://registry.npmjs.org/plist-native/-/plist-native-0.4.0.tgz";
+      name = "plist-native-0.4.0.tgz";
+      sha1 = "9b257c5e99b704dff177f23af082c59f7d58855f";
     };
     deps = {
-      "libxmljs-0.10.0" = self.by-version."libxmljs"."0.10.0";
+      "libxmljs-0.13.0" = self.by-version."libxmljs"."0.13.0";
     };
     optionalDependencies = {
     };
@@ -29558,7 +31934,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "plist-native" = self.by-version."plist-native"."0.3.1";
+  "plist-native" = self.by-version."plist-native"."0.4.0";
   by-spec."plist-with-patches"."0.5.1" =
     self.by-version."plist-with-patches"."0.5.1";
   by-version."plist-with-patches"."0.5.1" = self.buildNodePackage {
@@ -29703,16 +32079,16 @@
     cpu = [ ];
   };
   "posix" = self.by-version."posix"."2.0.0";
-  by-spec."posix-getopt"."1.0.0" =
-    self.by-version."posix-getopt"."1.0.0";
-  by-version."posix-getopt"."1.0.0" = self.buildNodePackage {
-    name = "posix-getopt-1.0.0";
-    version = "1.0.0";
+  by-spec."posix-getopt"."1.1.0" =
+    self.by-version."posix-getopt"."1.1.0";
+  by-version."posix-getopt"."1.1.0" = self.buildNodePackage {
+    name = "posix-getopt-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.0.0.tgz";
-      name = "posix-getopt-1.0.0.tgz";
-      sha1 = "42a90eca6119014c78bc4b9b70463d294db1aa87";
+      url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.1.0.tgz";
+      name = "posix-getopt-1.1.0.tgz";
+      sha1 = "8e258aca8f34d6906c159a32b0388360197e5698";
     };
     deps = {
     };
@@ -29722,16 +32098,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."posix-getopt"."1.1.0" =
-    self.by-version."posix-getopt"."1.1.0";
-  by-version."posix-getopt"."1.1.0" = self.buildNodePackage {
-    name = "posix-getopt-1.1.0";
-    version = "1.1.0";
+  by-spec."precond"."0.2" =
+    self.by-version."precond"."0.2.3";
+  by-version."precond"."0.2.3" = self.buildNodePackage {
+    name = "precond-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.1.0.tgz";
-      name = "posix-getopt-1.1.0.tgz";
-      sha1 = "8e258aca8f34d6906c159a32b0388360197e5698";
+      url = "http://registry.npmjs.org/precond/-/precond-0.2.3.tgz";
+      name = "precond-0.2.3.tgz";
+      sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac";
     };
     deps = {
     };
@@ -29781,19 +32157,39 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."preserve"."^0.2.0" =
+    self.by-version."preserve"."0.2.0";
+  by-version."preserve"."0.2.0" = self.buildNodePackage {
+    name = "preserve-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz";
+      name = "preserve-0.2.0.tgz";
+      sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pretty-bytes"."^1.0.0" =
-    self.by-version."pretty-bytes"."1.0.3";
-  by-version."pretty-bytes"."1.0.3" = self.buildNodePackage {
-    name = "pretty-bytes-1.0.3";
-    version = "1.0.3";
+    self.by-version."pretty-bytes"."1.0.4";
+  by-version."pretty-bytes"."1.0.4" = self.buildNodePackage {
+    name = "pretty-bytes-1.0.4";
+    version = "1.0.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.3.tgz";
-      name = "pretty-bytes-1.0.3.tgz";
-      sha1 = "03a712d028cfc8536f271da55e1844877399242c";
+      url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz";
+      name = "pretty-bytes-1.0.4.tgz";
+      sha1 = "0a22e8210609ad35542f8c8d5d2159aff0751c84";
     };
     deps = {
       "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
+      "meow-3.1.0" = self.by-version."meow"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -29832,7 +32228,7 @@
       sha1 = "ac8799843d8194ea478ee4442e455fd5e054db3e";
     };
     deps = {
-      "es6-shim-0.25.3" = self.by-version."es6-shim"."0.25.3";
+      "es6-shim-0.28.1" = self.by-version."es6-shim"."0.28.1";
     };
     optionalDependencies = {
     };
@@ -29864,15 +32260,15 @@
   by-spec."private"."~0.1.6" =
     self.by-version."private"."0.1.6";
   by-spec."process"."^0.10.0" =
-    self.by-version."process"."0.10.0";
-  by-version."process"."0.10.0" = self.buildNodePackage {
-    name = "process-0.10.0";
-    version = "0.10.0";
+    self.by-version."process"."0.10.1";
+  by-version."process"."0.10.1" = self.buildNodePackage {
+    name = "process-0.10.1";
+    version = "0.10.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/process/-/process-0.10.0.tgz";
-      name = "process-0.10.0.tgz";
-      sha1 = "99b375aaab5c0d3bbb59f774edc69df574da8dd4";
+      url = "http://registry.npmjs.org/process/-/process-0.10.1.tgz";
+      name = "process-0.10.1.tgz";
+      sha1 = "842457cc51cfed72dc775afeeafb8c6034372725";
     };
     deps = {
     };
@@ -29902,7 +32298,7 @@
     cpu = [ ];
   };
   by-spec."process"."~0.10.0" =
-    self.by-version."process"."0.10.0";
+    self.by-version."process"."0.10.1";
   by-spec."process"."~0.5.1" =
     self.by-version."process"."0.5.2";
   by-version."process"."0.5.2" = self.buildNodePackage {
@@ -29941,8 +32337,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."process"."~0.8.0" =
-    self.by-version."process"."0.8.0";
   by-spec."progress"."1.1.4" =
     self.by-version."progress"."1.1.4";
   by-version."progress"."1.1.4" = self.buildNodePackage {
@@ -30086,6 +32480,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."promzard"."^0.3.0" =
+    self.by-version."promzard"."0.3.0";
+  by-version."promzard"."0.3.0" = self.buildNodePackage {
+    name = "promzard-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz";
+      name = "promzard-0.3.0.tgz";
+      sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
+    };
+    deps = {
+      "read-1.0.5" = self.by-version."read"."1.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."promzard"."~0.2.0" =
     self.by-version."promzard"."0.2.2";
   by-version."promzard"."0.2.2" = self.buildNodePackage {
@@ -30125,6 +32539,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."protein"."0.5.x" =
+    self.by-version."protein"."0.5.0";
+  by-version."protein"."0.5.0" = self.buildNodePackage {
+    name = "protein-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/protein/-/protein-0.5.0.tgz";
+      name = "protein-0.5.0.tgz";
+      sha1 = "80ab4e919749351263ef14500d684e57c4202840";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."proto-list"."~1.2.1" =
     self.by-version."proto-list"."1.2.3";
   by-version."proto-list"."1.2.3" = self.buildNodePackage {
@@ -30165,6 +32598,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."protobufjs"."^3.4.0" =
+    self.by-version."protobufjs"."3.8.2";
   by-spec."proxy-addr"."1.0.1" =
     self.by-version."proxy-addr"."1.0.1";
   by-version."proxy-addr"."1.0.1" = self.buildNodePackage {
@@ -30186,19 +32621,19 @@
     cpu = [ ];
   };
   by-spec."proxy-addr"."~1.0.3" =
-    self.by-version."proxy-addr"."1.0.6";
-  by-version."proxy-addr"."1.0.6" = self.buildNodePackage {
-    name = "proxy-addr-1.0.6";
-    version = "1.0.6";
+    self.by-version."proxy-addr"."1.0.7";
+  by-version."proxy-addr"."1.0.7" = self.buildNodePackage {
+    name = "proxy-addr-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.6.tgz";
-      name = "proxy-addr-1.0.6.tgz";
-      sha1 = "fce3a4c486bf2e188ad1e76e18399a79d02c0e72";
+      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.7.tgz";
+      name = "proxy-addr-1.0.7.tgz";
+      sha1 = "6e2655aa9c56b014f09734a7e6d558cc77751939";
     };
     deps = {
       "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
-      "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
+      "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9";
     };
     optionalDependencies = {
     };
@@ -30206,10 +32641,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."proxy-addr"."~1.0.5" =
-    self.by-version."proxy-addr"."1.0.6";
-  by-spec."proxy-addr"."~1.0.6" =
-    self.by-version."proxy-addr"."1.0.6";
+  by-spec."proxy-addr"."~1.0.7" =
+    self.by-version."proxy-addr"."1.0.7";
   by-spec."proxy-agent"."1" =
     self.by-version."proxy-agent"."1.1.0";
   by-version."proxy-agent"."1.1.0" = self.buildNodePackage {
@@ -30226,7 +32659,7 @@
       "https-proxy-agent-0.3.5" = self.by-version."https-proxy-agent"."0.3.5";
       "pac-proxy-agent-0.2.0" = self.by-version."pac-proxy-agent"."0.2.0";
       "socks-proxy-agent-0.1.2" = self.by-version."socks-proxy-agent"."0.1.2";
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -30296,21 +32729,62 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."public-encrypt"."1.1.2" =
-    self.by-version."public-encrypt"."1.1.2";
-  by-version."public-encrypt"."1.1.2" = self.buildNodePackage {
-    name = "public-encrypt-1.1.2";
-    version = "1.1.2";
+  by-spec."public-encrypt"."^2.0.0" =
+    self.by-version."public-encrypt"."2.0.0";
+  by-version."public-encrypt"."2.0.0" = self.buildNodePackage {
+    name = "public-encrypt-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-1.1.2.tgz";
-      name = "public-encrypt-1.1.2.tgz";
-      sha1 = "90711147083bc5bfbe2b51964f9a6b038adb0d4b";
+      url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.0.tgz";
+      name = "public-encrypt-2.0.0.tgz";
+      sha1 = "9e49010bf021d33f6597c77abd939612a82767fc";
     };
     deps = {
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
-      "browserify-rsa-1.1.1" = self.by-version."browserify-rsa"."1.1.1";
-      "parse-asn1-2.0.0" = self.by-version."parse-asn1"."2.0.0";
+      "browserify-rsa-2.0.0" = self.by-version."browserify-rsa"."2.0.0";
+      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
+      "parse-asn1-3.0.0" = self.by-version."parse-asn1"."3.0.0";
+      "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pull-core"."~1.0.0" =
+    self.by-version."pull-core"."1.0.0";
+  by-version."pull-core"."1.0.0" = self.buildNodePackage {
+    name = "pull-core-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pull-core/-/pull-core-1.0.0.tgz";
+      name = "pull-core-1.0.0.tgz";
+      sha1 = "e0eb93918dfa70963ed09e36f63daa15b76b38a4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pull-stream"."~2.21.0" =
+    self.by-version."pull-stream"."2.21.0";
+  by-version."pull-stream"."2.21.0" = self.buildNodePackage {
+    name = "pull-stream-2.21.0";
+    version = "2.21.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pull-stream/-/pull-stream-2.21.0.tgz";
+      name = "pull-stream-2.21.0.tgz";
+      sha1 = "5b04e0bb35ffe64744fa9bb68465a84f9e1fe5d1";
+    };
+    deps = {
+      "pull-core-1.0.0" = self.by-version."pull-core"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -30339,10 +32813,50 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pump"."^0.3.5" =
-    self.by-version."pump"."0.3.5";
+  by-spec."pump"."^1.0.0" =
+    self.by-version."pump"."1.0.0";
+  by-version."pump"."1.0.0" = self.buildNodePackage {
+    name = "pump-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pump/-/pump-1.0.0.tgz";
+      name = "pump-1.0.0.tgz";
+      sha1 = "f0250fe282742492e4dea170e5ed3f7bc8a5e32c";
+    };
+    deps = {
+      "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
+      "once-1.3.1" = self.by-version."once"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pump"."~0.3.2" =
     self.by-version."pump"."0.3.5";
+  by-spec."pumpify"."^1.3.3" =
+    self.by-version."pumpify"."1.3.3";
+  by-version."pumpify"."1.3.3" = self.buildNodePackage {
+    name = "pumpify-1.3.3";
+    version = "1.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pumpify/-/pumpify-1.3.3.tgz";
+      name = "pumpify-1.3.3.tgz";
+      sha1 = "f6d27bb71d32871ff6d0868859dbacfeb2ebdbfe";
+    };
+    deps = {
+      "duplexify-3.3.0" = self.by-version."duplexify"."3.3.0";
+      "pump-1.0.0" = self.by-version."pump"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."punycode"."1.3.2" =
     self.by-version."punycode"."1.3.2";
   by-version."punycode"."1.3.2" = self.buildNodePackage {
@@ -30496,7 +33010,7 @@
       sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134";
     };
     deps = {
-      "asap-2.0.1" = self.by-version."asap"."2.0.1";
+      "asap-2.0.2" = self.by-version."asap"."2.0.2";
       "pop-iterate-1.0.1" = self.by-version."pop-iterate"."1.0.1";
       "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5";
     };
@@ -30533,8 +33047,6 @@
     self.by-version."q"."0.9.7";
   by-spec."q"."~0.9.7" =
     self.by-version."q"."0.9.7";
-  by-spec."q"."~1.0.0" =
-    self.by-version."q"."1.0.1";
   by-spec."q"."~1.0.1" =
     self.by-version."q"."1.0.1";
   by-spec."q"."~1.1.2" =
@@ -30615,25 +33127,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."0.5.5" =
-    self.by-version."qs"."0.5.5";
-  by-version."qs"."0.5.5" = self.buildNodePackage {
-    name = "qs-0.5.5";
-    version = "0.5.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.5.5.tgz";
-      name = "qs-0.5.5.tgz";
-      sha1 = "b07f0d7ffe3efc6fc2fcde6c66a20775641423f3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."qs"."0.5.x" =
     self.by-version."qs"."0.5.6";
   by-version."qs"."0.5.6" = self.buildNodePackage {
@@ -30710,6 +33203,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."qs"."1.2.x" =
+    self.by-version."qs"."1.2.2";
+  by-version."qs"."1.2.2" = self.buildNodePackage {
+    name = "qs-1.2.2";
+    version = "1.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
+      name = "qs-1.2.2.tgz";
+      sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."qs"."2.2.3" =
     self.by-version."qs"."2.2.3";
   by-version."qs"."2.2.3" = self.buildNodePackage {
@@ -30767,16 +33279,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."2.3.3" =
-    self.by-version."qs"."2.3.3";
-  by-version."qs"."2.3.3" = self.buildNodePackage {
-    name = "qs-2.3.3";
-    version = "2.3.3";
+  by-spec."qs"."2.4.1" =
+    self.by-version."qs"."2.4.1";
+  by-version."qs"."2.4.1" = self.buildNodePackage {
+    name = "qs-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
-      name = "qs-2.3.3.tgz";
-      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+      url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz";
+      name = "qs-2.4.1.tgz";
+      sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245";
     };
     deps = {
     };
@@ -30787,7 +33299,9 @@
     cpu = [ ];
   };
   by-spec."qs".">= 0.4.0" =
-    self.by-version."qs"."2.3.3";
+    self.by-version."qs"."2.4.1";
+  by-spec."qs"."^1.0.0" =
+    self.by-version."qs"."1.2.2";
   by-spec."qs"."~0.5.4" =
     self.by-version."qs"."0.5.6";
   by-spec."qs"."~0.6.0" =
@@ -30813,23 +33327,6 @@
   };
   by-spec."qs"."~1.2.0" =
     self.by-version."qs"."1.2.2";
-  by-version."qs"."1.2.2" = self.buildNodePackage {
-    name = "qs-1.2.2";
-    version = "1.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
-      name = "qs-1.2.2.tgz";
-      sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."qs"."~1.2.2" =
     self.by-version."qs"."1.2.2";
   by-spec."qs"."~2.2.4" =
@@ -30853,6 +33350,25 @@
   };
   by-spec."qs"."~2.3.1" =
     self.by-version."qs"."2.3.3";
+  by-version."qs"."2.3.3" = self.buildNodePackage {
+    name = "qs-2.3.3";
+    version = "2.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+      name = "qs-2.3.3.tgz";
+      sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."qs"."~2.4.0" =
+    self.by-version."qs"."2.4.1";
   by-spec."query-string"."^1.0.0" =
     self.by-version."query-string"."1.0.0";
   by-version."query-string"."1.0.0" = self.buildNodePackage {
@@ -30872,16 +33388,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."querystring".">=0.1.0 <0.2.0" =
-    self.by-version."querystring"."0.1.0";
-  by-version."querystring"."0.1.0" = self.buildNodePackage {
-    name = "querystring-0.1.0";
-    version = "0.1.0";
+  by-spec."querystring"."0.2.0" =
+    self.by-version."querystring"."0.2.0";
+  by-version."querystring"."0.2.0" = self.buildNodePackage {
+    name = "querystring-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
-      name = "querystring-0.1.0.tgz";
-      sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
+      url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz";
+      name = "querystring-0.2.0.tgz";
+      sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5";
     };
     deps = {
     };
@@ -30891,16 +33407,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" =
-    self.by-version."querystring"."0.2.0";
-  by-version."querystring"."0.2.0" = self.buildNodePackage {
-    name = "querystring-0.2.0";
-    version = "0.2.0";
+  by-spec."querystring".">=0.1.0 <0.2.0" =
+    self.by-version."querystring"."0.1.0";
+  by-version."querystring"."0.1.0" = self.buildNodePackage {
+    name = "querystring-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz";
-      name = "querystring-0.2.0.tgz";
-      sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5";
+      url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
+      name = "querystring-0.1.0.tgz";
+      sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
     };
     deps = {
     };
@@ -30910,6 +33426,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" =
+    self.by-version."querystring"."0.2.0";
   by-spec."querystring-es3"."~0.2.0" =
     self.by-version."querystring-es3"."0.2.1";
   by-version."querystring-es3"."0.2.1" = self.buildNodePackage {
@@ -30988,6 +33506,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."randomatic"."^1.1.0" =
+    self.by-version."randomatic"."1.1.0";
+  by-version."randomatic"."1.1.0" = self.buildNodePackage {
+    name = "randomatic-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/randomatic/-/randomatic-1.1.0.tgz";
+      name = "randomatic-1.1.0.tgz";
+      sha1 = "2ca36b9f93747aac985eb242749af88b45d5d42d";
+    };
+    deps = {
+      "is-number-1.1.2" = self.by-version."is-number"."1.1.2";
+      "kind-of-1.1.0" = self.by-version."kind-of"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."randombytes"."^2.0.0" =
     self.by-version."randombytes"."2.0.1";
   by-version."randombytes"."2.0.1" = self.buildNodePackage {
@@ -31007,6 +33546,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."randombytes"."^2.0.1" =
+    self.by-version."randombytes"."2.0.1";
   by-spec."range-parser"."0.0.4" =
     self.by-version."range-parser"."0.0.4";
   by-version."range-parser"."0.0.4" = self.buildNodePackage {
@@ -31070,21 +33611,21 @@
     self.by-version."range-parser"."1.0.2";
   by-spec."range-parser"."~1.0.2" =
     self.by-version."range-parser"."1.0.2";
-  by-spec."raven"."~0.7.2" =
-    self.by-version."raven"."0.7.2";
-  by-version."raven"."0.7.2" = self.buildNodePackage {
-    name = "raven-0.7.2";
-    version = "0.7.2";
+  by-spec."raven"."~0.7.3" =
+    self.by-version."raven"."0.7.3";
+  by-version."raven"."0.7.3" = self.buildNodePackage {
+    name = "raven-0.7.3";
+    version = "0.7.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raven/-/raven-0.7.2.tgz";
-      name = "raven-0.7.2.tgz";
-      sha1 = "51c1268e5d947e45c53fdb2e0a88b829c24a02a7";
+      url = "http://registry.npmjs.org/raven/-/raven-0.7.3.tgz";
+      name = "raven-0.7.3.tgz";
+      sha1 = "73fbf418a4363767ac50fdaf6e7d541f3b35f507";
     };
     deps = {
       "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
       "lsmod-0.0.3" = self.by-version."lsmod"."0.0.3";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7";
     };
     optionalDependencies = {
@@ -31153,27 +33694,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."raw-body"."1.3.1" =
-    self.by-version."raw-body"."1.3.1";
-  by-version."raw-body"."1.3.1" = self.buildNodePackage {
-    name = "raw-body-1.3.1";
-    version = "1.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.1.tgz";
-      name = "raw-body-1.3.1.tgz";
-      sha1 = "26a1491059086fd121942232d16758cd2817f815";
-    };
-    deps = {
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "iconv-lite-0.4.5" = self.by-version."iconv-lite"."0.4.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."raw-body"."1.3.2" =
     self.by-version."raw-body"."1.3.2";
   by-version."raw-body"."1.3.2" = self.buildNodePackage {
@@ -31195,20 +33715,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."raw-body"."1.3.3" =
-    self.by-version."raw-body"."1.3.3";
-  by-version."raw-body"."1.3.3" = self.buildNodePackage {
-    name = "raw-body-1.3.3";
-    version = "1.3.3";
+  by-spec."raw-body"."1.3.4" =
+    self.by-version."raw-body"."1.3.4";
+  by-version."raw-body"."1.3.4" = self.buildNodePackage {
+    name = "raw-body-1.3.4";
+    version = "1.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.3.tgz";
-      name = "raw-body-1.3.3.tgz";
-      sha1 = "8841af3f64ad50a351dc77f229118b40c28fa58c";
+      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz";
+      name = "raw-body-1.3.4.tgz";
+      sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54";
     };
     deps = {
       "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "iconv-lite-0.4.7" = self.by-version."iconv-lite"."0.4.7";
+      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
     };
     optionalDependencies = {
     };
@@ -31216,6 +33736,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."raw-body"."1.x" =
+    self.by-version."raw-body"."1.3.4";
   by-spec."raw-socket"."*" =
     self.by-version."raw-socket"."1.2.2";
   by-version."raw-socket"."1.2.2" = self.buildNodePackage {
@@ -31281,16 +33803,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rc"."^0.6.0" =
-    self.by-version."rc"."0.6.0";
-  by-version."rc"."0.6.0" = self.buildNodePackage {
-    name = "rc-0.6.0";
-    version = "0.6.0";
+  by-spec."rc"."^1.0.1" =
+    self.by-version."rc"."1.0.1";
+  by-version."rc"."1.0.1" = self.buildNodePackage {
+    name = "rc-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rc/-/rc-0.6.0.tgz";
-      name = "rc-0.6.0.tgz";
-      sha1 = "e1c930059af831c85413fe275ae2f40f4e3c5371";
+      url = "http://registry.npmjs.org/rc/-/rc-1.0.1.tgz";
+      name = "rc-1.0.1.tgz";
+      sha1 = "f919c25e804cb0aa60f6fd92d929fc86b45013e8";
     };
     deps = {
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
@@ -31329,23 +33851,44 @@
   };
   by-spec."rc"."~0.5.1" =
     self.by-version."rc"."0.5.5";
-  by-spec."rc"."~0.5.4" =
-    self.by-version."rc"."0.5.5";
   by-spec."rc"."~0.6.0" =
     self.by-version."rc"."0.6.0";
+  by-version."rc"."0.6.0" = self.buildNodePackage {
+    name = "rc-0.6.0";
+    version = "0.6.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rc/-/rc-0.6.0.tgz";
+      name = "rc-0.6.0.tgz";
+      sha1 = "e1c930059af831c85413fe275ae2f40f4e3c5371";
+    };
+    deps = {
+      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
+      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
+      "ini-1.3.3" = self.by-version."ini"."1.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rc"."~1.0.1" =
+    self.by-version."rc"."1.0.1";
   by-spec."react"."*" =
-    self.by-version."react"."0.13.0-rc1";
-  by-version."react"."0.13.0-rc1" = self.buildNodePackage {
-    name = "react-0.13.0-rc1";
-    version = "0.13.0-rc1";
+    self.by-version."react"."0.13.2";
+  by-version."react"."0.13.2" = self.buildNodePackage {
+    name = "react-0.13.2";
+    version = "0.13.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/react/-/react-0.13.0-rc1.tgz";
-      name = "react-0.13.0-rc1.tgz";
-      sha1 = "1773c4cf6b4f422b665eceb276345cfc030678ac";
+      url = "http://registry.npmjs.org/react/-/react-0.13.2.tgz";
+      name = "react-0.13.2.tgz";
+      sha1 = "a1c7cec5e7be080c4e249b20740d4d4cd18880ca";
     };
     deps = {
-      "envify-3.2.0" = self.by-version."envify"."3.2.0";
+      "envify-3.4.0" = self.by-version."envify"."3.4.0";
     };
     optionalDependencies = {
     };
@@ -31353,21 +33896,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "react" = self.by-version."react"."0.13.0-rc1";
+  "react" = self.by-version."react"."0.13.2";
   by-spec."react-tools"."*" =
-    self.by-version."react-tools"."0.13.0-rc1";
-  by-version."react-tools"."0.13.0-rc1" = self.buildNodePackage {
-    name = "react-tools-0.13.0-rc1";
-    version = "0.13.0-rc1";
+    self.by-version."react-tools"."0.13.2";
+  by-version."react-tools"."0.13.2" = self.buildNodePackage {
+    name = "react-tools-0.13.2";
+    version = "0.13.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.0-rc1.tgz";
-      name = "react-tools-0.13.0-rc1.tgz";
-      sha1 = "f88bfc80115a5f831520409ccc269a9197001119";
+      url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.2.tgz";
+      name = "react-tools-0.13.2.tgz";
+      sha1 = "f96613c59576a7b04597b307bb8cd5b647c9ebbf";
     };
     deps = {
       "commoner-0.10.1" = self.by-version."commoner"."0.10.1";
-      "jstransform-9.1.1" = self.by-version."jstransform"."9.1.1";
+      "jstransform-10.1.0" = self.by-version."jstransform"."10.1.0";
     };
     optionalDependencies = {
     };
@@ -31375,7 +33918,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "react-tools" = self.by-version."react-tools"."0.13.0-rc1";
+  "react-tools" = self.by-version."react-tools"."0.13.2";
   by-spec."read"."1" =
     self.by-version."read"."1.0.5";
   by-version."read"."1.0.5" = self.buildNodePackage {
@@ -31402,18 +33945,19 @@
     self.by-version."read"."1.0.5";
   by-spec."read"."~1.0.4" =
     self.by-version."read"."1.0.5";
-  by-spec."read-all-stream"."^1.0.0" =
-    self.by-version."read-all-stream"."1.0.2";
-  by-version."read-all-stream"."1.0.2" = self.buildNodePackage {
-    name = "read-all-stream-1.0.2";
-    version = "1.0.2";
+  by-spec."read-all-stream"."^2.0.0" =
+    self.by-version."read-all-stream"."2.1.2";
+  by-version."read-all-stream"."2.1.2" = self.buildNodePackage {
+    name = "read-all-stream-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-1.0.2.tgz";
-      name = "read-all-stream-1.0.2.tgz";
-      sha1 = "d378cf4ef6e236b188ea42d135e5b180a89e3e92";
+      url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-2.1.2.tgz";
+      name = "read-all-stream-2.1.2.tgz";
+      sha1 = "0e80070eadd99712383e9f3c26762310900bda0a";
     };
     deps = {
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     optionalDependencies = {
     };
@@ -31421,124 +33965,165 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-installed"."~2.0.5" =
-    self.by-version."read-installed"."2.0.7";
-  by-version."read-installed"."2.0.7" = self.buildNodePackage {
-    name = "read-installed-2.0.7";
-    version = "2.0.7";
+  by-spec."read-installed"."~0.2.2" =
+    self.by-version."read-installed"."0.2.5";
+  by-version."read-installed"."0.2.5" = self.buildNodePackage {
+    name = "read-installed-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-installed/-/read-installed-2.0.7.tgz";
-      name = "read-installed-2.0.7.tgz";
-      sha1 = "a82157a5e273576c57f230ecec3702ab215a6d6c";
+      url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz";
+      name = "read-installed-0.2.5.tgz";
+      sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86";
     };
     deps = {
-      "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
-      "semver-3.0.1" = self.by-version."semver"."3.0.1";
+      "semver-2.3.2" = self.by-version."semver"."2.3.2";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1";
+      "read-package-json-1.3.3" = self.by-version."read-package-json"."1.3.3";
     };
     optionalDependencies = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-installed"."~3.1.5" =
-    self.by-version."read-installed"."3.1.5";
-  by-version."read-installed"."3.1.5" = self.buildNodePackage {
-    name = "read-installed-3.1.5";
-    version = "3.1.5";
+  by-spec."read-installed"."~4.0.0" =
+    self.by-version."read-installed"."4.0.0";
+  by-version."read-installed"."4.0.0" = self.buildNodePackage {
+    name = "read-installed-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-installed/-/read-installed-3.1.5.tgz";
-      name = "read-installed-3.1.5.tgz";
-      sha1 = "4ae36081afd3e2204dc2e279807aaa52c30c8c0c";
+      url = "http://registry.npmjs.org/read-installed/-/read-installed-4.0.0.tgz";
+      name = "read-installed-4.0.0.tgz";
+      sha1 = "dbca08d6bd83e2a3b93c962053ba4d839e0769ba";
     };
     deps = {
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
-      "read-package-json-1.3.1" = self.by-version."read-package-json"."1.3.1";
+      "read-package-json-2.0.0" = self.by-version."read-package-json"."2.0.0";
       "readdir-scoped-modules-1.0.1" = self.by-version."readdir-scoped-modules"."1.0.1";
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1";
     };
     optionalDependencies = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."read-only-stream"."^1.1.1" =
+    self.by-version."read-only-stream"."1.1.1";
+  by-version."read-only-stream"."1.1.1" = self.buildNodePackage {
+    name = "read-only-stream-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz";
+      name = "read-only-stream-1.1.1.tgz";
+      sha1 = "5da77c799ed1388d3ef88a18471bb5924f8a0ba1";
+    };
+    deps = {
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-wrap-1.0.0" = self.by-version."readable-wrap"."1.0.0";
+    };
+    optionalDependencies = {
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.3.1";
-  by-version."read-package-json"."1.3.1" = self.buildNodePackage {
-    name = "read-package-json-1.3.1";
-    version = "1.3.1";
+    self.by-version."read-package-json"."1.3.3";
+  by-version."read-package-json"."1.3.3" = self.buildNodePackage {
+    name = "read-package-json-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.3.1.tgz";
-      name = "read-package-json-1.3.1.tgz";
-      sha1 = "5a965f9fc34b25ffa5e0d93b1d0fc063af6d10b0";
+      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.3.3.tgz";
+      name = "read-package-json-1.3.3.tgz";
+      sha1 = "ef79dfda46e165376ee8a57efbfedd4d1b029ba4";
     };
     deps = {
-      "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
-      "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
+      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+      "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3";
       "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
     };
     optionalDependencies = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."read-package-json"."1 || 2" =
+    self.by-version."read-package-json"."2.0.0";
+  by-version."read-package-json"."2.0.0" = self.buildNodePackage {
+    name = "read-package-json-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-2.0.0.tgz";
+      name = "read-package-json-2.0.0.tgz";
+      sha1 = "ca7543298275028d27064b9118e6e501c9b3ae41";
+    };
+    deps = {
+      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+      "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3";
+      "normalize-package-data-2.0.0" = self.by-version."normalize-package-data"."2.0.0";
+    };
+    optionalDependencies = {
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."read-package-json"."^1.3.1" =
-    self.by-version."read-package-json"."1.3.1";
-  by-spec."read-package-json"."~1.2.7" =
-    self.by-version."read-package-json"."1.2.7";
-  by-version."read-package-json"."1.2.7" = self.buildNodePackage {
-    name = "read-package-json-1.2.7";
-    version = "1.2.7";
+    self.by-version."read-package-json"."1.3.3";
+  by-spec."read-package-json"."^2.0.0" =
+    self.by-version."read-package-json"."2.0.0";
+  by-spec."read-package-json"."~1.1.0" =
+    self.by-version."read-package-json"."1.1.9";
+  by-version."read-package-json"."1.1.9" = self.buildNodePackage {
+    name = "read-package-json-1.1.9";
+    version = "1.1.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.2.7.tgz";
-      name = "read-package-json-1.2.7.tgz";
-      sha1 = "f0b440c461a218f4dbf48b094e80fc65c5248502";
+      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.9.tgz";
+      name = "read-package-json-1.1.9.tgz";
+      sha1 = "9c319185e5f8461661c01f8d4e5e80b468aa18ee";
     };
     deps = {
-      "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
-      "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
-      "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0";
-      "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
+      "normalize-package-data-0.2.13" = self.by-version."normalize-package-data"."0.2.13";
     };
     optionalDependencies = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-package-json"."~1.3.1" =
-    self.by-version."read-package-json"."1.3.1";
+  by-spec."read-package-json"."~2.0.0" =
+    self.by-version."read-package-json"."2.0.0";
   by-spec."read-torrent"."^1.0.0" =
-    self.by-version."read-torrent"."1.2.0";
-  by-version."read-torrent"."1.2.0" = self.buildNodePackage {
-    name = "read-torrent-1.2.0";
-    version = "1.2.0";
+    self.by-version."read-torrent"."1.3.0";
+  by-version."read-torrent"."1.3.0" = self.buildNodePackage {
+    name = "read-torrent-1.3.0";
+    version = "1.3.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.2.0.tgz";
-      name = "read-torrent-1.2.0.tgz";
-      sha1 = "2b5fa465ab1e3a9a2e478403b425910ae66c58a9";
+      url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz";
+      name = "read-torrent-1.3.0.tgz";
+      sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4";
     };
     deps = {
       "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
-      "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0";
+      "parse-torrent-4.0.0" = self.by-version."parse-torrent"."4.0.0";
       "request-2.16.6" = self.by-version."request"."2.16.6";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
@@ -31549,7 +34134,7 @@
     cpu = [ ];
   };
   by-spec."read-torrent"."^1.1.0" =
-    self.by-version."read-torrent"."1.2.0";
+    self.by-version."read-torrent"."1.3.0";
   by-spec."read-torrent"."~1.0.0" =
     self.by-version."read-torrent"."1.0.0";
   by-version."read-torrent"."1.0.0" = self.buildNodePackage {
@@ -31595,29 +34180,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readable-stream"."1.0" =
-    self.by-version."readable-stream"."1.0.33";
-  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
-    name = "readable-stream-1.0.33";
-    version = "1.0.33";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
-      name = "readable-stream-1.0.33.tgz";
-      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
-    };
-    deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."readable-stream"."1.0.27-1" =
     self.by-version."readable-stream"."1.0.27-1";
   by-version."readable-stream"."1.0.27-1" = self.buildNodePackage {
@@ -31670,18 +34232,43 @@
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" =
     self.by-version."readable-stream"."1.0.33";
+  by-version."readable-stream"."1.0.33" = self.buildNodePackage {
+    name = "readable-stream-1.0.33";
+    version = "1.0.33";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
+      name = "readable-stream-1.0.33.tgz";
+      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
+    };
+    deps = {
+      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.0.2" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.0.27-1" =
     self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."^1.0.31" =
+    self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.0.33-1" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.1.13" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.1.13-1" =
     self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."^1.1.8" =
+    self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."~1.0.17" =
     self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream"."~1.0.2" =
@@ -31698,6 +34285,10 @@
     self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream"."~1.1" =
     self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."~1.1.10" =
+    self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."~1.1.13" =
+    self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."~1.1.8" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."~1.1.9" =
@@ -31736,7 +34327,7 @@
     deps = {
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
       "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "once-1.3.1" = self.by-version."once"."1.3.1";
     };
     optionalDependencies = {
@@ -31781,7 +34372,7 @@
       sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb";
     };
     deps = {
-      "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1";
+      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
     };
     optionalDependencies = {
     };
@@ -31789,9 +34380,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readdirp"."~1.3.0" =
-    self.by-version."readdirp"."1.3.0";
-  by-spec."readline2"."~0.1.0" =
+  by-spec."readline2"."^0.1.1" =
     self.by-version."readline2"."0.1.1";
   by-version."readline2"."0.1.1" = self.buildNodePackage {
     name = "readline2-0.1.1";
@@ -31812,20 +34401,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."realize-package-specifier"."~1.3.0" =
-    self.by-version."realize-package-specifier"."1.3.0";
-  by-version."realize-package-specifier"."1.3.0" = self.buildNodePackage {
-    name = "realize-package-specifier-1.3.0";
-    version = "1.3.0";
+  by-spec."readline2"."~0.1.0" =
+    self.by-version."readline2"."0.1.1";
+  by-spec."realize-package-specifier"."~3.0.0" =
+    self.by-version."realize-package-specifier"."3.0.0";
+  by-version."realize-package-specifier"."3.0.0" = self.buildNodePackage {
+    name = "realize-package-specifier-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-1.3.0.tgz";
-      name = "realize-package-specifier-1.3.0.tgz";
-      sha1 = "23374a84e6a9188483f346cc939eb58eec85efa5";
+      url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.0.tgz";
+      name = "realize-package-specifier-3.0.0.tgz";
+      sha1 = "38224d63f546d4972f0a68cb6e91f6cf73ac67fa";
     };
     deps = {
       "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
-      "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3";
+      "npm-package-arg-4.0.0" = self.by-version."npm-package-arg"."4.0.0";
     };
     optionalDependencies = {
     };
@@ -31833,22 +34424,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."recast"."~0.10.0" =
-    self.by-version."recast"."0.10.0";
-  by-version."recast"."0.10.0" = self.buildNodePackage {
-    name = "recast-0.10.0";
-    version = "0.10.0";
+  by-spec."recast"."~0.10.3" =
+    self.by-version."recast"."0.10.12";
+  by-version."recast"."0.10.12" = self.buildNodePackage {
+    name = "recast-0.10.12";
+    version = "0.10.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/recast/-/recast-0.10.0.tgz";
-      name = "recast-0.10.0.tgz";
-      sha1 = "5c5a57f15faffb2efefed70039fbeddec25629f9";
+      url = "http://registry.npmjs.org/recast/-/recast-0.10.12.tgz";
+      name = "recast-0.10.12.tgz";
+      sha1 = "c616c1b7c4a82f0b9eb68734fc8f46ad2f5d2ac5";
     };
     deps = {
-      "esprima-fb-12001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."12001.1.0-dev-harmony-fb";
-      "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
+      "esprima-fb-14001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."14001.1.0-dev-harmony-fb";
+      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "ast-types-0.6.14" = self.by-version."ast-types"."0.6.14";
+      "ast-types-0.7.6" = self.by-version."ast-types"."0.7.6";
     };
     optionalDependencies = {
     };
@@ -31871,7 +34462,7 @@
       "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "ast-types-0.6.14" = self.by-version."ast-types"."0.6.14";
+      "ast-types-0.6.16" = self.by-version."ast-types"."0.6.16";
     };
     optionalDependencies = {
     };
@@ -31979,8 +34570,8 @@
   };
   by-spec."redis"."^0.12.1" =
     self.by-version."redis"."0.12.1";
-  by-spec."redis"."~0.10.0" =
-    self.by-version."redis"."0.10.3";
+  by-spec."redis"."~0.12.0" =
+    self.by-version."redis"."0.12.1";
   by-spec."reds"."~0.2.4" =
     self.by-version."reds"."0.2.5";
   by-version."reds"."0.2.5" = self.buildNodePackage {
@@ -31993,7 +34584,7 @@
       sha1 = "38a767f7663cd749036848697d82c74fd29bc01f";
     };
     deps = {
-      "natural-0.2.0" = self.by-version."natural"."0.2.0";
+      "natural-0.2.1" = self.by-version."natural"."0.2.1";
       "redis-0.12.1" = self.by-version."redis"."0.12.1";
     };
     optionalDependencies = {
@@ -32022,22 +34613,22 @@
     cpu = [ ];
   };
   by-spec."regenerator"."~0.8.13" =
-    self.by-version."regenerator"."0.8.14";
-  by-version."regenerator"."0.8.14" = self.buildNodePackage {
-    name = "regenerator-0.8.14";
-    version = "0.8.14";
+    self.by-version."regenerator"."0.8.22";
+  by-version."regenerator"."0.8.22" = self.buildNodePackage {
+    name = "regenerator-0.8.22";
+    version = "0.8.22";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/regenerator/-/regenerator-0.8.14.tgz";
-      name = "regenerator-0.8.14.tgz";
-      sha1 = "29736fb2a8ceaaaeee0049c1babf514cace670f0";
+      url = "http://registry.npmjs.org/regenerator/-/regenerator-0.8.22.tgz";
+      name = "regenerator-0.8.22.tgz";
+      sha1 = "6706f6f3abb9268c161f9f25a0520d0cdec250fc";
     };
     deps = {
       "commoner-0.10.1" = self.by-version."commoner"."0.10.1";
-      "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
-      "recast-0.10.0" = self.by-version."recast"."0.10.0";
+      "esprima-fb-13001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."13001.1.0-dev-harmony-fb";
+      "recast-0.10.12" = self.by-version."recast"."0.10.12";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
       "defs-1.1.0" = self.by-version."defs"."1.1.0";
     };
     optionalDependencies = {
@@ -32046,6 +34637,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."regex-cache"."^0.4.0" =
+    self.by-version."regex-cache"."0.4.2";
+  by-version."regex-cache"."0.4.2" = self.buildNodePackage {
+    name = "regex-cache-0.4.2";
+    version = "0.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz";
+      name = "regex-cache-0.4.2.tgz";
+      sha1 = "6e4f89c266bc03c33fd129c062184687f4663487";
+    };
+    deps = {
+      "is-equal-shallow-0.1.2" = self.by-version."is-equal-shallow"."0.1.2";
+      "is-primitive-2.0.0" = self.by-version."is-primitive"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."regexp-clone"."0.0.1" =
     self.by-version."regexp-clone"."0.0.1";
   by-version."regexp-clone"."0.0.1" = self.buildNodePackage {
@@ -32065,19 +34677,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."registry-url"."^0.1.0" =
-    self.by-version."registry-url"."0.1.1";
-  by-version."registry-url"."0.1.1" = self.buildNodePackage {
-    name = "registry-url-0.1.1";
-    version = "0.1.1";
+  by-spec."regexp-quote"."0.0.0" =
+    self.by-version."regexp-quote"."0.0.0";
+  by-version."regexp-quote"."0.0.0" = self.buildNodePackage {
+    name = "regexp-quote-0.0.0";
+    version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz";
-      name = "registry-url-0.1.1.tgz";
-      sha1 = "1739427b81b110b302482a1c7cd727ffcc82d5be";
+      url = "http://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz";
+      name = "regexp-quote-0.0.0.tgz";
+      sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
     };
     deps = {
-      "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1";
     };
     optionalDependencies = {
     };
@@ -32086,18 +34697,117 @@
     cpu = [ ];
   };
   by-spec."registry-url"."^3.0.0" =
-    self.by-version."registry-url"."3.0.0";
-  by-version."registry-url"."3.0.0" = self.buildNodePackage {
-    name = "registry-url-3.0.0";
-    version = "3.0.0";
+    self.by-version."registry-url"."3.0.3";
+  by-version."registry-url"."3.0.3" = self.buildNodePackage {
+    name = "registry-url-3.0.3";
+    version = "3.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/registry-url/-/registry-url-3.0.0.tgz";
-      name = "registry-url-3.0.0.tgz";
-      sha1 = "8914166605792d03bdd11b05cd00b2b7688c3849";
+      url = "http://registry.npmjs.org/registry-url/-/registry-url-3.0.3.tgz";
+      name = "registry-url-3.0.3.tgz";
+      sha1 = "c9f5102e0fd9c9f250522a7f19f68672c84ccc96";
+    };
+    deps = {
+      "rc-1.0.1" = self.by-version."rc"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."relative-date"."^1.1.1" =
+    self.by-version."relative-date"."1.1.2";
+  by-version."relative-date"."1.1.2" = self.buildNodePackage {
+    name = "relative-date-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/relative-date/-/relative-date-1.1.2.tgz";
+      name = "relative-date-1.1.2.tgz";
+      sha1 = "89b990c49bc543052929f34bc76d263605edb964";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."render-readme".">=0.2.1" =
+    self.by-version."render-readme"."1.3.0";
+  by-version."render-readme"."1.3.0" = self.buildNodePackage {
+    name = "render-readme-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/render-readme/-/render-readme-1.3.0.tgz";
+      name = "render-readme-1.3.0.tgz";
+      sha1 = "b3c766ba8688cb46005e0fd7233aa5a236a09501";
+    };
+    deps = {
+      "markdown-it-4.1.2" = self.by-version."markdown-it"."4.1.2";
+      "sanitize-html-1.6.1" = self.by-version."sanitize-html"."1.6.1";
+      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
+      "highlight.js-8.5.0" = self.by-version."highlight.js"."8.5.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."repeat-element"."^1.1.0" =
+    self.by-version."repeat-element"."1.1.0";
+  by-version."repeat-element"."1.1.0" = self.buildNodePackage {
+    name = "repeat-element-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/repeat-element/-/repeat-element-1.1.0.tgz";
+      name = "repeat-element-1.1.0.tgz";
+      sha1 = "3307c041c52bb36a36e380de2d252ef61a907cca";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."repeat-string"."^0.2.2" =
+    self.by-version."repeat-string"."0.2.2";
+  by-version."repeat-string"."0.2.2" = self.buildNodePackage {
+    name = "repeat-string-0.2.2";
+    version = "0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz";
+      name = "repeat-string-0.2.2.tgz";
+      sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."repeat-string"."^1.5.2" =
+    self.by-version."repeat-string"."1.5.2";
+  by-version."repeat-string"."1.5.2" = self.buildNodePackage {
+    name = "repeat-string-1.5.2";
+    version = "1.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz";
+      name = "repeat-string-1.5.2.tgz";
+      sha1 = "21065f70727ad053a0dd5e957ac9e00c7560d90a";
     };
     deps = {
-      "rc-0.6.0" = self.by-version."rc"."0.6.0";
     };
     optionalDependencies = {
     };
@@ -32118,7 +34828,7 @@
     };
     deps = {
       "is-finite-1.0.0" = self.by-version."is-finite"."1.0.0";
-      "meow-3.0.0" = self.by-version."meow"."3.0.0";
+      "meow-3.1.0" = self.by-version."meow"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -32168,25 +34878,25 @@
     cpu = [ ];
   };
   by-spec."request"."2" =
-    self.by-version."request"."2.53.0";
-  by-version."request"."2.53.0" = self.buildNodePackage {
-    name = "request-2.53.0";
-    version = "2.53.0";
+    self.by-version."request"."2.55.0";
+  by-version."request"."2.55.0" = self.buildNodePackage {
+    name = "request-2.55.0";
+    version = "2.55.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz";
-      name = "request-2.53.0.tgz";
-      sha1 = "180a3ae92b7b639802e4f9545dd8fcdeb71d760c";
+      url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz";
+      name = "request-2.55.0.tgz";
+      sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d";
     };
     deps = {
       "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "qs-2.4.1" = self.by-version."qs"."2.4.1";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
@@ -32195,7 +34905,8 @@
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "isstream-0.1.1" = self.by-version."isstream"."0.1.1";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.6.1" = self.by-version."har-validator"."1.6.1";
     };
     optionalDependencies = {
     };
@@ -32204,9 +34915,9 @@
     cpu = [ ];
   };
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request"."2.16.x" =
     self.by-version."request"."2.16.6";
   by-version."request"."2.16.6" = self.buildNodePackage {
@@ -32222,7 +34933,7 @@
       "form-data-0.0.10" = self.by-version."form-data"."0.0.10";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "hawk-0.10.2" = self.by-version."hawk"."0.10.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0";
       "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0";
       "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0";
@@ -32258,7 +34969,7 @@
       "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
       "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
       "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
     };
@@ -32289,7 +35000,7 @@
       "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
       "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
       "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
     };
@@ -32314,7 +35025,7 @@
       "qs-0.6.6" = self.by-version."qs"."0.6.6";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
     };
     optionalDependencies = {
@@ -32346,7 +35057,7 @@
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
     };
     optionalDependencies = {
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
@@ -32377,7 +35088,7 @@
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
     };
     optionalDependencies = {
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
@@ -32393,6 +35104,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."request"."2.40.x" =
+    self.by-version."request"."2.40.0";
   by-spec."request"."2.42.0" =
     self.by-version."request"."2.42.0";
   by-version."request"."2.42.0" = self.buildNodePackage {
@@ -32411,7 +35124,7 @@
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
     };
     optionalDependencies = {
@@ -32445,7 +35158,7 @@
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
@@ -32462,6 +35175,42 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."request"."2.53.0" =
+    self.by-version."request"."2.53.0";
+  by-version."request"."2.53.0" = self.buildNodePackage {
+    name = "request-2.53.0";
+    version = "2.53.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz";
+      name = "request-2.53.0.tgz";
+      sha1 = "180a3ae92b7b639802e4f9545dd8fcdeb71d760c";
+    };
+    deps = {
+      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
+      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
+      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."request"."2.9.x" =
     self.by-version."request"."2.9.203";
   by-version."request"."2.9.203" = self.buildNodePackage {
@@ -32482,9 +35231,9 @@
     cpu = [ ];
   };
   by-spec."request"."2.x" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request"."2.x.x" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request"."=2.45.0" =
     self.by-version."request"."2.45.0";
   by-version."request"."2.45.0" = self.buildNodePackage {
@@ -32503,7 +35252,7 @@
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
     };
@@ -32520,29 +35269,66 @@
     cpu = [ ];
   };
   by-spec."request".">= 2.2.9" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request".">= 2.9.153" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request".">=2.2.9" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request".">=2.27.0" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request".">=2.29.1" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request".">=2.30.1" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
+  by-spec."request".">=2.31.0 <3.0.0-0" =
+    self.by-version."request"."2.55.0";
   by-spec."request"."^2.34.0" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
+  by-spec."request"."^2.39.0" =
+    self.by-version."request"."2.55.0";
   by-spec."request"."^2.40.0" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request"."^2.47.0" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request"."^2.51.0" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
+  by-spec."request"."^2.54.0" =
+    self.by-version."request"."2.55.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.53.0";
+    self.by-version."request"."2.55.0";
   by-spec."request"."~2.16.2" =
     self.by-version."request"."2.16.6";
+  by-spec."request"."~2.21.0" =
+    self.by-version."request"."2.21.0";
+  by-version."request"."2.21.0" = self.buildNodePackage {
+    name = "request-2.21.0";
+    version = "2.21.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/request/-/request-2.21.0.tgz";
+      name = "request-2.21.0.tgz";
+      sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7";
+    };
+    deps = {
+      "qs-0.6.6" = self.by-version."qs"."0.6.6";
+      "json-stringify-safe-4.0.0" = self.by-version."json-stringify-safe"."4.0.0";
+      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
+      "http-signature-0.9.11" = self.by-version."http-signature"."0.9.11";
+      "hawk-0.13.1" = self.by-version."hawk"."0.13.1";
+      "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
+      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
+      "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "form-data-0.0.8" = self.by-version."form-data"."0.0.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."request"."~2.27.0" =
     self.by-version."request"."2.27.0";
   by-spec."request"."~2.34.0" =
@@ -32560,7 +35346,7 @@
       "qs-0.6.6" = self.by-version."qs"."0.6.6";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
     };
     optionalDependencies = {
@@ -32578,8 +35364,6 @@
   };
   by-spec."request"."~2.40.0" =
     self.by-version."request"."2.40.0";
-  by-spec."request"."~2.42.0" =
-    self.by-version."request"."2.42.0";
   by-spec."request"."~2.46.0" =
     self.by-version."request"."2.46.0";
   by-version."request"."2.46.0" = self.buildNodePackage {
@@ -32598,7 +35382,7 @@
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
@@ -32632,7 +35416,7 @@
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
@@ -32667,7 +35451,7 @@
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
       "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
       "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
       "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
@@ -32684,28 +35468,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."~2.53.0" =
-    self.by-version."request"."2.53.0";
-  by-spec."request-progress"."0.3.0" =
-    self.by-version."request-progress"."0.3.0";
-  by-version."request-progress"."0.3.0" = self.buildNodePackage {
-    name = "request-progress-0.3.0";
-    version = "0.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz";
-      name = "request-progress-0.3.0.tgz";
-      sha1 = "bdf2062bfc197c5d492500d44cb3aff7865b492e";
-    };
-    deps = {
-      "throttleit-0.0.2" = self.by-version."throttleit"."0.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."request"."~2.55.0" =
+    self.by-version."request"."2.55.0";
   by-spec."request-progress"."0.3.1" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = self.buildNodePackage {
@@ -32747,15 +35511,15 @@
     cpu = [ ];
   };
   by-spec."requirejs"."~2.1" =
-    self.by-version."requirejs"."2.1.16";
-  by-version."requirejs"."2.1.16" = self.buildNodePackage {
-    name = "requirejs-2.1.16";
-    version = "2.1.16";
+    self.by-version."requirejs"."2.1.17";
+  by-version."requirejs"."2.1.17" = self.buildNodePackage {
+    name = "requirejs-2.1.17";
+    version = "2.1.17";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.16.tgz";
-      name = "requirejs-2.1.16.tgz";
-      sha1 = "e0203095c6e09721477c40ebdb64e20f2cdc71be";
+      url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.17.tgz";
+      name = "requirejs-2.1.17.tgz";
+      sha1 = "d812203a34f7fd571f52e459d7748fc0f8717f27";
     };
     deps = {
     };
@@ -32766,7 +35530,7 @@
     cpu = [ ];
   };
   by-spec."requirejs"."~2.1.0" =
-    self.by-version."requirejs"."2.1.16";
+    self.by-version."requirejs"."2.1.17";
   by-spec."resanitize"."~0.3.0" =
     self.by-version."resanitize"."0.3.0";
   by-version."resanitize"."0.3.0" = self.buildNodePackage {
@@ -32806,35 +35570,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."resolve"."0.7.x" =
-    self.by-version."resolve"."0.7.4";
-  by-version."resolve"."0.7.4" = self.buildNodePackage {
-    name = "resolve-0.7.4";
-    version = "0.7.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
-      name = "resolve-0.7.4.tgz";
-      sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."resolve"."1.1.5" =
-    self.by-version."resolve"."1.1.5";
-  by-version."resolve"."1.1.5" = self.buildNodePackage {
-    name = "resolve-1.1.5";
-    version = "1.1.5";
+  by-spec."resolve"."1.1.6" =
+    self.by-version."resolve"."1.1.6";
+  by-version."resolve"."1.1.6" = self.buildNodePackage {
+    name = "resolve-1.1.6";
+    version = "1.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-1.1.5.tgz";
-      name = "resolve-1.1.5.tgz";
-      sha1 = "3b74c0c44cdf5eee32322b2cda0a4acbf6970fa7";
+      url = "http://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz";
+      name = "resolve-1.1.6.tgz";
+      sha1 = "d3492ad054ca800f5befa612e61beac1eec98f8f";
     };
     deps = {
     };
@@ -32844,10 +35589,12 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."resolve"."1.1.x" =
+    self.by-version."resolve"."1.1.6";
   by-spec."resolve"."^1.1.3" =
-    self.by-version."resolve"."1.1.5";
+    self.by-version."resolve"."1.1.6";
   by-spec."resolve"."^1.1.4" =
-    self.by-version."resolve"."1.1.5";
+    self.by-version."resolve"."1.1.6";
   by-spec."resolve"."~0.3.0" =
     self.by-version."resolve"."0.3.1";
   by-version."resolve"."0.3.1" = self.buildNodePackage {
@@ -32873,16 +35620,14 @@
     self.by-version."resolve"."0.6.3";
   by-spec."resolve"."~0.7.1" =
     self.by-version."resolve"."0.7.4";
-  by-spec."resolve"."~1.0.0" =
-    self.by-version."resolve"."1.0.0";
-  by-version."resolve"."1.0.0" = self.buildNodePackage {
-    name = "resolve-1.0.0";
-    version = "1.0.0";
+  by-version."resolve"."0.7.4" = self.buildNodePackage {
+    name = "resolve-0.7.4";
+    version = "0.7.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz";
-      name = "resolve-1.0.0.tgz";
-      sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6";
+      url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
+      name = "resolve-0.7.4.tgz";
+      sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69";
     };
     deps = {
     };
@@ -32892,6 +35637,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."resolve"."~1.1.0" =
+    self.by-version."resolve"."1.1.6";
   by-spec."response-time"."1.0.0" =
     self.by-version."response-time"."1.0.0";
   by-version."response-time"."1.0.0" = self.buildNodePackage {
@@ -32943,7 +35690,7 @@
       sha1 = "27cf2194fa373ef02c04781287416a3138060b68";
     };
     deps = {
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
     };
     optionalDependencies = {
@@ -32952,37 +35699,60 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."restify"."2.4.1" =
-    self.by-version."restify"."2.4.1";
-  by-version."restify"."2.4.1" = self.buildNodePackage {
-    name = "restify-2.4.1";
-    version = "2.4.1";
+  by-spec."restify"."2.8.5" =
+    self.by-version."restify"."2.8.5";
+  by-version."restify"."2.8.5" = self.buildNodePackage {
+    name = "restify-2.8.5";
+    version = "2.8.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/restify/-/restify-2.4.1.tgz";
-      name = "restify-2.4.1.tgz";
-      sha1 = "35790a052bd0927e7f6a06cc3d079e56fabc9371";
+      url = "http://registry.npmjs.org/restify/-/restify-2.8.5.tgz";
+      name = "restify-2.8.5.tgz";
+      sha1 = "a28ac9d690e88db60937309942efc735010b1329";
     };
     deps = {
-      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
-      "backoff-2.1.0" = self.by-version."backoff"."2.1.0";
-      "bunyan-0.21.1" = self.by-version."bunyan"."0.21.1";
-      "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
-      "formidable-1.0.13" = self.by-version."formidable"."1.0.13";
-      "http-signature-0.9.11" = self.by-version."http-signature"."0.9.11";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "backoff-2.4.1" = self.by-version."backoff"."2.4.1";
+      "bunyan-1.3.5" = self.by-version."bunyan"."1.3.5";
+      "csv-0.4.1" = self.by-version."csv"."0.4.1";
+      "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
+      "escape-regexp-component-1.0.2" = self.by-version."escape-regexp-component"."1.0.2";
+      "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
+      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "keep-alive-agent-0.0.1" = self.by-version."keep-alive-agent"."0.0.1";
-      "lru-cache-2.3.0" = self.by-version."lru-cache"."2.3.0";
-      "mime-1.2.9" = self.by-version."mime"."1.2.9";
-      "negotiator-0.2.5" = self.by-version."negotiator"."0.2.5";
-      "node-uuid-1.4.0" = self.by-version."node-uuid"."1.4.0";
-      "once-1.1.1" = self.by-version."once"."1.1.1";
-      "qs-0.5.5" = self.by-version."qs"."0.5.5";
-      "semver-1.1.4" = self.by-version."semver"."1.1.4";
-      "spdy-1.7.1" = self.by-version."spdy"."1.7.1";
-      "verror-1.3.6" = self.by-version."verror"."1.3.6";
+      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "qs-1.2.2" = self.by-version."qs"."1.2.2";
+      "semver-2.3.2" = self.by-version."semver"."2.3.2";
+      "spdy-1.32.0" = self.by-version."spdy"."1.32.0";
+      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "verror-1.6.0" = self.by-version."verror"."1.6.0";
+    };
+    optionalDependencies = {
+      "dtrace-provider-0.3.2" = self.by-version."dtrace-provider"."0.3.2";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."resumer"."~0.0.0" =
+    self.by-version."resumer"."0.0.0";
+  by-version."resumer"."0.0.0" = self.buildNodePackage {
+    name = "resumer-0.0.0";
+    version = "0.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
+      name = "resumer-0.0.0.tgz";
+      sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
+    };
+    deps = {
+      "through-2.3.7" = self.by-version."through"."2.3.7";
     };
     optionalDependencies = {
-      "dtrace-provider-0.2.8" = self.by-version."dtrace-provider"."0.2.8";
     };
     peerDependencies = [];
     os = [ ];
@@ -33008,18 +35778,18 @@
     cpu = [ ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."1.16.1";
-  by-version."rethinkdb"."1.16.1" = self.buildNodePackage {
-    name = "rethinkdb-1.16.1";
-    version = "1.16.1";
+    self.by-version."rethinkdb"."2.0.0";
+  by-version."rethinkdb"."2.0.0" = self.buildNodePackage {
+    name = "rethinkdb-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-1.16.1.tgz";
-      name = "rethinkdb-1.16.1.tgz";
-      sha1 = "b18d6cbea75564bffdc14f972369d20f5c35b9e6";
+      url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-2.0.0.tgz";
+      name = "rethinkdb-2.0.0.tgz";
+      sha1 = "5d46f58a843d4dfc028193b497b56130784eea95";
     };
     deps = {
-      "bluebird-2.9.12" = self.by-version."bluebird"."2.9.12";
+      "bluebird-2.9.24" = self.by-version."bluebird"."2.9.24";
     };
     optionalDependencies = {
     };
@@ -33027,7 +35797,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."1.16.1";
+  "rethinkdb" = self.by-version."rethinkdb"."2.0.0";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = self.buildNodePackage {
@@ -33047,7 +35817,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."retry"."^0.6.1" =
+  by-spec."retry"."0.6.1" =
     self.by-version."retry"."0.6.1";
   by-version."retry"."0.6.1" = self.buildNodePackage {
     name = "retry-0.6.1";
@@ -33066,6 +35836,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."retry"."^0.6.1" =
+    self.by-version."retry"."0.6.1";
   by-spec."retry"."~0.6.0" =
     self.by-version."retry"."0.6.1";
   by-spec."retry"."~0.6.1" =
@@ -33112,37 +35884,19 @@
   };
   by-spec."rfile"."~1.0.0" =
     self.by-version."rfile"."1.0.0";
-  by-spec."rimraf"."1.x.x" =
-    self.by-version."rimraf"."1.0.9";
-  by-version."rimraf"."1.0.9" = self.buildNodePackage {
-    name = "rimraf-1.0.9";
-    version = "1.0.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
-      name = "rimraf-1.0.9.tgz";
-      sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.2.8";
-  by-version."rimraf"."2.2.8" = self.buildNodePackage {
-    name = "rimraf-2.2.8";
-    version = "2.2.8";
+    self.by-version."rimraf"."2.3.2";
+  by-version."rimraf"."2.3.2" = self.buildNodePackage {
+    name = "rimraf-2.3.2";
+    version = "2.3.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
-      name = "rimraf-2.2.8.tgz";
-      sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz";
+      name = "rimraf-2.3.2.tgz";
+      sha1 = "7304bd9275c401b89103b106b3531c1ef0c02fe9";
     };
     deps = {
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
     };
     optionalDependencies = {
     };
@@ -33170,15 +35924,15 @@
     cpu = [ ];
   };
   by-spec."rimraf"."2.x.x" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.3.2";
   by-spec."rimraf".">=2.2.6" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.3.2";
   by-spec."rimraf"."^2.2.5" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.3.2";
   by-spec."rimraf"."^2.2.8" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.3.2";
   by-spec."rimraf"."~2" =
-    self.by-version."rimraf"."2.2.8";
+    self.by-version."rimraf"."2.3.2";
   by-spec."rimraf"."~2.1.4" =
     self.by-version."rimraf"."2.1.4";
   by-version."rimraf"."2.1.4" = self.buildNodePackage {
@@ -33201,12 +35955,31 @@
   };
   by-spec."rimraf"."~2.2.0" =
     self.by-version."rimraf"."2.2.8";
+  by-version."rimraf"."2.2.8" = self.buildNodePackage {
+    name = "rimraf-2.2.8";
+    version = "2.2.8";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+      name = "rimraf-2.2.8.tgz";
+      sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."rimraf"."~2.2.5" =
     self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.6" =
     self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.8" =
     self.by-version."rimraf"."2.2.8";
+  by-spec."rimraf"."~2.3.2" =
+    self.by-version."rimraf"."2.3.2";
   by-spec."ripemd160"."0.2.0" =
     self.by-version."ripemd160"."0.2.0";
   by-version."ripemd160"."0.2.0" = self.buildNodePackage {
@@ -33264,6 +36037,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."root"."^2.0.0" =
+    self.by-version."root"."2.0.0";
+  by-version."root"."2.0.0" = self.buildNodePackage {
+    name = "root-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/root/-/root-2.0.0.tgz";
+      name = "root-2.0.0.tgz";
+      sha1 = "5cde3bc4ee9eb314c9dc64f97d9b9787df22e2f7";
+    };
+    deps = {
+      "murl-0.4.1" = self.by-version."murl"."0.4.1";
+      "protein-0.5.0" = self.by-version."protein"."0.5.0";
+      "network-address-0.0.5" = self.by-version."network-address"."0.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."router"."^0.6.2" =
     self.by-version."router"."0.6.2";
   by-version."router"."0.6.2" = self.buildNodePackage {
@@ -33283,6 +36078,47 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."rrecur".">=2.0.0" =
+    self.by-version."rrecur"."2.0.0";
+  by-version."rrecur"."2.0.0" = self.buildNodePackage {
+    name = "rrecur-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rrecur/-/rrecur-2.0.0.tgz";
+      name = "rrecur-2.0.0.tgz";
+      sha1 = "d4bcce601cb0e15be6ee8489a54474a6af97811c";
+    };
+    deps = {
+      "rrule-2.0.1" = self.by-version."rrule"."2.0.1";
+      "moment-2.5.1" = self.by-version."moment"."2.5.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rrule"."~2.0.0" =
+    self.by-version."rrule"."2.0.1";
+  by-version."rrule"."2.0.1" = self.buildNodePackage {
+    name = "rrule-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rrule/-/rrule-2.0.1.tgz";
+      name = "rrule-2.0.1.tgz";
+      sha1 = "360fc68e4391896c4c329f85073d2f5e1f41310b";
+    };
+    deps = {
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."rss".">=0.2.1" =
     self.by-version."rss"."1.1.1";
   by-version."rss"."1.1.1" = self.buildNodePackage {
@@ -33295,7 +36131,7 @@
       sha1 = "eb240f55e48bda42b9f546be5fc659221a95c72c";
     };
     deps = {
-      "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
       "xml-1.0.0" = self.by-version."xml"."1.0.0";
     };
     optionalDependencies = {
@@ -33347,17 +36183,18 @@
   by-spec."run-applescript"."^1.0.1" =
     self.by-version."run-applescript"."1.0.1";
   by-spec."run-parallel"."^1.0.0" =
-    self.by-version."run-parallel"."1.0.0";
-  by-version."run-parallel"."1.0.0" = self.buildNodePackage {
-    name = "run-parallel-1.0.0";
-    version = "1.0.0";
+    self.by-version."run-parallel"."1.1.0";
+  by-version."run-parallel"."1.1.0" = self.buildNodePackage {
+    name = "run-parallel-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/run-parallel/-/run-parallel-1.0.0.tgz";
-      name = "run-parallel-1.0.0.tgz";
-      sha1 = "1dd0787f994d17f8d1bbe7e910e0cc3036800cbc";
+      url = "http://registry.npmjs.org/run-parallel/-/run-parallel-1.1.0.tgz";
+      name = "run-parallel-1.1.0.tgz";
+      sha1 = "6c51c3b7e06400a39f38e34aa1e76463a015e67f";
     };
     deps = {
+      "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -33366,17 +36203,18 @@
     cpu = [ ];
   };
   by-spec."run-series"."^1.0.2" =
-    self.by-version."run-series"."1.0.2";
-  by-version."run-series"."1.0.2" = self.buildNodePackage {
-    name = "run-series-1.0.2";
-    version = "1.0.2";
+    self.by-version."run-series"."1.1.0";
+  by-version."run-series"."1.1.0" = self.buildNodePackage {
+    name = "run-series-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/run-series/-/run-series-1.0.2.tgz";
-      name = "run-series-1.0.2.tgz";
-      sha1 = "63d0d361b9aa2509c85bd790810a8bd9d302bc8e";
+      url = "http://registry.npmjs.org/run-series/-/run-series-1.1.0.tgz";
+      name = "run-series-1.1.0.tgz";
+      sha1 = "f2c3a60ad91078220d1c06bccb5124cc1f02748b";
     };
     deps = {
+      "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -33404,6 +36242,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."rusha"."^0.8.1" =
+    self.by-version."rusha"."0.8.2";
+  by-version."rusha"."0.8.2" = self.buildNodePackage {
+    name = "rusha-0.8.2";
+    version = "0.8.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/rusha/-/rusha-0.8.2.tgz";
+      name = "rusha-0.8.2.tgz";
+      sha1 = "05f3196df37b166bc080db1bbd69c84d64fa1c1f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."rusha-browserify"."^0.7.3" =
     self.by-version."rusha-browserify"."0.7.3";
   by-version."rusha-browserify"."0.7.3" = self.buildNodePackage {
@@ -33424,15 +36281,15 @@
     cpu = [ ];
   };
   by-spec."rx"."^2.2.27" =
-    self.by-version."rx"."2.4.0";
-  by-version."rx"."2.4.0" = self.buildNodePackage {
-    name = "rx-2.4.0";
-    version = "2.4.0";
+    self.by-version."rx"."2.5.2";
+  by-version."rx"."2.5.2" = self.buildNodePackage {
+    name = "rx-2.5.2";
+    version = "2.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rx/-/rx-2.4.0.tgz";
-      name = "rx-2.4.0.tgz";
-      sha1 = "8cd40d4fb393d43851286f4b22aa7db60ac92fe1";
+      url = "http://registry.npmjs.org/rx/-/rx-2.5.2.tgz";
+      name = "rx-2.5.2.tgz";
+      sha1 = "52f236b5a6d24e538aa1fba88152909322a02886";
     };
     deps = {
     };
@@ -33442,6 +36299,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."rx"."^2.4.3" =
+    self.by-version."rx"."2.5.2";
+  by-spec."s3-upload-stream"."~1.0.0" =
+    self.by-version."s3-upload-stream"."1.0.7";
+  by-version."s3-upload-stream"."1.0.7" = self.buildNodePackage {
+    name = "s3-upload-stream-1.0.7";
+    version = "1.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/s3-upload-stream/-/s3-upload-stream-1.0.7.tgz";
+      name = "s3-upload-stream-1.0.7.tgz";
+      sha1 = "e3f80253141c569f105a62aa50ca9b45760e481d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [
+      self.by-version."aws-sdk"."2.1.24"];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."s3http"."*" =
     self.by-version."s3http"."0.0.5";
   by-version."s3http"."0.0.5" = self.buildNodePackage {
@@ -33470,6 +36349,25 @@
     cpu = [ ];
   };
   "s3http" = self.by-version."s3http"."0.0.5";
+  by-spec."safe-json-stringify"."~1" =
+    self.by-version."safe-json-stringify"."1.0.3";
+  by-version."safe-json-stringify"."1.0.3" = self.buildNodePackage {
+    name = "safe-json-stringify-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
+      name = "safe-json-stringify-1.0.3.tgz";
+      sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."safe-regex"."0.0.1" =
     self.by-version."safe-regex"."0.0.1";
   by-version."safe-regex"."0.0.1" = self.buildNodePackage {
@@ -33509,6 +36407,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sanitize-html"."1.x >=1.4" =
+    self.by-version."sanitize-html"."1.6.1";
+  by-version."sanitize-html"."1.6.1" = self.buildNodePackage {
+    name = "sanitize-html-1.6.1";
+    version = "1.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sanitize-html/-/sanitize-html-1.6.1.tgz";
+      name = "sanitize-html-1.6.1.tgz";
+      sha1 = "05c53fa54e919b4f4b77feb6dc2000fc5bdb4141";
+    };
+    deps = {
+      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "regexp-quote-0.0.0" = self.by-version."regexp-quote"."0.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sauce-connect-launcher"."~0.6.0" =
     self.by-version."sauce-connect-launcher"."0.6.1";
   by-version."sauce-connect-launcher"."0.6.1" = self.buildNodePackage {
@@ -33589,6 +36509,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sax"."0.5.3" =
+    self.by-version."sax"."0.5.3";
+  by-version."sax"."0.5.3" = self.buildNodePackage {
+    name = "sax-0.5.3";
+    version = "0.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sax/-/sax-0.5.3.tgz";
+      name = "sax-0.5.3.tgz";
+      sha1 = "3773714a0d9157caaa7302971efa5c6dcda552d6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.8";
   by-version."sax"."0.5.8" = self.buildNodePackage {
@@ -33627,6 +36566,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sax".">=0.1.1" =
+    self.by-version."sax"."0.6.1";
   by-spec."sax".">=0.4.2" =
     self.by-version."sax"."0.6.1";
   by-spec."sax"."~0.6.0" =
@@ -33674,19 +36615,21 @@
   by-spec."scmp"."~1.0.0" =
     self.by-version."scmp"."1.0.0";
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.44.0";
-  by-version."selenium-webdriver"."2.44.0" = self.buildNodePackage {
-    name = "selenium-webdriver-2.44.0";
-    version = "2.44.0";
+    self.by-version."selenium-webdriver"."2.45.1";
+  by-version."selenium-webdriver"."2.45.1" = self.buildNodePackage {
+    name = "selenium-webdriver-2.45.1";
+    version = "2.45.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.44.0.tgz";
-      name = "selenium-webdriver-2.44.0.tgz";
-      sha1 = "6cc6257731cd27c6db6471092857755f99d77b57";
+      url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.45.1.tgz";
+      name = "selenium-webdriver-2.45.1.tgz";
+      sha1 = "6fc6a8ce385085a7b670edd36a379b2eddadf2c9";
     };
     deps = {
       "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
       "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
+      "ws-0.7.1" = self.by-version."ws"."0.7.1";
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
     };
     optionalDependencies = {
@@ -33695,17 +36638,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.45.1";
   by-spec."semver"."*" =
-    self.by-version."semver"."4.3.0";
-  by-version."semver"."4.3.0" = self.buildNodePackage {
-    name = "semver-4.3.0";
-    version = "4.3.0";
+    self.by-version."semver"."4.3.3";
+  by-version."semver"."4.3.3" = self.buildNodePackage {
+    name = "semver-4.3.3";
+    version = "4.3.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.3.0.tgz";
-      name = "semver-4.3.0.tgz";
-      sha1 = "3757ceed2b91afefe0ba2c3b6bda49c688b0257a";
+      url = "http://registry.npmjs.org/semver/-/semver-4.3.3.tgz";
+      name = "semver-4.3.3.tgz";
+      sha1 = "15466b61220bc371cd8f0e666a9f785329ea8228";
     };
     deps = {
     };
@@ -33715,7 +36658,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "semver" = self.by-version."semver"."4.3.0";
+  "semver" = self.by-version."semver"."4.3.3";
   by-spec."semver"."1.1.0" =
     self.by-version."semver"."1.1.0";
   by-version."semver"."1.1.0" = self.buildNodePackage {
@@ -33735,16 +36678,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."1.1.4" =
-    self.by-version."semver"."1.1.4";
-  by-version."semver"."1.1.4" = self.buildNodePackage {
-    name = "semver-1.1.4";
-    version = "1.1.4";
+  by-spec."semver"."2" =
+    self.by-version."semver"."2.3.2";
+  by-version."semver"."2.3.2" = self.buildNodePackage {
+    name = "semver-2.3.2";
+    version = "2.3.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
-      name = "semver-1.1.4.tgz";
-      sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
+      url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
+      name = "semver-2.3.2.tgz";
+      sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
     };
     deps = {
     };
@@ -33754,16 +36697,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."2" =
-    self.by-version."semver"."2.3.2";
-  by-version."semver"."2.3.2" = self.buildNodePackage {
-    name = "semver-2.3.2";
-    version = "2.3.2";
+  by-spec."semver"."2 >=2.2.1 || 3.x || 4" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."2 || 3 || 4" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."2.1.0" =
+    self.by-version."semver"."2.1.0";
+  by-version."semver"."2.1.0" = self.buildNodePackage {
+    name = "semver-2.1.0";
+    version = "2.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
-      name = "semver-2.3.2.tgz";
-      sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
+      url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
+      name = "semver-2.1.0.tgz";
+      sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
     };
     deps = {
     };
@@ -33773,11 +36720,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."2 >=2.2.1" =
+  by-spec."semver"."2.x" =
     self.by-version."semver"."2.3.2";
-  by-spec."semver"."2 >=2.2.1 || 3.x || 4" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver"."2 || 3" =
+  by-spec."semver"."2.x || 3.x || 4" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."4" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver".">=2.2.1 <3" =
+    self.by-version."semver"."2.3.2";
+  by-spec."semver".">=2.2.1 <5.0.0-0" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."^2.2.1" =
+    self.by-version."semver"."2.3.2";
+  by-spec."semver"."^2.3.0" =
+    self.by-version."semver"."2.3.2";
+  by-spec."semver"."^2.3.0 || 3.x || 4" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."^3.0.1" =
     self.by-version."semver"."3.0.1";
   by-version."semver"."3.0.1" = self.buildNodePackage {
     name = "semver-3.0.1";
@@ -33796,9 +36755,15 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."2 || 3 || 4" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver"."2.0.11" =
+  by-spec."semver"."^4.0.0" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."^4.1.0" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."^4.3.0" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."^4.3.1" =
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."~2.0.5" =
     self.by-version."semver"."2.0.11";
   by-version."semver"."2.0.11" = self.buildNodePackage {
     name = "semver-2.0.11";
@@ -33817,30 +36782,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."2.x" =
-    self.by-version."semver"."2.3.2";
-  by-spec."semver"."2.x || 3.x || 4" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver"."4" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver".">=2.2.1 <3" =
-    self.by-version."semver"."2.3.2";
-  by-spec."semver"."^2.2.1" =
-    self.by-version."semver"."2.3.2";
-  by-spec."semver"."^2.3.0 || 3.x || 4" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver"."^3.0.1" =
-    self.by-version."semver"."3.0.1";
-  by-spec."semver"."^4.0.0" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver"."^4.1.0" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver"."^4.3.0" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver"."~1.1.4" =
-    self.by-version."semver"."1.1.4";
-  by-spec."semver"."~2.0.5" =
+  by-spec."semver"."~2.0.8" =
     self.by-version."semver"."2.0.11";
+  by-spec."semver"."~2.1" =
+    self.by-version."semver"."2.1.0";
   by-spec."semver"."~2.2.1" =
     self.by-version."semver"."2.2.1";
   by-version."semver"."2.2.1" = self.buildNodePackage {
@@ -33860,7 +36805,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."~2.3.0" =
+  by-spec."semver"."~2.3.1" =
     self.by-version."semver"."2.3.2";
   by-spec."semver"."~3.0.1" =
     self.by-version."semver"."3.0.1";
@@ -33884,27 +36829,9 @@
     cpu = [ ];
   };
   by-spec."semver"."~4.3.0" =
-    self.by-version."semver"."4.3.0";
-  by-spec."semver-diff"."^0.1.0" =
-    self.by-version."semver-diff"."0.1.0";
-  by-version."semver-diff"."0.1.0" = self.buildNodePackage {
-    name = "semver-diff-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz";
-      name = "semver-diff-0.1.0.tgz";
-      sha1 = "4f6057ca3eba23cc484b51f64aaf88b131a3855d";
-    };
-    deps = {
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."semver"."4.3.3";
+  by-spec."semver"."~4.3.3" =
+    self.by-version."semver"."4.3.3";
   by-spec."semver-diff"."^2.0.0" =
     self.by-version."semver-diff"."2.0.0";
   by-version."semver-diff"."2.0.0" = self.buildNodePackage {
@@ -33917,7 +36844,7 @@
       sha1 = "d43024f91aa7843937dc1379002766809f7480d2";
     };
     deps = {
-      "semver-4.3.0" = self.by-version."semver"."4.3.0";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -33926,19 +36853,19 @@
     cpu = [ ];
   };
   by-spec."send"."*" =
-    self.by-version."send"."0.12.1";
-  by-version."send"."0.12.1" = self.buildNodePackage {
-    name = "send-0.12.1";
-    version = "0.12.1";
+    self.by-version."send"."0.12.2";
+  by-version."send"."0.12.2" = self.buildNodePackage {
+    name = "send-0.12.2";
+    version = "0.12.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.12.1.tgz";
-      name = "send-0.12.1.tgz";
-      sha1 = "65e2e4330eae6b4d1082a921bfc8e9c9f1776b31";
+      url = "http://registry.npmjs.org/send/-/send-0.12.2.tgz";
+      name = "send-0.12.2.tgz";
+      sha1 = "ba6785e47ab41aa0358b9da401ab22ff0f58eab6";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
@@ -33966,7 +36893,7 @@
       sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "mime-1.2.6" = self.by-version."mime"."1.2.6";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
@@ -33989,7 +36916,7 @@
       sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "mime-1.2.6" = self.by-version."mime"."1.2.6";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
@@ -34012,7 +36939,7 @@
       sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
@@ -34035,8 +36962,8 @@
       sha1 = "7745c50ec72f115115980e8fb179aec01900e08a";
     };
     deps = {
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
-      "depd-1.0.0" = self.by-version."depd"."1.0.0";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "etag-1.5.1" = self.by-version."etag"."1.5.1";
@@ -34052,8 +36979,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."send"."0.12.1" =
-    self.by-version."send"."0.12.1";
+  by-spec."send"."0.12.2" =
+    self.by-version."send"."0.12.2";
   by-spec."send"."0.3.0" =
     self.by-version."send"."0.3.0";
   by-version."send"."0.3.0" = self.buildNodePackage {
@@ -34272,6 +37199,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."serve-favicon"."^2.2.0" =
+    self.by-version."serve-favicon"."2.2.0";
   by-spec."serve-favicon"."~2.1.4" =
     self.by-version."serve-favicon"."2.1.7";
   by-version."serve-favicon"."2.1.7" = self.buildNodePackage {
@@ -34342,23 +37271,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serve-index"."~1.6.2" =
-    self.by-version."serve-index"."1.6.2";
-  by-version."serve-index"."1.6.2" = self.buildNodePackage {
-    name = "serve-index-1.6.2";
-    version = "1.6.2";
+  by-spec."serve-index"."~1.6.3" =
+    self.by-version."serve-index"."1.6.3";
+  by-version."serve-index"."1.6.3" = self.buildNodePackage {
+    name = "serve-index-1.6.3";
+    version = "1.6.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.2.tgz";
-      name = "serve-index-1.6.2.tgz";
-      sha1 = "f144a140b4500faf2e861c02bb7f160bd7dc3af1";
+      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.3.tgz";
+      name = "serve-index-1.6.3.tgz";
+      sha1 = "639056494ea59470a2c9518c28e7f225a342fd79";
     };
     deps = {
-      "accepts-1.2.4" = self.by-version."accepts"."1.2.4";
+      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
       "batch-0.5.2" = self.by-version."batch"."0.5.2";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
     };
     optionalDependencies = {
@@ -34458,23 +37388,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serve-static"."~1.7.2" =
-    self.by-version."serve-static"."1.7.2";
-  by-spec."serve-static"."~1.9.1" =
-    self.by-version."serve-static"."1.9.1";
-  by-version."serve-static"."1.9.1" = self.buildNodePackage {
-    name = "serve-static-1.9.1";
-    version = "1.9.1";
+  by-spec."serve-static"."~1.9.2" =
+    self.by-version."serve-static"."1.9.2";
+  by-version."serve-static"."1.9.2" = self.buildNodePackage {
+    name = "serve-static-1.9.2";
+    version = "1.9.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.1.tgz";
-      name = "serve-static-1.9.1.tgz";
-      sha1 = "a611b2b8a2cfb5f89685f293cb365f3f5eb61451";
+      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.2.tgz";
+      name = "serve-static-1.9.2.tgz";
+      sha1 = "069fa32453557b218ec2e39140c82d8905d5672c";
     };
     deps = {
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
       "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "send-0.12.1" = self.by-version."send"."0.12.1";
+      "send-0.12.2" = self.by-version."send"."0.12.2";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
     optionalDependencies = {
@@ -34484,15 +37412,15 @@
     cpu = [ ];
   };
   by-spec."set-immediate-shim"."^1.0.0" =
-    self.by-version."set-immediate-shim"."1.0.0";
-  by-version."set-immediate-shim"."1.0.0" = self.buildNodePackage {
-    name = "set-immediate-shim-1.0.0";
-    version = "1.0.0";
+    self.by-version."set-immediate-shim"."1.0.1";
+  by-version."set-immediate-shim"."1.0.1" = self.buildNodePackage {
+    name = "set-immediate-shim-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.0.tgz";
-      name = "set-immediate-shim-1.0.0.tgz";
-      sha1 = "e23b45a33244f6f2dcd90359bc38bdbf048de152";
+      url = "http://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz";
+      name = "set-immediate-shim-1.0.1.tgz";
+      sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
     };
     deps = {
     };
@@ -34540,22 +37468,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sha"."~1.2.1" =
-    self.by-version."sha"."1.2.4";
-  by-version."sha"."1.2.4" = self.buildNodePackage {
-    name = "sha-1.2.4";
-    version = "1.2.4";
+  by-spec."sha"."~1.0.1" =
+    self.by-version."sha"."1.0.1";
+  by-version."sha"."1.0.1" = self.buildNodePackage {
+    name = "sha-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz";
-      name = "sha-1.2.4.tgz";
-      sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d";
+      url = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz";
+      name = "sha-1.0.1.tgz";
+      sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122";
     };
     deps = {
     };
     optionalDependencies = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
     };
     peerDependencies = [];
     os = [ ];
@@ -34575,7 +37502,7 @@
     deps = {
     };
     optionalDependencies = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
@@ -34602,6 +37529,26 @@
     cpu = [ ];
   };
   by-spec."sha.js"."^2.3.6" =
+    self.by-version."sha.js"."2.4.0";
+  by-version."sha.js"."2.4.0" = self.buildNodePackage {
+    name = "sha.js-2.4.0";
+    version = "2.4.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sha.js/-/sha.js-2.4.0.tgz";
+      name = "sha.js-2.4.0.tgz";
+      sha1 = "ba7f1a4fe312a88b90dab80f228ab24ef31a7ac3";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sha.js"."~2.3.0" =
     self.by-version."sha.js"."2.3.6";
   by-version."sha.js"."2.3.6" = self.buildNodePackage {
     name = "sha.js-2.3.6";
@@ -34621,8 +37568,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sha.js"."~2.3.0" =
-    self.by-version."sha.js"."2.3.6";
   by-spec."shallow-copy"."0.0.1" =
     self.by-version."shallow-copy"."0.0.1";
   by-version."shallow-copy"."0.0.1" = self.buildNodePackage {
@@ -34663,6 +37608,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."shell-quote"."^1.4.2" =
+    self.by-version."shell-quote"."1.4.3";
+  by-version."shell-quote"."1.4.3" = self.buildNodePackage {
+    name = "shell-quote-1.4.3";
+    version = "1.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz";
+      name = "shell-quote-1.4.3.tgz";
+      sha1 = "952c44e0b1ed9013ef53958179cc643e8777466b";
+    };
+    deps = {
+      "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
+      "array-filter-0.0.1" = self.by-version."array-filter"."0.0.1";
+      "array-reduce-0.0.0" = self.by-version."array-reduce"."0.0.0";
+      "array-map-0.0.0" = self.by-version."array-map"."0.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."shell-quote"."~0.0.1" =
     self.by-version."shell-quote"."0.0.1";
   by-version."shell-quote"."0.0.1" = self.buildNodePackage {
@@ -34682,22 +37650,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."shell-quote"."~1.4.1" =
-    self.by-version."shell-quote"."1.4.2";
-  by-version."shell-quote"."1.4.2" = self.buildNodePackage {
-    name = "shell-quote-1.4.2";
-    version = "1.4.2";
-    bin = false;
+  by-spec."shelljs"."*" =
+    self.by-version."shelljs"."0.4.0";
+  by-version."shelljs"."0.4.0" = self.buildNodePackage {
+    name = "shelljs-0.4.0";
+    version = "0.4.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.2.tgz";
-      name = "shell-quote-1.4.2.tgz";
-      sha1 = "f132a54f2030d69280d370d4974155f85f62f67b";
+      url = "http://registry.npmjs.org/shelljs/-/shelljs-0.4.0.tgz";
+      name = "shelljs-0.4.0.tgz";
+      sha1 = "199fe9e2de379efd03d345ff14062525e4b31ec2";
     };
     deps = {
-      "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
-      "array-filter-0.0.1" = self.by-version."array-filter"."0.0.1";
-      "array-reduce-0.0.0" = self.by-version."array-reduce"."0.0.0";
-      "array-map-0.0.0" = self.by-version."array-map"."0.0.0";
     };
     optionalDependencies = {
     };
@@ -34705,7 +37669,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."shelljs"."*" =
+  "shelljs" = self.by-version."shelljs"."0.4.0";
+  by-spec."shelljs"."0.3.0" =
     self.by-version."shelljs"."0.3.0";
   by-version."shelljs"."0.3.0" = self.buildNodePackage {
     name = "shelljs-0.3.0";
@@ -34724,21 +37689,18 @@
     os = [ ];
     cpu = [ ];
   };
-  "shelljs" = self.by-version."shelljs"."0.3.0";
-  by-spec."shelljs"."0.3.0" =
-    self.by-version."shelljs"."0.3.0";
   by-spec."shelljs"."0.3.x" =
     self.by-version."shelljs"."0.3.0";
   by-spec."should"."*" =
-    self.by-version."should"."5.0.1";
-  by-version."should"."5.0.1" = self.buildNodePackage {
-    name = "should-5.0.1";
-    version = "5.0.1";
+    self.by-version."should"."6.0.1";
+  by-version."should"."6.0.1" = self.buildNodePackage {
+    name = "should-6.0.1";
+    version = "6.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/should/-/should-5.0.1.tgz";
-      name = "should-5.0.1.tgz";
-      sha1 = "f0c593ce78158ace3a41a92cb0cc5cf7772d7fa0";
+      url = "http://registry.npmjs.org/should/-/should-6.0.1.tgz";
+      name = "should-6.0.1.tgz";
+      sha1 = "3d93d1be4a2576797a695bc9335d985b75ff751d";
     };
     deps = {
       "should-equal-0.3.1" = self.by-version."should-equal"."0.3.1";
@@ -34751,7 +37713,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "should" = self.by-version."should"."5.0.1";
+  "should" = self.by-version."should"."6.0.1";
   by-spec."should-equal"."0.3.1" =
     self.by-version."should-equal"."0.3.1";
   by-version."should-equal"."0.3.1" = self.buildNodePackage {
@@ -34873,15 +37835,15 @@
     cpu = [ ];
   };
   by-spec."simple-get"."^1.3.0" =
-    self.by-version."simple-get"."1.3.0";
-  by-version."simple-get"."1.3.0" = self.buildNodePackage {
-    name = "simple-get-1.3.0";
-    version = "1.3.0";
+    self.by-version."simple-get"."1.3.3";
+  by-version."simple-get"."1.3.3" = self.buildNodePackage {
+    name = "simple-get-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simple-get/-/simple-get-1.3.0.tgz";
-      name = "simple-get-1.3.0.tgz";
-      sha1 = "b74582c8ac71cf6e0ece58b152a4eb74a55630ad";
+      url = "http://registry.npmjs.org/simple-get/-/simple-get-1.3.3.tgz";
+      name = "simple-get-1.3.3.tgz";
+      sha1 = "03e4102ff8372034dbc92c2630a78f8440dbf81a";
     };
     deps = {
       "once-1.3.1" = self.by-version."once"."1.3.1";
@@ -34892,6 +37854,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."simple-get"."^1.3.1" =
+    self.by-version."simple-get"."1.3.3";
   by-spec."simple-is"."~0.2.0" =
     self.by-version."simple-is"."0.2.0";
   by-version."simple-is"."0.2.0" = self.buildNodePackage {
@@ -34912,15 +37876,15 @@
     cpu = [ ];
   };
   by-spec."simple-lru-cache"."0.0.x" =
-    self.by-version."simple-lru-cache"."0.0.1";
-  by-version."simple-lru-cache"."0.0.1" = self.buildNodePackage {
-    name = "simple-lru-cache-0.0.1";
-    version = "0.0.1";
+    self.by-version."simple-lru-cache"."0.0.2";
+  by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage {
+    name = "simple-lru-cache-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.1.tgz";
-      name = "simple-lru-cache-0.0.1.tgz";
-      sha1 = "0334171e40ed4a4861ac29250eb1db23300be4f0";
+      url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
+      name = "simple-lru-cache-0.0.2.tgz";
+      sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
     };
     deps = {
     };
@@ -34930,6 +37894,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."simple-sha1"."^2.0.0" =
+    self.by-version."simple-sha1"."2.0.7";
+  by-version."simple-sha1"."2.0.7" = self.buildNodePackage {
+    name = "simple-sha1-2.0.7";
+    version = "2.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.7.tgz";
+      name = "simple-sha1-2.0.7.tgz";
+      sha1 = "765ef3f6a9ef4bf9b734e973cbd63a7a82f887b6";
+    };
+    deps = {
+      "rusha-0.8.2" = self.by-version."rusha"."0.8.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."simplediff"."~0.1.1" =
     self.by-version."simplediff"."0.1.1";
   by-version."simplediff"."0.1.1" = self.buildNodePackage {
@@ -34994,15 +37978,15 @@
     cpu = [ ];
   };
   by-spec."sinon"."*" =
-    self.by-version."sinon"."1.12.2";
-  by-version."sinon"."1.12.2" = self.buildNodePackage {
-    name = "sinon-1.12.2";
-    version = "1.12.2";
+    self.by-version."sinon"."1.14.1";
+  by-version."sinon"."1.14.1" = self.buildNodePackage {
+    name = "sinon-1.14.1";
+    version = "1.14.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sinon/-/sinon-1.12.2.tgz";
-      name = "sinon-1.12.2.tgz";
-      sha1 = "dd893d1f93bfa652ae7c2a08c6eaa42898452c94";
+      url = "http://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz";
+      name = "sinon-1.14.1.tgz";
+      sha1 = "d82797841918734507c94b7a73e3f560904578ad";
     };
     deps = {
       "formatio-1.1.1" = self.by-version."formatio"."1.1.1";
@@ -35015,7 +37999,71 @@
     os = [ ];
     cpu = [ ];
   };
-  "sinon" = self.by-version."sinon"."1.12.2";
+  "sinon" = self.by-version."sinon"."1.14.1";
+  by-spec."sinopia"."*" =
+    self.by-version."sinopia"."1.2.1";
+  by-version."sinopia"."1.2.1" = self.buildNodePackage {
+    name = "sinopia-1.2.1";
+    version = "1.2.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sinopia/-/sinopia-1.2.1.tgz";
+      name = "sinopia-1.2.1.tgz";
+      sha1 = "3469d1b72607e70d213d12caafeefef473bbb231";
+    };
+    deps = {
+      "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1";
+      "express-json5-0.1.0" = self.by-version."express-json5"."0.1.0";
+      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
+      "compression-1.4.3" = self.by-version."compression"."1.4.3";
+      "commander-2.8.0" = self.by-version."commander"."2.8.0";
+      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
+      "cookies-0.5.0" = self.by-version."cookies"."0.5.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "es6-shim-0.21.1" = self.by-version."es6-shim"."0.21.1";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+      "bunyan-1.3.5" = self.by-version."bunyan"."1.3.5";
+      "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0";
+      "highlight.js-8.5.0" = self.by-version."highlight.js"."8.5.0";
+      "lunr-0.5.8" = self.by-version."lunr"."0.5.8";
+      "render-readme-1.3.0" = self.by-version."render-readme"."1.3.0";
+      "jju-1.2.0" = self.by-version."jju"."1.2.0";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "sinopia-htpasswd-0.4.5" = self.by-version."sinopia-htpasswd"."0.4.5";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+    };
+    optionalDependencies = {
+      "fs-ext-0.4.4" = self.by-version."fs-ext"."0.4.4";
+      "crypt3-0.1.8" = self.by-version."crypt3"."0.1.8";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "sinopia" = self.by-version."sinopia"."1.2.1";
+  by-spec."sinopia-htpasswd".">= 0.4.3" =
+    self.by-version."sinopia-htpasswd"."0.4.5";
+  by-version."sinopia-htpasswd"."0.4.5" = self.buildNodePackage {
+    name = "sinopia-htpasswd-0.4.5";
+    version = "0.4.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz";
+      name = "sinopia-htpasswd-0.4.5.tgz";
+      sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+      "crypt3-0.1.8" = self.by-version."crypt3"."0.1.8";
+      "fs-ext-0.4.4" = self.by-version."fs-ext"."0.4.4";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."slasp"."*" =
     self.by-version."slasp"."0.0.4";
   by-version."slasp"."0.0.4" = self.buildNodePackage {
@@ -35050,7 +38098,7 @@
       sha1 = "96d8ef97970ecad464b146ea5e86dd5d6ceb65bc";
     };
     deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -35161,6 +38209,8 @@
     self.by-version."slide"."1.1.6";
   by-spec."slide"."~1.1.3" =
     self.by-version."slide"."1.1.6";
+  by-spec."slide"."~1.1.4" =
+    self.by-version."slide"."1.1.6";
   by-spec."slide"."~1.1.6" =
     self.by-version."slide"."1.1.6";
   by-spec."sloc"."*" =
@@ -35188,27 +38238,27 @@
   };
   "sloc" = self.by-version."sloc"."0.1.9";
   by-spec."smartdc"."*" =
-    self.by-version."smartdc"."7.3.0";
-  by-version."smartdc"."7.3.0" = self.buildNodePackage {
-    name = "smartdc-7.3.0";
-    version = "7.3.0";
+    self.by-version."smartdc"."7.3.1";
+  by-version."smartdc"."7.3.1" = self.buildNodePackage {
+    name = "smartdc-7.3.1";
+    version = "7.3.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.0.tgz";
-      name = "smartdc-7.3.0.tgz";
-      sha1 = "d932196df2d75599fcb98a628803e83c8f9fbe45";
+      url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.1.tgz";
+      name = "smartdc-7.3.1.tgz";
+      sha1 = "c0edc6bd75dc63393d0bbfb8554f0f1136f1689c";
     };
     deps = {
-      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
       "lru-cache-2.2.0" = self.by-version."lru-cache"."2.2.0";
       "nopt-2.0.0" = self.by-version."nopt"."2.0.0";
-      "restify-2.4.1" = self.by-version."restify"."2.4.1";
-      "bunyan-0.21.1" = self.by-version."bunyan"."0.21.1";
+      "restify-2.8.5" = self.by-version."restify"."2.8.5";
+      "bunyan-1.3.4" = self.by-version."bunyan"."1.3.4";
       "clone-0.1.6" = self.by-version."clone"."0.1.6";
-      "smartdc-auth-1.0.1" = self.by-version."smartdc-auth"."1.0.1";
+      "smartdc-auth-1.0.3" = self.by-version."smartdc-auth"."1.0.3";
       "cmdln-1.3.2" = self.by-version."cmdln"."1.3.2";
       "dashdash-1.5.0" = self.by-version."dashdash"."1.5.0";
-      "vasync-1.4.3" = self.by-version."vasync"."1.4.3";
+      "vasync-1.6.2" = self.by-version."vasync"."1.6.2";
     };
     optionalDependencies = {
     };
@@ -35216,24 +38266,24 @@
     os = [ ];
     cpu = [ ];
   };
-  "smartdc" = self.by-version."smartdc"."7.3.0";
-  by-spec."smartdc-auth"."1.0.1" =
-    self.by-version."smartdc-auth"."1.0.1";
-  by-version."smartdc-auth"."1.0.1" = self.buildNodePackage {
-    name = "smartdc-auth-1.0.1";
-    version = "1.0.1";
+  "smartdc" = self.by-version."smartdc"."7.3.1";
+  by-spec."smartdc-auth"."1.0.3" =
+    self.by-version."smartdc-auth"."1.0.3";
+  by-version."smartdc-auth"."1.0.3" = self.buildNodePackage {
+    name = "smartdc-auth-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.1.tgz";
-      name = "smartdc-auth-1.0.1.tgz";
-      sha1 = "520bbf918313bdf2da372927d33756d46356b87b";
+      url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.3.tgz";
+      name = "smartdc-auth-1.0.3.tgz";
+      sha1 = "cc14286b2dc74d0a4e3abb6351e083b40b98c1ad";
     };
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
       "clone-0.1.5" = self.by-version."clone"."0.1.5";
-      "ssh-agent-0.2.1" = self.by-version."ssh-agent"."0.2.1";
-      "once-1.1.1" = self.by-version."once"."1.1.1";
-      "vasync-1.3.3" = self.by-version."vasync"."1.3.3";
+      "ssh-agent-0.2.3" = self.by-version."ssh-agent"."0.2.3";
+      "once-1.3.0" = self.by-version."once"."1.3.0";
+      "vasync-1.4.3" = self.by-version."vasync"."1.4.3";
     };
     optionalDependencies = {
     };
@@ -35242,15 +38292,15 @@
     cpu = [ ];
   };
   by-spec."smtp-connection"."^1.0.0" =
-    self.by-version."smtp-connection"."1.1.0";
-  by-version."smtp-connection"."1.1.0" = self.buildNodePackage {
-    name = "smtp-connection-1.1.0";
-    version = "1.1.0";
+    self.by-version."smtp-connection"."1.2.0";
+  by-version."smtp-connection"."1.2.0" = self.buildNodePackage {
+    name = "smtp-connection-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/smtp-connection/-/smtp-connection-1.1.0.tgz";
-      name = "smtp-connection-1.1.0.tgz";
-      sha1 = "38688174a97bade7040500bf9cd5cf831f4b40f8";
+      url = "http://registry.npmjs.org/smtp-connection/-/smtp-connection-1.2.0.tgz";
+      name = "smtp-connection-1.2.0.tgz";
+      sha1 = "04bf0bcfc4a7417a201595781d2439dddbf0cd19";
     };
     deps = {
     };
@@ -35260,8 +38310,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."smtp-connection"."^1.1.0" =
-    self.by-version."smtp-connection"."1.1.0";
+  by-spec."smtp-connection"."^1.2.0" =
+    self.by-version."smtp-connection"."1.2.0";
   by-spec."sntp"."0.1.x" =
     self.by-version."sntp"."0.1.4";
   by-version."sntp"."0.1.4" = self.buildNodePackage {
@@ -35314,7 +38364,7 @@
       sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
     };
     deps = {
-      "hoek-2.11.0" = self.by-version."hoek"."2.11.0";
+      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
     };
     optionalDependencies = {
     };
@@ -35345,29 +38395,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."socket.io"."0.9.16" =
-    self.by-version."socket.io"."0.9.16";
-  by-version."socket.io"."0.9.16" = self.buildNodePackage {
-    name = "socket.io-0.9.16";
-    version = "0.9.16";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.16.tgz";
-      name = "socket.io-0.9.16.tgz";
-      sha1 = "3bab0444e49b55fbbc157424dbd41aa375a51a76";
-    };
-    deps = {
-      "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16";
-      "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
-      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
-    };
-    optionalDependencies = {
-      "redis-0.7.3" = self.by-version."redis"."0.7.3";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."socket.io"."1.0.6" =
     self.by-version."socket.io"."1.0.6";
   by-version."socket.io"."1.0.6" = self.buildNodePackage {
@@ -35418,6 +38445,31 @@
   };
   by-spec."socket.io"."~0.9.17" =
     self.by-version."socket.io"."0.9.17";
+  by-spec."socket.io"."~1.3.0" =
+    self.by-version."socket.io"."1.3.5";
+  by-version."socket.io"."1.3.5" = self.buildNodePackage {
+    name = "socket.io-1.3.5";
+    version = "1.3.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io/-/socket.io-1.3.5.tgz";
+      name = "socket.io-1.3.5.tgz";
+      sha1 = "bfd609f37626889e94df9d3526db79a84255f1d8";
+    };
+    deps = {
+      "engine.io-1.5.1" = self.by-version."engine.io"."1.5.1";
+      "socket.io-parser-2.2.4" = self.by-version."socket.io-parser"."2.2.4";
+      "socket.io-client-1.3.5" = self.by-version."socket.io-client"."1.3.5";
+      "socket.io-adapter-0.3.1" = self.by-version."socket.io-adapter"."0.3.1";
+      "has-binary-data-0.1.3" = self.by-version."has-binary-data"."0.1.3";
+      "debug-2.1.0" = self.by-version."debug"."2.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."socket.io-adapter"."0.2.0" =
     self.by-version."socket.io-adapter"."0.2.0";
   by-version."socket.io-adapter"."0.2.0" = self.buildNodePackage {
@@ -35439,6 +38491,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."socket.io-adapter"."0.3.1" =
+    self.by-version."socket.io-adapter"."0.3.1";
+  by-version."socket.io-adapter"."0.3.1" = self.buildNodePackage {
+    name = "socket.io-adapter-0.3.1";
+    version = "0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.3.1.tgz";
+      name = "socket.io-adapter-0.3.1.tgz";
+      sha1 = "df81f970b4df6493902d93e519c7b72755c3a958";
+    };
+    deps = {
+      "debug-1.0.2" = self.by-version."debug"."1.0.2";
+      "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2";
+      "object-keys-1.0.1" = self.by-version."object-keys"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."socket.io-client"."0.9.11" =
     self.by-version."socket.io-client"."0.9.11";
   by-version."socket.io-client"."0.9.11" = self.buildNodePackage {
@@ -35514,6 +38588,36 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."socket.io-client"."1.3.5" =
+    self.by-version."socket.io-client"."1.3.5";
+  by-version."socket.io-client"."1.3.5" = self.buildNodePackage {
+    name = "socket.io-client-1.3.5";
+    version = "1.3.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.3.5.tgz";
+      name = "socket.io-client-1.3.5.tgz";
+      sha1 = "9c3a6fbdbd99420c3633a16b4e2543e73f1303ea";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "engine.io-client-1.5.1" = self.by-version."engine.io-client"."1.5.1";
+      "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "object-component-0.0.3" = self.by-version."object-component"."0.0.3";
+      "socket.io-parser-2.2.4" = self.by-version."socket.io-parser"."2.2.4";
+      "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6";
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+      "parseuri-0.0.2" = self.by-version."parseuri"."0.0.2";
+      "to-array-0.1.3" = self.by-version."to-array"."0.1.3";
+      "backo2-1.0.2" = self.by-version."backo2"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."socket.io-parser"."2.1.2" =
     self.by-version."socket.io-parser"."2.1.2";
   by-version."socket.io-parser"."2.1.2" = self.buildNodePackage {
@@ -35560,20 +38664,68 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."socket.io-parser"."2.2.2" =
+    self.by-version."socket.io-parser"."2.2.2";
+  by-version."socket.io-parser"."2.2.2" = self.buildNodePackage {
+    name = "socket.io-parser-2.2.2";
+    version = "2.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
+      name = "socket.io-parser-2.2.2.tgz";
+      sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "json3-3.2.6" = self.by-version."json3"."3.2.6";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-parser"."2.2.4" =
+    self.by-version."socket.io-parser"."2.2.4";
+  by-version."socket.io-parser"."2.2.4" = self.buildNodePackage {
+    name = "socket.io-parser-2.2.4";
+    version = "2.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.4.tgz";
+      name = "socket.io-parser-2.2.4.tgz";
+      sha1 = "f9ce19bf1909608ceb15d97721e23bfdd1e7cf65";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "json3-3.2.6" = self.by-version."json3"."3.2.6";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sockjs"."*" =
-    self.by-version."sockjs"."0.3.12";
-  by-version."sockjs"."0.3.12" = self.buildNodePackage {
-    name = "sockjs-0.3.12";
-    version = "0.3.12";
+    self.by-version."sockjs"."0.3.15";
+  by-version."sockjs"."0.3.15" = self.buildNodePackage {
+    name = "sockjs-0.3.15";
+    version = "0.3.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.12.tgz";
-      name = "sockjs-0.3.12.tgz";
-      sha1 = "99f5686851cf8655706da977f56ccd266dded859";
+      url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.15.tgz";
+      name = "sockjs-0.3.15.tgz";
+      sha1 = "e19b577e59e0fbdb21a0ae4f46203ca24cad8db8";
     };
     deps = {
-      "faye-websocket-0.9.3" = self.by-version."faye-websocket"."0.9.3";
-      "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2";
+      "faye-websocket-0.9.4" = self.by-version."faye-websocket"."0.9.4";
+      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
     };
     optionalDependencies = {
     };
@@ -35581,7 +38733,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "sockjs" = self.by-version."sockjs"."0.3.12";
+  "sockjs" = self.by-version."sockjs"."0.3.15";
   by-spec."socks-proxy-agent"."0" =
     self.by-version."socks-proxy-agent"."0.1.2";
   by-version."socks-proxy-agent"."0.1.2" = self.buildNodePackage {
@@ -35623,16 +38775,55 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sorted-union-stream"."^1.0.1" =
+    self.by-version."sorted-union-stream"."1.0.2";
+  by-version."sorted-union-stream"."1.0.2" = self.buildNodePackage {
+    name = "sorted-union-stream-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-1.0.2.tgz";
+      name = "sorted-union-stream-1.0.2.tgz";
+      sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006";
+    };
+    deps = {
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-list-map"."~0.1.0" =
+    self.by-version."source-list-map"."0.1.5";
+  by-version."source-list-map"."0.1.5" = self.buildNodePackage {
+    name = "source-list-map-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz";
+      name = "source-list-map-0.1.5.tgz";
+      sha1 = "ddf32f5173faeca3010561dd7e9a682c027f459e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.3.0";
-  by-version."source-map"."0.3.0" = self.buildNodePackage {
-    name = "source-map-0.3.0";
-    version = "0.3.0";
+    self.by-version."source-map"."0.4.2";
+  by-version."source-map"."0.4.2" = self.buildNodePackage {
+    name = "source-map-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
-      name = "source-map-0.3.0.tgz";
-      sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz";
+      name = "source-map-0.4.2.tgz";
+      sha1 = "dc9f3114394ab7c1f9782972f3d11820fff06f1f";
     };
     deps = {
       "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
@@ -35643,7 +38834,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "source-map" = self.by-version."source-map"."0.3.0";
+  "source-map" = self.by-version."source-map"."0.4.2";
   by-spec."source-map"."0.1.31" =
     self.by-version."source-map"."0.1.31";
   by-version."source-map"."0.1.31" = self.buildNodePackage {
@@ -35704,9 +38895,11 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."source-map"."0.4.x" =
+    self.by-version."source-map"."0.4.2";
   by-spec."source-map".">= 0.1.2" =
-    self.by-version."source-map"."0.3.0";
-  by-spec."source-map".">=0.1.43 <0.2" =
+    self.by-version."source-map"."0.4.2";
+  by-spec."source-map"."^0.1.40" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map"."^0.2.0" =
     self.by-version."source-map"."0.2.0";
@@ -35728,28 +38921,48 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."source-map"."^0.4.2" =
+    self.by-version."source-map"."0.4.2";
   by-spec."source-map"."~0.1.31" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.1.33" =
     self.by-version."source-map"."0.1.43";
-  by-spec."source-map"."~0.1.38" =
-    self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.1.40" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.1.7" =
     self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.3.0" =
     self.by-version."source-map"."0.3.0";
-  by-spec."spdy"."1.7.1" =
-    self.by-version."spdy"."1.7.1";
-  by-version."spdy"."1.7.1" = self.buildNodePackage {
-    name = "spdy-1.7.1";
-    version = "1.7.1";
+  by-version."source-map"."0.3.0" = self.buildNodePackage {
+    name = "source-map-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
+      name = "source-map-0.3.0.tgz";
+      sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
+    };
+    deps = {
+      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."~0.4.1" =
+    self.by-version."source-map"."0.4.2";
+  by-spec."spdy"."^1.26.5" =
+    self.by-version."spdy"."1.32.0";
+  by-version."spdy"."1.32.0" = self.buildNodePackage {
+    name = "spdy-1.32.0";
+    version = "1.32.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/spdy/-/spdy-1.7.1.tgz";
-      name = "spdy-1.7.1.tgz";
-      sha1 = "4fde77e602b20c4ecc39ee8619373dd9bf669152";
+      url = "http://registry.npmjs.org/spdy/-/spdy-1.32.0.tgz";
+      name = "spdy-1.32.0.tgz";
+      sha1 = "3cd51f08734d441ef7122456638945a19ef18d3f";
     };
     deps = {
     };
@@ -35778,6 +38991,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."split2"."^0.2.1" =
+    self.by-version."split2"."0.2.1";
+  by-version."split2"."0.2.1" = self.buildNodePackage {
+    name = "split2-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/split2/-/split2-0.2.1.tgz";
+      name = "split2-0.2.1.tgz";
+      sha1 = "02ddac9adc03ec0bb78c1282ec079ca6e85ae900";
+    };
+    deps = {
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sprintf"."0.1.1" =
     self.by-version."sprintf"."0.1.1";
   by-version."sprintf"."0.1.1" = self.buildNodePackage {
@@ -35860,20 +39093,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ssh-agent"."0.2.1" =
-    self.by-version."ssh-agent"."0.2.1";
-  by-version."ssh-agent"."0.2.1" = self.buildNodePackage {
-    name = "ssh-agent-0.2.1";
-    version = "0.2.1";
+  by-spec."ssh-agent"."0.2.3" =
+    self.by-version."ssh-agent"."0.2.3";
+  by-version."ssh-agent"."0.2.3" = self.buildNodePackage {
+    name = "ssh-agent-0.2.3";
+    version = "0.2.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.1.tgz";
-      name = "ssh-agent-0.2.1.tgz";
-      sha1 = "3044e9eaeca88a9e6971dd7deb19bdcc20012929";
+      url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.3.tgz";
+      name = "ssh-agent-0.2.3.tgz";
+      sha1 = "74ac9ffad6b7eca3c1674686b5613824243f86a9";
     };
     deps = {
-      "ctype-0.5.0" = self.by-version."ctype"."0.5.0";
-      "posix-getopt-1.0.0" = self.by-version."posix-getopt"."1.0.0";
+      "ctype-0.5.4" = self.by-version."ctype"."0.5.4";
+      "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -35882,19 +39115,19 @@
     cpu = [ ];
   };
   by-spec."ssl-root-cas"."^1.1.7" =
-    self.by-version."ssl-root-cas"."1.1.7";
-  by-version."ssl-root-cas"."1.1.7" = self.buildNodePackage {
-    name = "ssl-root-cas-1.1.7";
-    version = "1.1.7";
+    self.by-version."ssl-root-cas"."1.1.10";
+  by-version."ssl-root-cas"."1.1.10" = self.buildNodePackage {
+    name = "ssl-root-cas-1.1.10";
+    version = "1.1.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.7.tgz";
-      name = "ssl-root-cas-1.1.7.tgz";
-      sha1 = "bb40ea00cf92dd5d80b3f92979348f7b56b2b5a4";
+      url = "http://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.10.tgz";
+      name = "ssl-root-cas-1.1.10.tgz";
+      sha1 = "00b238105568f60b1bb98621e52f94efb7b7acad";
     };
     deps = {
-      "es6-promise-1.0.0" = self.by-version."es6-promise"."1.0.0";
-      "request-2.34.0" = self.by-version."request"."2.34.0";
+      "es6-promise-2.1.0" = self.by-version."es6-promise"."2.1.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -35998,22 +39231,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."statsd"."*" =
+  by-spec."statsd"."https://github.com/etsy/statsd/tarball/23b331895cc4b22b64a19fd0e7b6def6f6f30d9e" =
     self.by-version."statsd"."0.7.2";
   by-version."statsd"."0.7.2" = self.buildNodePackage {
     name = "statsd-0.7.2";
     version = "0.7.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/statsd/-/statsd-0.7.2.tgz";
+      url = "https://github.com/etsy/statsd/tarball/23b331895cc4b22b64a19fd0e7b6def6f6f30d9e";
       name = "statsd-0.7.2.tgz";
-      sha1 = "88901c5f30fa51da5fa3520468c94d7992ef576e";
+      sha256 = "ddfbd70fb5f54281cd1cb4b339ebdb16bde8a657c4876d477396275f8cf05670";
     };
     deps = {
     };
     optionalDependencies = {
       "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
-      "hashring-1.0.1" = self.by-version."hashring"."1.0.1";
+      "hashring-3.1.0" = self.by-version."hashring"."3.1.0";
       "winser-0.1.6" = self.by-version."winser"."0.1.6";
     };
     peerDependencies = [];
@@ -36022,15 +39255,15 @@
   };
   "statsd" = self.by-version."statsd"."0.7.2";
   by-spec."statsd-influxdb-backend"."*" =
-    self.by-version."statsd-influxdb-backend"."0.4.0";
-  by-version."statsd-influxdb-backend"."0.4.0" = self.buildNodePackage {
-    name = "statsd-influxdb-backend-0.4.0";
-    version = "0.4.0";
+    self.by-version."statsd-influxdb-backend"."0.5.0";
+  by-version."statsd-influxdb-backend"."0.5.0" = self.buildNodePackage {
+    name = "statsd-influxdb-backend-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.4.0.tgz";
-      name = "statsd-influxdb-backend-0.4.0.tgz";
-      sha1 = "8595b6ef21a5932508bb265f366efca6ebde54d5";
+      url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.5.0.tgz";
+      name = "statsd-influxdb-backend-0.5.0.tgz";
+      sha1 = "7e62819f5c2e0438e9225b231478d776f1c2e461";
     };
     deps = {
     };
@@ -36040,7 +39273,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.4.0";
+  "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.5.0";
   by-spec."statsd-librato-backend"."*" =
     self.by-version."statsd-librato-backend"."0.1.6";
   by-version."statsd-librato-backend"."0.1.6" = self.buildNodePackage {
@@ -36124,6 +39357,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stream-collector"."^1.0.1" =
+    self.by-version."stream-collector"."1.0.1";
+  by-version."stream-collector"."1.0.1" = self.buildNodePackage {
+    name = "stream-collector-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz";
+      name = "stream-collector-1.0.1.tgz";
+      sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15";
+    };
+    deps = {
+      "once-1.3.1" = self.by-version."once"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."stream-combiner"."~0.0.2" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = self.buildNodePackage {
@@ -36223,6 +39476,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stream-events"."^1.0.1" =
+    self.by-version."stream-events"."1.0.1";
+  by-version."stream-events"."1.0.1" = self.buildNodePackage {
+    name = "stream-events-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-events/-/stream-events-1.0.1.tgz";
+      name = "stream-events-1.0.1.tgz";
+      sha1 = "4fe7b2bbfcc53e6af31087e8c540483f412ce8c6";
+    };
+    deps = {
+      "stubs-1.1.2" = self.by-version."stubs"."1.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."stream-splicer"."^1.1.0" =
     self.by-version."stream-splicer"."1.3.1";
   by-version."stream-splicer"."1.3.1" = self.buildNodePackage {
@@ -36286,6 +39559,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stream-transform"."*" =
+    self.by-version."stream-transform"."0.0.7";
+  by-version."stream-transform"."0.0.7" = self.buildNodePackage {
+    name = "stream-transform-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stream-transform/-/stream-transform-0.0.7.tgz";
+      name = "stream-transform-0.0.7.tgz";
+      sha1 = "f7f1dd009de4db7eb772f116b33341003d461907";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."streamsearch"."0.1.2" =
     self.by-version."streamsearch"."0.1.2";
   by-version."streamsearch"."0.1.2" = self.buildNodePackage {
@@ -36324,26 +39616,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."string-length"."^0.1.2" =
-    self.by-version."string-length"."0.1.2";
-  by-version."string-length"."0.1.2" = self.buildNodePackage {
-    name = "string-length-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz";
-      name = "string-length-0.1.2.tgz";
-      sha1 = "ab04bb33867ee74beed7fb89bb7f089d392780f2";
-    };
-    deps = {
-      "strip-ansi-0.2.2" = self.by-version."strip-ansi"."0.2.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."string-length"."^1.0.0" =
     self.by-version."string-length"."1.0.0";
   by-version."string-length"."1.0.0" = self.buildNodePackage {
@@ -36396,8 +39668,8 @@
       sha1 = "a560cd737415e380f2518b83c38bb97093e981af";
     };
     deps = {
-      "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0";
-      "ipaddr.js-0.1.8" = self.by-version."ipaddr.js"."0.1.8";
+      "addr-to-ip-port-1.4.1" = self.by-version."addr-to-ip-port"."1.4.1";
+      "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9";
     };
     optionalDependencies = {
     };
@@ -36447,16 +39719,16 @@
     self.by-version."string_decoder"."0.10.31";
   by-spec."string_decoder"."~0.10.x" =
     self.by-version."string_decoder"."0.10.31";
-  by-spec."stringify-object"."~1.0.0" =
-    self.by-version."stringify-object"."1.0.0";
-  by-version."stringify-object"."1.0.0" = self.buildNodePackage {
-    name = "stringify-object-1.0.0";
-    version = "1.0.0";
+  by-spec."stringify-object"."^1.0.0" =
+    self.by-version."stringify-object"."1.0.1";
+  by-version."stringify-object"."1.0.1" = self.buildNodePackage {
+    name = "stringify-object-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stringify-object/-/stringify-object-1.0.0.tgz";
-      name = "stringify-object-1.0.0.tgz";
-      sha1 = "333875ef8fd210f696d70b374146be84646bc346";
+      url = "http://registry.npmjs.org/stringify-object/-/stringify-object-1.0.1.tgz";
+      name = "stringify-object-1.0.1.tgz";
+      sha1 = "86d35e7dbfbce9aa45637d7ecdd7847e159db8a2";
     };
     deps = {
     };
@@ -36523,26 +39795,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."strip-ansi"."^0.2.1" =
-    self.by-version."strip-ansi"."0.2.2";
-  by-version."strip-ansi"."0.2.2" = self.buildNodePackage {
-    name = "strip-ansi-0.2.2";
-    version = "0.2.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz";
-      name = "strip-ansi-0.2.2.tgz";
-      sha1 = "854d290c981525fc8c397a910b025ae2d54ffc08";
-    };
-    deps = {
-      "ansi-regex-0.1.0" = self.by-version."ansi-regex"."0.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."strip-ansi"."^0.3.0" =
     self.by-version."strip-ansi"."0.3.0";
   by-version."strip-ansi"."0.3.0" = self.buildNodePackage {
@@ -36563,26 +39815,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."strip-ansi"."^1.0.0" =
-    self.by-version."strip-ansi"."1.0.0";
-  by-version."strip-ansi"."1.0.0" = self.buildNodePackage {
-    name = "strip-ansi-1.0.0";
-    version = "1.0.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz";
-      name = "strip-ansi-1.0.0.tgz";
-      sha1 = "6c021321d6ece161a3c608fbab268c7328901c73";
-    };
-    deps = {
-      "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."strip-ansi"."^2.0.0" =
     self.by-version."strip-ansi"."2.0.1";
   by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
@@ -36605,6 +39837,8 @@
   };
   by-spec."strip-ansi"."^2.0.1" =
     self.by-version."strip-ansi"."2.0.1";
+  by-spec."strip-ansi"."~2.0.1" =
+    self.by-version."strip-ansi"."2.0.1";
   by-spec."strip-bom"."^1.0.0" =
     self.by-version."strip-bom"."1.0.0";
   by-version."strip-bom"."1.0.0" = self.buildNodePackage {
@@ -36684,6 +39918,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stubs"."^1.1.0" =
+    self.by-version."stubs"."1.1.2";
+  by-version."stubs"."1.1.2" = self.buildNodePackage {
+    name = "stubs-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/stubs/-/stubs-1.1.2.tgz";
+      name = "stubs-1.1.2.tgz";
+      sha1 = "945a08975016318762f8f7060731002ab2a0960c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."stylus"."*" =
     self.by-version."stylus"."0.50.0";
   by-version."stylus"."0.50.0" = self.buildNodePackage {
@@ -36698,7 +39951,7 @@
     deps = {
       "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "sax-0.5.8" = self.by-version."sax"."0.5.8";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
@@ -36724,7 +39977,7 @@
     deps = {
       "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "sax-0.5.8" = self.by-version."sax"."0.5.8";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
     };
@@ -36748,7 +40001,7 @@
     deps = {
       "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "sax-0.5.8" = self.by-version."sax"."0.5.8";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
@@ -36791,7 +40044,7 @@
       sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
     };
     deps = {
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -36836,7 +40089,7 @@
       "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
       "methods-1.0.1" = self.by-version."methods"."1.0.1";
       "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1";
-      "debug-2.1.1" = self.by-version."debug"."2.1.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
       "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
       "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
@@ -36848,6 +40101,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."superagent"."^0.21.0" =
+    self.by-version."superagent"."0.21.0";
   by-spec."superagent"."~0.21.0" =
     self.by-version."superagent"."0.21.0";
   by-spec."supertest"."*" =
@@ -36872,16 +40127,16 @@
     cpu = [ ];
   };
   "supertest" = self.by-version."supertest"."0.15.0";
-  by-spec."supports-color"."1.2.x" =
-    self.by-version."supports-color"."1.2.1";
-  by-version."supports-color"."1.2.1" = self.buildNodePackage {
-    name = "supports-color-1.2.1";
-    version = "1.2.1";
+  by-spec."supports-color"."1.3.x" =
+    self.by-version."supports-color"."1.3.1";
+  by-version."supports-color"."1.3.1" = self.buildNodePackage {
+    name = "supports-color-1.3.1";
+    version = "1.3.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz";
-      name = "supports-color-1.2.1.tgz";
-      sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2";
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
+      name = "supports-color-1.3.1.tgz";
+      sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
     };
     deps = {
     };
@@ -36910,6 +40165,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."supports-color"."^1.2.0" =
+    self.by-version."supports-color"."1.3.1";
+  by-spec."supports-color"."^1.3.0" =
+    self.by-version."supports-color"."1.3.1";
+  by-spec."supports-color"."~1.2.0" =
+    self.by-version."supports-color"."1.2.1";
+  by-version."supports-color"."1.2.1" = self.buildNodePackage {
+    name = "supports-color-1.2.1";
+    version = "1.2.1";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz";
+      name = "supports-color-1.2.1.tgz";
+      sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = self.buildNodePackage {
@@ -36922,7 +40200,7 @@
       sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
     };
     deps = {
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
     };
     optionalDependencies = {
     };
@@ -37060,15 +40338,15 @@
     cpu = [ ];
   };
   by-spec."tapable"."^0.1.8" =
-    self.by-version."tapable"."0.1.8";
-  by-version."tapable"."0.1.8" = self.buildNodePackage {
-    name = "tapable-0.1.8";
-    version = "0.1.8";
+    self.by-version."tapable"."0.1.9";
+  by-version."tapable"."0.1.9" = self.buildNodePackage {
+    name = "tapable-0.1.9";
+    version = "0.1.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tapable/-/tapable-0.1.8.tgz";
-      name = "tapable-0.1.8.tgz";
-      sha1 = "a943314bc86ac87602c93fbc8ac609dcb19c199e";
+      url = "http://registry.npmjs.org/tapable/-/tapable-0.1.9.tgz";
+      name = "tapable-0.1.9.tgz";
+      sha1 = "1003d9499c344ba238cb32329c8d2c8babc92e54";
     };
     deps = {
     };
@@ -37079,7 +40357,33 @@
     cpu = [ ];
   };
   by-spec."tapable"."~0.1.8" =
-    self.by-version."tapable"."0.1.8";
+    self.by-version."tapable"."0.1.9";
+  by-spec."tape"."^3.5.0" =
+    self.by-version."tape"."3.5.0";
+  by-version."tape"."3.5.0" = self.buildNodePackage {
+    name = "tape-3.5.0";
+    version = "3.5.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tape/-/tape-3.5.0.tgz";
+      name = "tape-3.5.0.tgz";
+      sha1 = "aebb061388104ad0cb407be842782049d64624f8";
+    };
+    deps = {
+      "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
+      "defined-0.0.0" = self.by-version."defined"."0.0.0";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "object-inspect-0.4.0" = self.by-version."object-inspect"."0.4.0";
+      "resumer-0.0.0" = self.by-version."resumer"."0.0.0";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."tape"."~0.2.2" =
     self.by-version."tape"."0.2.2";
   by-version."tape"."0.2.2" = self.buildNodePackage {
@@ -37103,15 +40407,15 @@
     cpu = [ ];
   };
   by-spec."tar"."*" =
-    self.by-version."tar"."1.0.3";
-  by-version."tar"."1.0.3" = self.buildNodePackage {
-    name = "tar-1.0.3";
-    version = "1.0.3";
+    self.by-version."tar"."2.1.0";
+  by-version."tar"."2.1.0" = self.buildNodePackage {
+    name = "tar-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
-      name = "tar-1.0.3.tgz";
-      sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44";
+      url = "http://registry.npmjs.org/tar/-/tar-2.1.0.tgz";
+      name = "tar-2.1.0.tgz";
+      sha1 = "d287aad12e947c766e319ac364f3c234900f65ec";
     };
     deps = {
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
@@ -37124,7 +40428,29 @@
     os = [ ];
     cpu = [ ];
   };
-  "tar" = self.by-version."tar"."1.0.3";
+  "tar" = self.by-version."tar"."2.1.0";
+  by-spec."tar"."0" =
+    self.by-version."tar"."0.1.20";
+  by-version."tar"."0.1.20" = self.buildNodePackage {
+    name = "tar-0.1.20";
+    version = "0.1.20";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
+      name = "tar-0.1.20.tgz";
+      sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+    };
+    deps = {
+      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
+      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
   by-version."tar"."0.1.17" = self.buildNodePackage {
@@ -37171,20 +40497,18 @@
   };
   by-spec."tar"."^1.0.0" =
     self.by-version."tar"."1.0.3";
-  by-spec."tar"."~0.1.17" =
-    self.by-version."tar"."0.1.20";
-  by-version."tar"."0.1.20" = self.buildNodePackage {
-    name = "tar-0.1.20";
-    version = "0.1.20";
+  by-version."tar"."1.0.3" = self.buildNodePackage {
+    name = "tar-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
-      name = "tar-0.1.20.tgz";
-      sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+      url = "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
+      name = "tar-1.0.3.tgz";
+      sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44";
     };
     deps = {
       "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -37193,27 +40517,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."tar"."~0.1.17" =
+    self.by-version."tar"."0.1.20";
   by-spec."tar"."~1.0.1" =
     self.by-version."tar"."1.0.3";
   by-spec."tar"."~1.0.2" =
     self.by-version."tar"."1.0.3";
-  by-spec."tar"."~1.0.3" =
-    self.by-version."tar"."1.0.3";
-  by-spec."tar-fs"."0.5.2" =
-    self.by-version."tar-fs"."0.5.2";
-  by-version."tar-fs"."0.5.2" = self.buildNodePackage {
-    name = "tar-fs-0.5.2";
-    version = "0.5.2";
+  by-spec."tar"."~2.1.0" =
+    self.by-version."tar"."2.1.0";
+  by-spec."tar-fs"."^1.4.1" =
+    self.by-version."tar-fs"."1.5.0";
+  by-version."tar-fs"."1.5.0" = self.buildNodePackage {
+    name = "tar-fs-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz";
-      name = "tar-fs-0.5.2.tgz";
-      sha1 = "0f59424be7eeee45232316e302f66d3f6ea6db3e";
+      url = "http://registry.npmjs.org/tar-fs/-/tar-fs-1.5.0.tgz";
+      name = "tar-fs-1.5.0.tgz";
+      sha1 = "461da12f3a756adcfe781afbc0c13694d9c5d613";
     };
     deps = {
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "pump-0.3.5" = self.by-version."pump"."0.3.5";
-      "tar-stream-0.4.7" = self.by-version."tar-stream"."0.4.7";
+      "pump-1.0.0" = self.by-version."pump"."1.0.0";
+      "tar-stream-1.1.4" = self.by-version."tar-stream"."1.1.4";
     };
     optionalDependencies = {
     };
@@ -37249,21 +40575,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tar-stream"."^0.4.6" =
-    self.by-version."tar-stream"."0.4.7";
-  by-version."tar-stream"."0.4.7" = self.buildNodePackage {
-    name = "tar-stream-0.4.7";
-    version = "0.4.7";
+  by-spec."tar-stream"."^1.0.0" =
+    self.by-version."tar-stream"."1.1.4";
+  by-version."tar-stream"."1.1.4" = self.buildNodePackage {
+    name = "tar-stream-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz";
-      name = "tar-stream-0.4.7.tgz";
-      sha1 = "1f1d2ce9ebc7b42765243ca0e8f1b7bfda0aadcd";
+      url = "http://registry.npmjs.org/tar-stream/-/tar-stream-1.1.4.tgz";
+      name = "tar-stream-1.1.4.tgz";
+      sha1 = "e6c3ffc4305f7d537b6ec697823dd86e4d61ca63";
     };
     deps = {
       "bl-0.9.4" = self.by-version."bl"."0.9.4";
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
     };
     optionalDependencies = {
@@ -37272,6 +40598,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."tar-stream"."^1.1.2" =
+    self.by-version."tar-stream"."1.1.4";
   by-spec."tar-stream"."~1.0.0" =
     self.by-version."tar-stream"."1.0.2";
   by-version."tar-stream"."1.0.2" = self.buildNodePackage {
@@ -37424,7 +40752,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."thirty-two"."~0.0.1" =
+  by-spec."thirty-two"."^0.0.2" =
     self.by-version."thirty-two"."0.0.2";
   by-version."thirty-two"."0.0.2" = self.buildNodePackage {
     name = "thirty-two-0.0.2";
@@ -37443,6 +40771,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."thirty-two"."~0.0.1" =
+    self.by-version."thirty-two"."0.0.2";
   by-spec."throttleit"."~0.0.2" =
     self.by-version."throttleit"."0.0.2";
   by-version."throttleit"."0.0.2" = self.buildNodePackage {
@@ -37482,15 +40812,15 @@
     cpu = [ ];
   };
   by-spec."through".">=2.2.7 <3" =
-    self.by-version."through"."2.3.6";
-  by-version."through"."2.3.6" = self.buildNodePackage {
-    name = "through-2.3.6";
-    version = "2.3.6";
+    self.by-version."through"."2.3.7";
+  by-version."through"."2.3.7" = self.buildNodePackage {
+    name = "through-2.3.7";
+    version = "2.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/through/-/through-2.3.6.tgz";
-      name = "through-2.3.6.tgz";
-      sha1 = "26681c0f524671021d4e29df7c36bce2d0ecf2e8";
+      url = "http://registry.npmjs.org/through/-/through-2.3.7.tgz";
+      name = "through-2.3.7.tgz";
+      sha1 = "5fcc3690fed2fdf98c6fc88b4d207a4624ac3b87";
     };
     deps = {
     };
@@ -37500,6 +40830,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."through"."^2.3.6" =
+    self.by-version."through"."2.3.7";
   by-spec."through"."~2.2.0" =
     self.by-version."through"."2.2.7";
   by-version."through"."2.2.7" = self.buildNodePackage {
@@ -37522,9 +40854,9 @@
   by-spec."through"."~2.2.7" =
     self.by-version."through"."2.2.7";
   by-spec."through"."~2.3.4" =
-    self.by-version."through"."2.3.6";
+    self.by-version."through"."2.3.7";
   by-spec."through"."~2.3.6" =
-    self.by-version."through"."2.3.6";
+    self.by-version."through"."2.3.7";
   by-spec."through2"."0.6.3" =
     self.by-version."through2"."0.6.3";
   by-version."through2"."0.6.3" = self.buildNodePackage {
@@ -37546,10 +40878,33 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."through2"."0.6.x" =
+    self.by-version."through2"."0.6.5";
+  by-version."through2"."0.6.5" = self.buildNodePackage {
+    name = "through2-0.6.5";
+    version = "0.6.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz";
+      name = "through2-0.6.5.tgz";
+      sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48";
+    };
+    deps = {
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."through2"."^0.6.1" =
-    self.by-version."through2"."0.6.3";
+    self.by-version."through2"."0.6.5";
+  by-spec."through2"."^0.6.2" =
+    self.by-version."through2"."0.6.5";
   by-spec."through2"."^0.6.3" =
-    self.by-version."through2"."0.6.3";
+    self.by-version."through2"."0.6.5";
   by-spec."through2"."^1.0.0" =
     self.by-version."through2"."1.1.1";
   by-version."through2"."1.1.1" = self.buildNodePackage {
@@ -37613,6 +40968,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."through2"."~0.6.1" =
+    self.by-version."through2"."0.6.5";
+  by-spec."through2"."~0.6.3" =
+    self.by-version."through2"."0.6.5";
   by-spec."thunkify"."~2.1.1" =
     self.by-version."thunkify"."2.1.2";
   by-version."thunkify"."2.1.2" = self.buildNodePackage {
@@ -37674,20 +41033,20 @@
     cpu = [ ];
   };
   by-spec."time".">=0.9.2" =
-    self.by-version."time"."0.11.1";
-  by-version."time"."0.11.1" = self.buildNodePackage {
-    name = "time-0.11.1";
-    version = "0.11.1";
+    self.by-version."time"."0.11.2";
+  by-version."time"."0.11.2" = self.buildNodePackage {
+    name = "time-0.11.2";
+    version = "0.11.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/time/-/time-0.11.1.tgz";
-      name = "time-0.11.1.tgz";
-      sha1 = "acfc8e922a73e3b21a645928cc4061738929edf2";
+      url = "http://registry.npmjs.org/time/-/time-0.11.2.tgz";
+      name = "time-0.11.2.tgz";
+      sha1 = "6fb23a1df2267db88366fc640f894f33f10424d4";
     };
     deps = {
       "bindings-1.2.0" = self.by-version."bindings"."1.2.0";
-      "debug-0.8.1" = self.by-version."debug"."0.8.1";
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -37734,18 +41093,18 @@
     cpu = [ ];
   };
   by-spec."timers-browserify"."^1.0.1" =
-    self.by-version."timers-browserify"."1.3.0";
-  by-version."timers-browserify"."1.3.0" = self.buildNodePackage {
-    name = "timers-browserify-1.3.0";
-    version = "1.3.0";
+    self.by-version."timers-browserify"."1.4.0";
+  by-version."timers-browserify"."1.4.0" = self.buildNodePackage {
+    name = "timers-browserify-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.3.0.tgz";
-      name = "timers-browserify-1.3.0.tgz";
-      sha1 = "c518e6ba39f19619e6ae464e447b1511e172e96f";
+      url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.0.tgz";
+      name = "timers-browserify-1.4.0.tgz";
+      sha1 = "6b424b07688cd1978c2a3333ee618c46036d6ddb";
     };
     deps = {
-      "process-0.10.0" = self.by-version."process"."0.10.0";
+      "process-0.10.1" = self.by-version."process"."0.10.1";
     };
     optionalDependencies = {
     };
@@ -37794,8 +41153,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."timers-ext"."0.1.x" =
-    self.by-version."timers-ext"."0.1.0";
   by-spec."timespan"."2.x.x" =
     self.by-version."timespan"."2.3.0";
   by-version."timespan"."2.3.0" = self.buildNodePackage {
@@ -37818,15 +41175,15 @@
   by-spec."timespan"."~2.3.0" =
     self.by-version."timespan"."2.3.0";
   by-spec."timezone"."*" =
-    self.by-version."timezone"."0.0.39";
-  by-version."timezone"."0.0.39" = self.buildNodePackage {
-    name = "timezone-0.0.39";
-    version = "0.0.39";
+    self.by-version."timezone"."0.0.41";
+  by-version."timezone"."0.0.41" = self.buildNodePackage {
+    name = "timezone-0.0.41";
+    version = "0.0.41";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/timezone/-/timezone-0.0.39.tgz";
-      name = "timezone-0.0.39.tgz";
-      sha1 = "6322fafeac82fd96b907cc93cc0148a1082ff733";
+      url = "http://registry.npmjs.org/timezone/-/timezone-0.0.41.tgz";
+      name = "timezone-0.0.41.tgz";
+      sha1 = "e32c7eb54932e29949d44e4e7ca91199cb345c0a";
     };
     deps = {
     };
@@ -37836,7 +41193,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "timezone" = self.by-version."timezone"."0.0.39";
+  "timezone" = self.by-version."timezone"."0.0.41";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = self.buildNodePackage {
@@ -37857,15 +41214,15 @@
     cpu = [ ];
   };
   by-spec."titanium"."*" =
-    self.by-version."titanium"."3.4.2-alpha";
-  by-version."titanium"."3.4.2-alpha" = self.buildNodePackage {
-    name = "titanium-3.4.2-alpha";
-    version = "3.4.2-alpha";
+    self.by-version."titanium"."4.0.0-beta7";
+  by-version."titanium"."4.0.0-beta7" = self.buildNodePackage {
+    name = "titanium-4.0.0-beta7";
+    version = "4.0.0-beta7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/titanium/-/titanium-3.4.2-alpha.tgz";
-      name = "titanium-3.4.2-alpha.tgz";
-      sha1 = "bea444d0e5d3476e09493ea617755c12a0bb474b";
+      url = "http://registry.npmjs.org/titanium/-/titanium-4.0.0-beta7.tgz";
+      name = "titanium-4.0.0-beta7.tgz";
+      sha1 = "966a1eb3170fe377e1144d7b93e4e4b9bb4a9848";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
@@ -37875,7 +41232,7 @@
       "jade-0.35.0" = self.by-version."jade"."0.35.0";
       "longjohn-0.2.4" = self.by-version."longjohn"."0.2.4";
       "moment-2.4.0" = self.by-version."moment"."2.4.0";
-      "node-appc-0.2.24" = self.by-version."node-appc"."0.2.24";
+      "node-appc-0.2.26" = self.by-version."node-appc"."0.2.26";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "request-2.27.0" = self.by-version."request"."2.27.0";
       "semver-2.2.1" = self.by-version."semver"."2.2.1";
@@ -37890,7 +41247,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "titanium" = self.by-version."titanium"."3.4.2-alpha";
+  "titanium" = self.by-version."titanium"."4.0.0-beta7";
   by-spec."tldtools"."0.0.19" =
     self.by-version."tldtools"."0.0.19";
   by-version."tldtools"."0.0.19" = self.buildNodePackage {
@@ -37903,7 +41260,7 @@
       sha1 = "1df2277a43e291fd0a929c0e096a0a0917d75b1b";
     };
     deps = {
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -37912,18 +41269,18 @@
     cpu = [ ];
   };
   by-spec."tldtools".">=0.0.19" =
-    self.by-version."tldtools"."0.0.23";
-  by-version."tldtools"."0.0.23" = self.buildNodePackage {
-    name = "tldtools-0.0.23";
-    version = "0.0.23";
+    self.by-version."tldtools"."0.0.24";
+  by-version."tldtools"."0.0.24" = self.buildNodePackage {
+    name = "tldtools-0.0.24";
+    version = "0.0.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.23.tgz";
-      name = "tldtools-0.0.23.tgz";
-      sha1 = "2d3c29efc7d14a4fc8f84eb3d3f7fcb70000022a";
+      url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.24.tgz";
+      name = "tldtools-0.0.24.tgz";
+      sha1 = "c9c793d04d7fbdccb90b1c02c019f7259375d612";
     };
     deps = {
-      "request-2.53.0" = self.by-version."request"."2.53.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -37932,7 +41289,7 @@
     cpu = [ ];
   };
   by-spec."tldtools".">=0.0.6" =
-    self.by-version."tldtools"."0.0.23";
+    self.by-version."tldtools"."0.0.24";
   by-spec."tls-connect"."^0.2.2" =
     self.by-version."tls-connect"."0.2.2";
   by-version."tls-connect"."0.2.2" = self.buildNodePackage {
@@ -37952,20 +41309,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tls-connect"."~0.2.0" =
-    self.by-version."tls-connect"."0.2.2";
   by-spec."tls-connect"."~0.x" =
     self.by-version."tls-connect"."0.2.2";
-  by-spec."tmp"."0.0.23" =
-    self.by-version."tmp"."0.0.23";
-  by-version."tmp"."0.0.23" = self.buildNodePackage {
-    name = "tmp-0.0.23";
-    version = "0.0.23";
+  by-spec."tmp"."0.0.24" =
+    self.by-version."tmp"."0.0.24";
+  by-version."tmp"."0.0.24" = self.buildNodePackage {
+    name = "tmp-0.0.24";
+    version = "0.0.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz";
-      name = "tmp-0.0.23.tgz";
-      sha1 = "de874aa5e974a85f0a32cdfdbd74663cb3bd9c74";
+      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
+      name = "tmp-0.0.24.tgz";
+      sha1 = "d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12";
     };
     deps = {
     };
@@ -37975,16 +41330,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tmp"."0.0.24" =
-    self.by-version."tmp"."0.0.24";
-  by-version."tmp"."0.0.24" = self.buildNodePackage {
-    name = "tmp-0.0.24";
-    version = "0.0.24";
+  by-spec."tmp"."~0.0.20" =
+    self.by-version."tmp"."0.0.25";
+  by-version."tmp"."0.0.25" = self.buildNodePackage {
+    name = "tmp-0.0.25";
+    version = "0.0.25";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
-      name = "tmp-0.0.24.tgz";
-      sha1 = "d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12";
+      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.25.tgz";
+      name = "tmp-0.0.25.tgz";
+      sha1 = "b29629768c55f38df0bff33f6dfde052443da27d";
     };
     deps = {
     };
@@ -37994,8 +41349,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tmp"."~0.0.20" =
-    self.by-version."tmp"."0.0.24";
   by-spec."to-array"."0.1.3" =
     self.by-version."to-array"."0.1.3";
   by-version."to-array"."0.1.3" = self.buildNodePackage {
@@ -38015,6 +41368,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."to-utf8"."0.0.1" =
+    self.by-version."to-utf8"."0.0.1";
+  by-version."to-utf8"."0.0.1" = self.buildNodePackage {
+    name = "to-utf8-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz";
+      name = "to-utf8-0.0.1.tgz";
+      sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."tomahawk"."0.1.6" =
     self.by-version."tomahawk"."0.1.6";
   by-version."tomahawk"."0.1.6" = self.buildNodePackage {
@@ -38061,19 +41433,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."toobusy"."~0.2.4" =
-    self.by-version."toobusy"."0.2.4";
-  by-version."toobusy"."0.2.4" = self.buildNodePackage {
-    name = "toobusy-0.2.4";
-    version = "0.2.4";
+  by-spec."toobusy-js"."^0.4.1" =
+    self.by-version."toobusy-js"."0.4.1";
+  by-version."toobusy-js"."0.4.1" = self.buildNodePackage {
+    name = "toobusy-js-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/toobusy/-/toobusy-0.2.4.tgz";
-      name = "toobusy-0.2.4.tgz";
-      sha1 = "d97a3ee760b2462388e15f8526579b4b64bb193d";
+      url = "http://registry.npmjs.org/toobusy-js/-/toobusy-js-0.4.1.tgz";
+      name = "toobusy-js-0.4.1.tgz";
+      sha1 = "272be860c2302dbb56c63b77069b58ef620c18e9";
     };
     deps = {
-      "bindings-1.1.0" = self.by-version."bindings"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -38081,20 +41452,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."torrent-stream"."^0.16.2" =
-    self.by-version."torrent-stream"."0.16.2";
-  by-version."torrent-stream"."0.16.2" = self.buildNodePackage {
-    name = "torrent-stream-0.16.2";
-    version = "0.16.2";
+  by-spec."torrent-stream"."^0.18.1" =
+    self.by-version."torrent-stream"."0.18.1";
+  by-version."torrent-stream"."0.18.1" = self.buildNodePackage {
+    name = "torrent-stream-0.18.1";
+    version = "0.18.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.16.2.tgz";
-      name = "torrent-stream-0.16.2.tgz";
-      sha1 = "f6460d2e1b25371ff82f4d5391450846d78b9164";
+      url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.18.1.tgz";
+      name = "torrent-stream-0.18.1.tgz";
+      sha1 = "e2e8ca44d81f16fbe5646e0ebb05f5418fea9bf6";
     };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
-      "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4";
+      "bittorrent-dht-3.0.8" = self.by-version."bittorrent-dht"."3.0.8";
       "bittorrent-tracker-2.12.1" = self.by-version."bittorrent-tracker"."2.12.1";
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
@@ -38104,10 +41475,10 @@
       "ip-set-1.0.0" = self.by-version."ip-set"."1.0.0";
       "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "parse-torrent-1.7.0" = self.by-version."parse-torrent"."1.7.0";
+      "parse-torrent-4.0.0" = self.by-version."parse-torrent"."4.0.0";
       "peer-wire-swarm-0.9.2" = self.by-version."peer-wire-swarm"."0.9.2";
       "random-access-file-0.3.1" = self.by-version."random-access-file"."0.3.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
     optionalDependencies = {
@@ -38141,7 +41512,7 @@
       "parse-torrent-1.7.0" = self.by-version."parse-torrent"."1.7.0";
       "peer-wire-swarm-0.9.2" = self.by-version."peer-wire-swarm"."0.9.2";
       "random-access-file-0.3.1" = self.by-version."random-access-file"."0.3.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
     optionalDependencies = {
@@ -38150,27 +41521,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."touch"."0.0.2" =
-    self.by-version."touch"."0.0.2";
-  by-version."touch"."0.0.2" = self.buildNodePackage {
-    name = "touch-0.0.2";
-    version = "0.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/touch/-/touch-0.0.2.tgz";
-      name = "touch-0.0.2.tgz";
-      sha1 = "a65a777795e5cbbe1299499bdc42281ffb21b5f4";
-    };
-    deps = {
-      "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."touch"."~0.0.3" =
+  by-spec."touch"."0.0.3" =
     self.by-version."touch"."0.0.3";
   by-version."touch"."0.0.3" = self.buildNodePackage {
     name = "touch-0.0.3";
@@ -38190,6 +41541,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."touch"."~0.0.3" =
+    self.by-version."touch"."0.0.3";
   by-spec."tough-cookie".">=0.12.0" =
     self.by-version."tough-cookie"."0.12.1";
   by-version."tough-cookie"."0.12.1" = self.buildNodePackage {
@@ -38244,8 +41597,8 @@
       sha1 = "b1a44b69bfbabb9db2c7c284713f4ebacf46f733";
     };
     deps = {
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
-      "glob-4.4.0" = self.by-version."glob"."4.4.0";
+      "commander-2.8.0" = self.by-version."commander"."2.8.0";
+      "glob-4.5.3" = self.by-version."glob"."4.5.3";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
     optionalDependencies = {
@@ -38288,11 +41641,11 @@
       sha1 = "aa8e0ae39c9764ea1b2dcb9ebc324cbcd8d1a928";
     };
     deps = {
-      "meow-3.0.0" = self.by-version."meow"."3.0.0";
+      "meow-3.1.0" = self.by-version."meow"."3.1.0";
       "osx-trash-1.0.0" = self.by-version."osx-trash"."1.0.0";
-      "update-notifier-0.3.0" = self.by-version."update-notifier"."0.3.0";
+      "update-notifier-0.3.2" = self.by-version."update-notifier"."0.3.2";
       "win-trash-1.0.0" = self.by-version."win-trash"."1.0.0";
-      "xdg-trash-1.0.6" = self.by-version."xdg-trash"."1.0.6";
+      "xdg-trash-1.1.0" = self.by-version."xdg-trash"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -38419,6 +41772,25 @@
   };
   by-spec."tty-browserify"."~0.0.0" =
     self.by-version."tty-browserify"."0.0.0";
+  by-spec."tunnel-agent"."^0.4.0" =
+    self.by-version."tunnel-agent"."0.4.0";
+  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
+    name = "tunnel-agent-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
+      name = "tunnel-agent-0.4.0.tgz";
+      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."tunnel-agent"."~0.2.0" =
     self.by-version."tunnel-agent"."0.2.0";
   by-version."tunnel-agent"."0.2.0" = self.buildNodePackage {
@@ -38459,37 +41831,20 @@
   };
   by-spec."tunnel-agent"."~0.4.0" =
     self.by-version."tunnel-agent"."0.4.0";
-  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
-    name = "tunnel-agent-0.4.0";
-    version = "0.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
-      name = "tunnel-agent-0.4.0.tgz";
-      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."twilio".">=1.1.4" =
-    self.by-version."twilio"."1.11.0";
-  by-version."twilio"."1.11.0" = self.buildNodePackage {
-    name = "twilio-1.11.0";
-    version = "1.11.0";
+    self.by-version."twilio"."2.0.0";
+  by-version."twilio"."2.0.0" = self.buildNodePackage {
+    name = "twilio-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/twilio/-/twilio-1.11.0.tgz";
-      name = "twilio-1.11.0.tgz";
-      sha1 = "ac49109fbbf761d1b3efad5e49ae1bbb95135700";
+      url = "http://registry.npmjs.org/twilio/-/twilio-2.0.0.tgz";
+      name = "twilio-2.0.0.tgz";
+      sha1 = "2b762e4890509514c295d152c22a596924f37bdd";
     };
     deps = {
       "request-2.27.0" = self.by-version."request"."2.27.0";
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
       "jwt-simple-0.1.0" = self.by-version."jwt-simple"."0.1.0";
       "q-0.9.7" = self.by-version."q"."0.9.7";
       "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
@@ -38593,7 +41948,7 @@
     };
     deps = {
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
     };
     optionalDependencies = {
     };
@@ -38603,24 +41958,20 @@
   };
   by-spec."type-is"."~1.5.2" =
     self.by-version."type-is"."1.5.7";
-  by-spec."type-is"."~1.5.3" =
-    self.by-version."type-is"."1.5.7";
-  by-spec."type-is"."~1.5.5" =
-    self.by-version."type-is"."1.5.7";
-  by-spec."type-is"."~1.6.0" =
-    self.by-version."type-is"."1.6.0";
-  by-version."type-is"."1.6.0" = self.buildNodePackage {
-    name = "type-is-1.6.0";
-    version = "1.6.0";
+  by-spec."type-is"."~1.6.1" =
+    self.by-version."type-is"."1.6.1";
+  by-version."type-is"."1.6.1" = self.buildNodePackage {
+    name = "type-is-1.6.1";
+    version = "1.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/type-is/-/type-is-1.6.0.tgz";
-      name = "type-is-1.6.0.tgz";
-      sha1 = "efcb9223fafad5a03be14d8f6c9e1785f2c0e7c3";
+      url = "http://registry.npmjs.org/type-is/-/type-is-1.6.1.tgz";
+      name = "type-is-1.6.1.tgz";
+      sha1 = "49addecb0f6831cbc1d34ba929f0f3a4f21b0f2e";
     };
     deps = {
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "mime-types-2.0.9" = self.by-version."mime-types"."2.0.9";
+      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
     };
     optionalDependencies = {
     };
@@ -38667,15 +42018,54 @@
     cpu = [ ];
   };
   by-spec."typescript"."*" =
-    self.by-version."typescript"."1.4.1";
-  by-version."typescript"."1.4.1" = self.buildNodePackage {
-    name = "typescript-1.4.1";
-    version = "1.4.1";
+    self.by-version."typescript"."1.5.0-alpha";
+  by-version."typescript"."1.5.0-alpha" = self.buildNodePackage {
+    name = "typescript-1.5.0-alpha";
+    version = "1.5.0-alpha";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/typescript/-/typescript-1.4.1.tgz";
-      name = "typescript-1.4.1.tgz";
-      sha1 = "eb4da986d1b7f01452eafb57559e0cc8f516cd48";
+      url = "http://registry.npmjs.org/typescript/-/typescript-1.5.0-alpha.tgz";
+      name = "typescript-1.5.0-alpha.tgz";
+      sha1 = "3186ae01d409d9dd924eb35c57e90c2013b97497";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "typescript" = self.by-version."typescript"."1.5.0-alpha";
+  by-spec."typewiselite"."~1.0.0" =
+    self.by-version."typewiselite"."1.0.0";
+  by-version."typewiselite"."1.0.0" = self.buildNodePackage {
+    name = "typewiselite-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz";
+      name = "typewiselite-1.0.0.tgz";
+      sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."uc.micro"."^1.0.0" =
+    self.by-version."uc.micro"."1.0.0";
+  by-version."uc.micro"."1.0.0" = self.buildNodePackage {
+    name = "uc.micro-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uc.micro/-/uc.micro-1.0.0.tgz";
+      name = "uc.micro-1.0.0.tgz";
+      sha1 = "4c5a6dee941b515a5bd5cf5d05b121e0e49c5fb7";
     };
     deps = {
     };
@@ -38685,22 +42075,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "typescript" = self.by-version."typescript"."1.4.1";
   by-spec."uglify-js"."*" =
-    self.by-version."uglify-js"."2.4.16";
-  by-version."uglify-js"."2.4.16" = self.buildNodePackage {
-    name = "uglify-js-2.4.16";
-    version = "2.4.16";
+    self.by-version."uglify-js"."2.4.20";
+  by-version."uglify-js"."2.4.20" = self.buildNodePackage {
+    name = "uglify-js-2.4.20";
+    version = "2.4.20";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz";
-      name = "uglify-js-2.4.16.tgz";
-      sha1 = "84143487eb480efd7d0789c7ecfbd48a695839f9";
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.20.tgz";
+      name = "uglify-js-2.4.20.tgz";
+      sha1 = "f4e9c0ac1d61c0a71d7eb85b3477c3af4cf4a3f2";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "source-map-0.1.34" = self.by-version."source-map"."0.1.34";
-      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+      "yargs-3.5.4" = self.by-version."yargs"."3.5.4";
       "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
     };
     optionalDependencies = {
@@ -38709,7 +42098,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "uglify-js" = self.by-version."uglify-js"."2.4.16";
+  "uglify-js" = self.by-version."uglify-js"."2.4.20";
   by-spec."uglify-js"."1.2.5" =
     self.by-version."uglify-js"."1.2.5";
   by-version."uglify-js"."1.2.5" = self.buildNodePackage {
@@ -38754,10 +42143,31 @@
   };
   by-spec."uglify-js"."2.4.16" =
     self.by-version."uglify-js"."2.4.16";
-  by-spec."uglify-js"."^2.4.0" =
-    self.by-version."uglify-js"."2.4.16";
+  by-version."uglify-js"."2.4.16" = self.buildNodePackage {
+    name = "uglify-js-2.4.16";
+    version = "2.4.16";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz";
+      name = "uglify-js-2.4.16.tgz";
+      sha1 = "84143487eb480efd7d0789c7ecfbd48a695839f9";
+    };
+    deps = {
+      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "source-map-0.1.34" = self.by-version."source-map"."0.1.34";
+      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+      "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."uglify-js"."^2.4.15" =
-    self.by-version."uglify-js"."2.4.16";
+    self.by-version."uglify-js"."2.4.20";
+  by-spec."uglify-js"."^2.4.19" =
+    self.by-version."uglify-js"."2.4.20";
   by-spec."uglify-js"."~1.1.1" =
     self.by-version."uglify-js"."1.1.1";
   by-version."uglify-js"."1.1.1" = self.buildNodePackage {
@@ -38823,11 +42233,11 @@
     cpu = [ ];
   };
   by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.16";
+    self.by-version."uglify-js"."2.4.20";
   by-spec."uglify-js"."~2.4.13" =
-    self.by-version."uglify-js"."2.4.16";
+    self.by-version."uglify-js"."2.4.20";
   by-spec."uglify-js"."~2.4.15" =
-    self.by-version."uglify-js"."2.4.16";
+    self.by-version."uglify-js"."2.4.20";
   by-spec."uglify-to-browserify"."~1.0.0" =
     self.by-version."uglify-to-browserify"."1.0.2";
   by-version."uglify-to-browserify"."1.0.2" = self.buildNodePackage {
@@ -38866,6 +42276,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."uid-number"."0" =
+    self.by-version."uid-number"."0.0.6";
+  by-version."uid-number"."0.0.6" = self.buildNodePackage {
+    name = "uid-number-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
+      name = "uid-number-0.0.6.tgz";
+      sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."uid-number"."0.0.3" =
     self.by-version."uid-number"."0.0.3";
   by-version."uid-number"."0.0.3" = self.buildNodePackage {
@@ -38906,23 +42335,6 @@
   };
   by-spec."uid-number"."0.0.6" =
     self.by-version."uid-number"."0.0.6";
-  by-version."uid-number"."0.0.6" = self.buildNodePackage {
-    name = "uid-number-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
-      name = "uid-number-0.0.6.tgz";
-      sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."uid-safe"."1.0.1" =
     self.by-version."uid-safe"."1.0.1";
   by-version."uid-safe"."1.0.1" = self.buildNodePackage {
@@ -39042,8 +42454,8 @@
     deps = {
       "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
       "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
-      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
     };
     optionalDependencies = {
     };
@@ -39084,8 +42496,8 @@
     deps = {
       "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
       "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0";
-      "through-2.3.6" = self.by-version."through"."2.3.6";
-      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
+      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
     };
     optionalDependencies = {
     };
@@ -39096,15 +42508,15 @@
   by-spec."umd"."~2.1.0" =
     self.by-version."umd"."2.1.0";
   by-spec."underscore"."*" =
-    self.by-version."underscore"."1.8.2";
-  by-version."underscore"."1.8.2" = self.buildNodePackage {
-    name = "underscore-1.8.2";
-    version = "1.8.2";
+    self.by-version."underscore"."1.8.3";
+  by-version."underscore"."1.8.3" = self.buildNodePackage {
+    name = "underscore-1.8.3";
+    version = "1.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz";
-      name = "underscore-1.8.2.tgz";
-      sha1 = "64df2eb590899de950782f3735190ba42ebf311d";
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+      name = "underscore-1.8.3.tgz";
+      sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
     };
     deps = {
     };
@@ -39114,7 +42526,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "underscore" = self.by-version."underscore"."1.8.2";
+  "underscore" = self.by-version."underscore"."1.8.3";
   by-spec."underscore"."1.2.1" =
     self.by-version."underscore"."1.2.1";
   by-version."underscore"."1.2.1" = self.buildNodePackage {
@@ -39191,20 +42603,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."underscore"."1.x" =
+  by-spec."underscore"."1.8.2" =
     self.by-version."underscore"."1.8.2";
+  by-version."underscore"."1.8.2" = self.buildNodePackage {
+    name = "underscore-1.8.2";
+    version = "1.8.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz";
+      name = "underscore-1.8.2.tgz";
+      sha1 = "64df2eb590899de950782f3735190ba42ebf311d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore"."1.x" =
+    self.by-version."underscore"."1.8.3";
+  by-spec."underscore".">= 1.3.3" =
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore".">=1.1.7" =
-    self.by-version."underscore"."1.8.2";
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore".">=1.3.1" =
-    self.by-version."underscore"."1.8.2";
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore".">=1.5.0" =
-    self.by-version."underscore"."1.8.2";
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore".">=1.5.2" =
-    self.by-version."underscore"."1.8.2";
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore"."^1.6.0" =
-    self.by-version."underscore"."1.8.2";
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore"."^1.7.0" =
-    self.by-version."underscore"."1.8.2";
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore"."~1.4.3" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = self.buildNodePackage {
@@ -39329,50 +42762,51 @@
     cpu = [ ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.8.4";
-  by-version."ungit"."0.8.4" = self.buildNodePackage {
-    name = "ungit-0.8.4";
-    version = "0.8.4";
+    self.by-version."ungit"."0.9.1";
+  by-version."ungit"."0.9.1" = self.buildNodePackage {
+    name = "ungit-0.9.1";
+    version = "0.9.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ungit/-/ungit-0.8.4.tgz";
-      name = "ungit-0.8.4.tgz";
-      sha1 = "3956812e8f2005415d351a710350f88b38c2d99a";
+      url = "http://registry.npmjs.org/ungit/-/ungit-0.9.1.tgz";
+      name = "ungit-0.9.1.tgz";
+      sha1 = "e2148e21aa8c488aaecab0c293f97134aca6c348";
     };
     deps = {
-      "express-4.10.8" = self.by-version."express"."4.10.8";
-      "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "temp-0.8.1" = self.by-version."temp"."0.8.1";
-      "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
-      "moment-2.8.4" = self.by-version."moment"."2.8.4";
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "rc-0.5.5" = self.by-version."rc"."0.5.5";
-      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
-      "winston-0.8.3" = self.by-version."winston"."0.8.3";
-      "passport-0.2.1" = self.by-version."passport"."0.2.1";
-      "passport-local-1.0.0" = self.by-version."passport-local"."1.0.0";
-      "semver-4.1.1" = self.by-version."semver"."4.1.1";
-      "forever-monitor-1.1.0" = self.by-version."forever-monitor"."1.1.0";
-      "open-0.0.5" = self.by-version."open"."0.0.5";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "blueimp-md5-1.1.0" = self.by-version."blueimp-md5"."1.1.0";
+      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
+      "color-0.8.0" = self.by-version."color"."0.8.0";
+      "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
       "crossroads-0.12.0" = self.by-version."crossroads"."0.12.0";
-      "signals-1.0.0" = self.by-version."signals"."1.0.0";
+      "diff2html-0.1.9" = self.by-version."diff2html"."0.1.9";
+      "express-4.12.3" = self.by-version."express"."4.12.3";
+      "express-session-1.10.4" = self.by-version."express-session"."1.10.4";
+      "forever-monitor-1.5.2" = self.by-version."forever-monitor"."1.5.2";
+      "getmac-1.0.7" = self.by-version."getmac"."1.0.7";
       "hasher-1.2.0" = self.by-version."hasher"."1.2.0";
-      "blueimp-md5-1.1.0" = self.by-version."blueimp-md5"."1.1.0";
-      "color-0.7.3" = self.by-version."color"."0.7.3";
       "keen.io-0.1.3" = self.by-version."keen.io"."0.1.3";
-      "getmac-1.0.6" = self.by-version."getmac"."1.0.6";
-      "deep-extend-0.3.2" = self.by-version."deep-extend"."0.3.2";
-      "raven-0.7.2" = self.by-version."raven"."0.7.2";
-      "knockout-3.2.0" = self.by-version."knockout"."3.2.0";
-      "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5";
-      "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1";
+      "knockout-3.3.0" = self.by-version."knockout"."3.3.0";
+      "lodash-3.6.0" = self.by-version."lodash"."3.6.0";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "body-parser-1.9.3" = self.by-version."body-parser"."1.9.3";
-      "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
-      "express-session-1.9.3" = self.by-version."express-session"."1.9.3";
-      "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2";
+      "moment-2.9.0" = self.by-version."moment"."2.9.0";
+      "npm-registry-client-6.1.2" = self.by-version."npm-registry-client"."6.1.2";
+      "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1";
+      "open-0.0.5" = self.by-version."open"."0.0.5";
+      "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "passport-local-1.0.0" = self.by-version."passport-local"."1.0.0";
+      "raven-0.7.3" = self.by-version."raven"."0.7.3";
+      "rc-1.0.1" = self.by-version."rc"."1.0.1";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2";
+      "signals-1.0.0" = self.by-version."signals"."1.0.0";
+      "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
+      "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
+      "temp-0.8.1" = self.by-version."temp"."0.8.1";
+      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
+      "winston-0.9.0" = self.by-version."winston"."0.9.0";
+      "yargs-3.6.0" = self.by-version."yargs"."3.6.0";
     };
     optionalDependencies = {
     };
@@ -39380,7 +42814,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "ungit" = self.by-version."ungit"."0.8.4";
+  "ungit" = self.by-version."ungit"."0.9.1";
   by-spec."unique-stream"."^1.0.0" =
     self.by-version."unique-stream"."1.0.0";
   by-version."unique-stream"."1.0.0" = self.buildNodePackage {
@@ -39439,43 +42873,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."update-notifier"."0.2.0" =
-    self.by-version."update-notifier"."0.2.0";
-  by-version."update-notifier"."0.2.0" = self.buildNodePackage {
-    name = "update-notifier-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz";
-      name = "update-notifier-0.2.0.tgz";
-      sha1 = "a010c928adcf02090b8e0ce7fef6fb0a7cacc34a";
-    };
-    deps = {
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
-      "latest-version-0.2.0" = self.by-version."latest-version"."0.2.0";
-      "semver-diff-0.1.0" = self.by-version."semver-diff"."0.1.0";
-      "string-length-0.1.2" = self.by-version."string-length"."0.1.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."update-notifier"."^0.3.0" =
-    self.by-version."update-notifier"."0.3.0";
-  by-version."update-notifier"."0.3.0" = self.buildNodePackage {
-    name = "update-notifier-0.3.0";
-    version = "0.3.0";
+    self.by-version."update-notifier"."0.3.2";
+  by-version."update-notifier"."0.3.2" = self.buildNodePackage {
+    name = "update-notifier-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.3.0.tgz";
-      name = "update-notifier-0.3.0.tgz";
-      sha1 = "972b1b6def843d546f93736dbed346a7c10230e7";
+      url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.3.2.tgz";
+      name = "update-notifier-0.3.2.tgz";
+      sha1 = "22a8735baadef3320e2db928f693da898dc87777";
     };
     deps = {
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
       "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
       "is-npm-1.0.0" = self.by-version."is-npm"."1.0.0";
       "latest-version-1.0.0" = self.by-version."latest-version"."1.0.0";
@@ -39508,18 +42918,19 @@
     cpu = [ ];
   };
   by-spec."url"."~0.10.1" =
-    self.by-version."url"."0.10.2";
-  by-version."url"."0.10.2" = self.buildNodePackage {
-    name = "url-0.10.2";
-    version = "0.10.2";
+    self.by-version."url"."0.10.3";
+  by-version."url"."0.10.3" = self.buildNodePackage {
+    name = "url-0.10.3";
+    version = "0.10.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/url/-/url-0.10.2.tgz";
-      name = "url-0.10.2.tgz";
-      sha1 = "68621d6929ea1cad344ebf135d82fcf7eb1a7469";
+      url = "http://registry.npmjs.org/url/-/url-0.10.3.tgz";
+      name = "url-0.10.3.tgz";
+      sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
     };
     deps = {
       "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
+      "querystring-0.2.0" = self.by-version."querystring"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -39548,6 +42959,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."url-join"."0.0.x" =
+    self.by-version."url-join"."0.0.1";
+  by-version."url-join"."0.0.1" = self.buildNodePackage {
+    name = "url-join-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz";
+      name = "url-join-0.0.1.tgz";
+      sha1 = "1db48ad422d3402469a87f7d97bdebfe4fb1e3c8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."user-home"."^1.0.0" =
     self.by-version."user-home"."1.1.1";
   by-version."user-home"."1.1.1" = self.buildNodePackage {
@@ -39569,6 +42999,8 @@
   };
   by-spec."user-home"."^1.1.0" =
     self.by-version."user-home"."1.1.1";
+  by-spec."user-home"."^1.1.1" =
+    self.by-version."user-home"."1.1.1";
   by-spec."useragent"."~2.0.4" =
     self.by-version."useragent"."2.0.10";
   by-version."useragent"."2.0.10" = self.buildNodePackage {
@@ -39751,31 +43183,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."utile"."0.1.x" =
-    self.by-version."utile"."0.1.7";
-  by-version."utile"."0.1.7" = self.buildNodePackage {
-    name = "utile-0.1.7";
-    version = "0.1.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
-      name = "utile-0.1.7.tgz";
-      sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
-    };
-    deps = {
-      "async-0.1.22" = self.by-version."async"."0.1.22";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "i-0.3.2" = self.by-version."i"."0.3.2";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "ncp-0.2.7" = self.by-version."ncp"."0.2.7";
-      "rimraf-1.0.9" = self.by-version."rimraf"."1.0.9";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."utile"."0.2.1" =
     self.by-version."utile"."0.2.1";
   by-version."utile"."0.2.1" = self.buildNodePackage {
@@ -39790,10 +43197,10 @@
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "i-0.3.2" = self.by-version."i"."0.3.2";
+      "i-0.3.3" = self.by-version."i"."0.3.3";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -39847,20 +43254,20 @@
   };
   by-spec."uuid"."~2.0.1" =
     self.by-version."uuid"."2.0.1";
-  by-spec."v8-debug"."~0.3.0" =
-    self.by-version."v8-debug"."0.3.5";
-  by-version."v8-debug"."0.3.5" = self.buildNodePackage {
-    name = "v8-debug-0.3.5";
-    version = "0.3.5";
+  by-spec."v8-debug"."~0.4.2" =
+    self.by-version."v8-debug"."0.4.2";
+  by-version."v8-debug"."0.4.2" = self.buildNodePackage {
+    name = "v8-debug-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.5.tgz";
-      name = "v8-debug-0.3.5.tgz";
-      sha1 = "2131d87b58932864d5697831a3414f529c75ad81";
+      url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.4.2.tgz";
+      name = "v8-debug-0.4.2.tgz";
+      sha1 = "a43ec4699f7760828bcd6520f9d7938ccf612dfe";
     };
     deps = {
       "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4";
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -39868,7 +43275,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."v8-profiler"."~5.2.0" =
+  by-spec."v8-profiler"."~5.2.4" =
     self.by-version."v8-profiler"."5.2.4";
   by-version."v8-profiler"."5.2.4" = self.buildNodePackage {
     name = "v8-profiler-5.2.4";
@@ -39890,17 +43297,18 @@
     cpu = [ ];
   };
   by-spec."v8flags"."^2.0.2" =
-    self.by-version."v8flags"."2.0.2";
-  by-version."v8flags"."2.0.2" = self.buildNodePackage {
-    name = "v8flags-2.0.2";
-    version = "2.0.2";
+    self.by-version."v8flags"."2.0.5";
+  by-version."v8flags"."2.0.5" = self.buildNodePackage {
+    name = "v8flags-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/v8flags/-/v8flags-2.0.2.tgz";
-      name = "v8flags-2.0.2.tgz";
-      sha1 = "915730856e88547f8d023cfc07a671aff43adac4";
+      url = "http://registry.npmjs.org/v8flags/-/v8flags-2.0.5.tgz";
+      name = "v8flags-2.0.5.tgz";
+      sha1 = "006e90eeba5f9c861f34a3b75fdb1fa26f8da629";
     };
     deps = {
+      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -39927,6 +43335,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."validate-npm-package-name"."^2.0.1" =
+    self.by-version."validate-npm-package-name"."2.0.1";
+  by-version."validate-npm-package-name"."2.0.1" = self.buildNodePackage {
+    name = "validate-npm-package-name-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.0.1.tgz";
+      name = "validate-npm-package-name-2.0.1.tgz";
+      sha1 = "ca006761b2b325f107fab172fb0cfcfc5e412c58";
+    };
+    deps = {
+      "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."validator"."1.5.1" =
     self.by-version."validator"."1.5.1";
   by-version."validator"."1.5.1" = self.buildNodePackage {
@@ -40026,27 +43454,6 @@
   };
   by-spec."vary"."~1.0.0" =
     self.by-version."vary"."1.0.0";
-  by-spec."vasync"."1.3.3" =
-    self.by-version."vasync"."1.3.3";
-  by-version."vasync"."1.3.3" = self.buildNodePackage {
-    name = "vasync-1.3.3";
-    version = "1.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/vasync/-/vasync-1.3.3.tgz";
-      name = "vasync-1.3.3.tgz";
-      sha1 = "84917680717020b67e043902e63bc143174c8728";
-    };
-    deps = {
-      "jsprim-0.3.0" = self.by-version."jsprim"."0.3.0";
-      "verror-1.1.0" = self.by-version."verror"."1.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."vasync"."1.4.0" =
     self.by-version."vasync"."1.4.0";
   by-version."vasync"."1.4.0" = self.buildNodePackage {
@@ -40089,6 +43496,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."vasync"."1.6.2" =
+    self.by-version."vasync"."1.6.2";
+  by-version."vasync"."1.6.2" = self.buildNodePackage {
+    name = "vasync-1.6.2";
+    version = "1.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/vasync/-/vasync-1.6.2.tgz";
+      name = "vasync-1.6.2.tgz";
+      sha1 = "568edcf40b2b5c35b1cc048cad085de4739703fb";
+    };
+    deps = {
+      "verror-1.1.0" = self.by-version."verror"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."verror"."1.1.0" =
     self.by-version."verror"."1.1.0";
   by-version."verror"."1.1.0" = self.buildNodePackage {
@@ -40264,13 +43691,13 @@
       sha1 = "3d384c5b3032e356cd388023e3a085303382ac23";
     };
     deps = {
-      "defaults-1.0.0" = self.by-version."defaults"."1.0.0";
+      "defaults-1.0.2" = self.by-version."defaults"."1.0.2";
       "glob-stream-3.1.18" = self.by-version."glob-stream"."3.1.18";
       "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
       "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0";
-      "through2-0.6.3" = self.by-version."through2"."0.6.3";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
     };
     optionalDependencies = {
@@ -40408,25 +43835,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."watch"."0.5.x" =
-    self.by-version."watch"."0.5.1";
-  by-version."watch"."0.5.1" = self.buildNodePackage {
-    name = "watch-0.5.1";
-    version = "0.5.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
-      name = "watch-0.5.1.tgz";
-      sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."watch"."~0.13.0" =
     self.by-version."watch"."0.13.0";
   by-version."watch"."0.13.0" = self.buildNodePackage {
@@ -40439,7 +43847,7 @@
       sha1 = "fcc6d2b3f0e8c73482eb54239a19fd5bcf9a753c";
     };
     deps = {
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
+      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -40448,20 +43856,20 @@
     cpu = [ ];
   };
   by-spec."watchpack"."^0.2.1" =
-    self.by-version."watchpack"."0.2.3";
-  by-version."watchpack"."0.2.3" = self.buildNodePackage {
-    name = "watchpack-0.2.3";
-    version = "0.2.3";
+    self.by-version."watchpack"."0.2.4";
+  by-version."watchpack"."0.2.4" = self.buildNodePackage {
+    name = "watchpack-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/watchpack/-/watchpack-0.2.3.tgz";
-      name = "watchpack-0.2.3.tgz";
-      sha1 = "b9a5342327ee34a9ff1dfb42762be3a9c08ac214";
+      url = "http://registry.npmjs.org/watchpack/-/watchpack-0.2.4.tgz";
+      name = "watchpack-0.2.4.tgz";
+      sha1 = "4af6c10f756e731b001645d34e637aa9201e97e8";
     };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "chokidar-1.0.0-rc3" = self.by-version."chokidar"."1.0.0-rc3";
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "chokidar-1.0.1" = self.by-version."chokidar"."1.0.1";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
     };
     optionalDependencies = {
     };
@@ -40481,7 +43889,7 @@
       sha1 = "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f";
     };
     deps = {
-      "defaults-1.0.0" = self.by-version."defaults"."1.0.0";
+      "defaults-1.0.2" = self.by-version."defaults"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -40535,23 +43943,23 @@
     cpu = [ ];
   };
   by-spec."webdrvr"."*" =
-    self.by-version."webdrvr"."2.43.0-0";
-  by-version."webdrvr"."2.43.0-0" = self.buildNodePackage {
-    name = "webdrvr-2.43.0-0";
-    version = "2.43.0-0";
+    self.by-version."webdrvr"."2.43.0-1";
+  by-version."webdrvr"."2.43.0-1" = self.buildNodePackage {
+    name = "webdrvr-2.43.0-1";
+    version = "2.43.0-1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-0.tgz";
-      name = "webdrvr-2.43.0-0.tgz";
-      sha1 = "b022266b1d5fba25e22d923337c55587048c2953";
+      url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-1.tgz";
+      name = "webdrvr-2.43.0-1.tgz";
+      sha1 = "17c442b94c0a6a3a68293d6ea4deb408f8cb9225";
     };
     deps = {
       "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
       "kew-0.1.7" = self.by-version."kew"."0.1.7";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16";
-      "phantomjs-1.9.15" = self.by-version."phantomjs"."1.9.15";
-      "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
+      "phantomjs-1.9.16" = self.by-version."phantomjs"."1.9.16";
+      "tmp-0.0.25" = self.by-version."tmp"."0.0.25";
       "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
     };
     optionalDependencies = {
@@ -40560,7 +43968,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "webdrvr" = self.by-version."webdrvr"."2.43.0-0";
+  "webdrvr" = self.by-version."webdrvr"."2.43.0-1";
   by-spec."webkit-devtools-agent"."^0.2.4" =
     self.by-version."webkit-devtools-agent"."0.2.5";
   by-version."webkit-devtools-agent"."0.2.5" = self.buildNodePackage {
@@ -40583,29 +43991,31 @@
     cpu = [ ];
   };
   by-spec."webpack"."*" =
-    self.by-version."webpack"."1.5.3";
-  by-version."webpack"."1.5.3" = self.buildNodePackage {
-    name = "webpack-1.5.3";
-    version = "1.5.3";
+    self.by-version."webpack"."1.8.5";
+  by-version."webpack"."1.8.5" = self.buildNodePackage {
+    name = "webpack-1.8.5";
+    version = "1.8.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/webpack/-/webpack-1.5.3.tgz";
-      name = "webpack-1.5.3.tgz";
-      sha1 = "817a91e1fe70bbaba9400ea49afdfc9a05f4b0c5";
+      url = "http://registry.npmjs.org/webpack/-/webpack-1.8.5.tgz";
+      name = "webpack-1.8.5.tgz";
+      sha1 = "d08873b8ca10c54a7aa4513a363ee21244752a9e";
     };
     deps = {
-      "esprima-1.2.4" = self.by-version."esprima"."1.2.4";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "enhanced-resolve-0.8.4" = self.by-version."enhanced-resolve"."0.8.4";
-      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
       "clone-0.1.19" = self.by-version."clone"."0.1.19";
-      "webpack-core-0.4.8" = self.by-version."webpack-core"."0.4.8";
-      "node-libs-browser-0.4.1" = self.by-version."node-libs-browser"."0.4.1";
-      "watchpack-0.2.3" = self.by-version."watchpack"."0.2.3";
-      "tapable-0.1.8" = self.by-version."tapable"."0.1.8";
+      "enhanced-resolve-0.8.5" = self.by-version."enhanced-resolve"."0.8.5";
+      "esprima-1.2.5" = self.by-version."esprima"."1.2.5";
+      "interpret-0.5.2" = self.by-version."interpret"."0.5.2";
+      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "node-libs-browser-0.4.3" = self.by-version."node-libs-browser"."0.4.3";
+      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
+      "tapable-0.1.9" = self.by-version."tapable"."0.1.9";
+      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
+      "watchpack-0.2.4" = self.by-version."watchpack"."0.2.4";
+      "webpack-core-0.6.3" = self.by-version."webpack-core"."0.6.3";
     };
     optionalDependencies = {
     };
@@ -40613,20 +44023,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "webpack" = self.by-version."webpack"."1.5.3";
-  by-spec."webpack-core"."~0.4.8" =
-    self.by-version."webpack-core"."0.4.8";
-  by-version."webpack-core"."0.4.8" = self.buildNodePackage {
-    name = "webpack-core-0.4.8";
-    version = "0.4.8";
+  "webpack" = self.by-version."webpack"."1.8.5";
+  by-spec."webpack-core"."~0.6.0" =
+    self.by-version."webpack-core"."0.6.3";
+  by-version."webpack-core"."0.6.3" = self.buildNodePackage {
+    name = "webpack-core-0.6.3";
+    version = "0.6.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/webpack-core/-/webpack-core-0.4.8.tgz";
-      name = "webpack-core-0.4.8.tgz";
-      sha1 = "07fc55aba81d17dba8cae5a43d6bd69236f8b5f8";
+      url = "http://registry.npmjs.org/webpack-core/-/webpack-core-0.6.3.tgz";
+      name = "webpack-core-0.6.3.tgz";
+      sha1 = "a47283b688f66504797173d8eacb1df7ba6f0c5f";
     };
     deps = {
-      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
+      "source-list-map-0.1.5" = self.by-version."source-list-map"."0.1.5";
     };
     optionalDependencies = {
     };
@@ -40635,15 +44046,15 @@
     cpu = [ ];
   };
   by-spec."websocket-driver".">=0.3.6" =
-    self.by-version."websocket-driver"."0.5.3";
-  by-version."websocket-driver"."0.5.3" = self.buildNodePackage {
-    name = "websocket-driver-0.5.3";
-    version = "0.5.3";
+    self.by-version."websocket-driver"."0.5.4";
+  by-version."websocket-driver"."0.5.4" = self.buildNodePackage {
+    name = "websocket-driver-0.5.4";
+    version = "0.5.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.3.tgz";
-      name = "websocket-driver-0.5.3.tgz";
-      sha1 = "775d079018f8985e1c255eb8efa9224895acacc3";
+      url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.4.tgz";
+      name = "websocket-driver-0.5.4.tgz";
+      sha1 = "4c65278c92929384eacfcd908d3e9e0a5691c29e";
     };
     deps = {
       "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1";
@@ -40655,7 +44066,7 @@
     cpu = [ ];
   };
   by-spec."websocket-driver".">=0.5.1" =
-    self.by-version."websocket-driver"."0.5.3";
+    self.by-version."websocket-driver"."0.5.4";
   by-spec."websocket-extensions".">=0.1.1" =
     self.by-version."websocket-extensions"."0.1.1";
   by-version."websocket-extensions"."0.1.1" = self.buildNodePackage {
@@ -40714,15 +44125,15 @@
     cpu = [ ];
   };
   by-spec."which"."1" =
-    self.by-version."which"."1.0.8";
-  by-version."which"."1.0.8" = self.buildNodePackage {
-    name = "which-1.0.8";
-    version = "1.0.8";
+    self.by-version."which"."1.0.9";
+  by-version."which"."1.0.9" = self.buildNodePackage {
+    name = "which-1.0.9";
+    version = "1.0.9";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/which/-/which-1.0.8.tgz";
-      name = "which-1.0.8.tgz";
-      sha1 = "c2ff319534ac4a1fa45df2221b56c36279903ded";
+      url = "http://registry.npmjs.org/which/-/which-1.0.9.tgz";
+      name = "which-1.0.9.tgz";
+      sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
     };
     deps = {
     };
@@ -40733,26 +44144,36 @@
     cpu = [ ];
   };
   by-spec."which"."1.0.x" =
-    self.by-version."which"."1.0.8";
+    self.by-version."which"."1.0.9";
   by-spec."which"."^1.0.5" =
-    self.by-version."which"."1.0.8";
+    self.by-version."which"."1.0.9";
+  by-spec."which"."^1.0.7" =
+    self.by-version."which"."1.0.9";
+  by-spec."which"."^1.0.8" =
+    self.by-version."which"."1.0.9";
+  by-spec."which"."^1.0.9" =
+    self.by-version."which"."1.0.9";
   by-spec."which"."~1.0.5" =
-    self.by-version."which"."1.0.8";
-  by-spec."which"."~1.0.8" =
-    self.by-version."which"."1.0.8";
-  by-spec."win-detect-browsers"."^0.0.2" =
-    self.by-version."win-detect-browsers"."0.0.2";
-  by-version."win-detect-browsers"."0.0.2" = self.buildNodePackage {
-    name = "win-detect-browsers-0.0.2";
-    version = "0.0.2";
+    self.by-version."which"."1.0.9";
+  by-spec."which"."~1.0.9" =
+    self.by-version."which"."1.0.9";
+  by-spec."win-detect-browsers"."^1.0.1" =
+    self.by-version."win-detect-browsers"."1.0.1";
+  by-version."win-detect-browsers"."1.0.1" = self.buildNodePackage {
+    name = "win-detect-browsers-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-0.0.2.tgz";
-      name = "win-detect-browsers-0.0.2.tgz";
-      sha1 = "d636ade6434c9967c7e7af592a0b4aa2ba9d22f2";
+      url = "http://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.1.tgz";
+      name = "win-detect-browsers-1.0.1.tgz";
+      sha1 = "fd85b27aa8c7af8573a6aa7dbc10ff9692642b99";
     };
     deps = {
-      "which-1.0.8" = self.by-version."which"."1.0.8";
+      "after-0.8.1" = self.by-version."after"."0.8.1";
+      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -40798,6 +44219,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."window-size"."0.1.0" =
+    self.by-version."window-size"."0.1.0";
+  by-version."window-size"."0.1.0" = self.buildNodePackage {
+    name = "window-size-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+      name = "window-size-0.1.0.tgz";
+      sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."windows-no-runnable"."~0.0.6" =
     self.by-version."windows-no-runnable"."0.0.6";
   by-version."windows-no-runnable"."0.0.6" = self.buildNodePackage {
@@ -40839,22 +44279,22 @@
     cpu = [ ];
   };
   by-spec."winston"."*" =
-    self.by-version."winston"."0.9.0";
-  by-version."winston"."0.9.0" = self.buildNodePackage {
-    name = "winston-0.9.0";
-    version = "0.9.0";
+    self.by-version."winston"."1.0.0";
+  by-version."winston"."1.0.0" = self.buildNodePackage {
+    name = "winston-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.9.0.tgz";
-      name = "winston-0.9.0.tgz";
-      sha1 = "b5726e6c42291e305e36286ce7ae9f3b74a527a8";
+      url = "http://registry.npmjs.org/winston/-/winston-1.0.0.tgz";
+      name = "winston-1.0.0.tgz";
+      sha1 = "30e36e0041fc0a864b0029565719e4dc41d026a4";
     };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
       "colors-1.0.3" = self.by-version."colors"."1.0.3";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "isstream-0.1.1" = self.by-version."isstream"."0.1.1";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
@@ -40864,7 +44304,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "winston" = self.by-version."winston"."0.9.0";
+  "winston" = self.by-version."winston"."1.0.0";
   by-spec."winston"."0.5.1" =
     self.by-version."winston"."0.5.1";
   by-version."winston"."0.5.1" = self.buildNodePackage {
@@ -40918,32 +44358,6 @@
   };
   by-spec."winston"."0.6.x" =
     self.by-version."winston"."0.6.2";
-  by-spec."winston"."0.7.2" =
-    self.by-version."winston"."0.7.2";
-  by-version."winston"."0.7.2" = self.buildNodePackage {
-    name = "winston-0.7.2";
-    version = "0.7.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
-      name = "winston-0.7.2.tgz";
-      sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
-    };
-    deps = {
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
-      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
-      "request-2.16.6" = self.by-version."request"."2.16.6";
-      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."winston"."0.7.3" =
     self.by-version."winston"."0.7.3";
   by-version."winston"."0.7.3" = self.buildNodePackage {
@@ -41011,7 +44425,7 @@
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "isstream-0.1.1" = self.by-version."isstream"."0.1.1";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
       "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
@@ -41023,8 +44437,32 @@
   };
   by-spec."winston"."~0.8.1" =
     self.by-version."winston"."0.8.3";
-  by-spec."winston"."~0.8.3" =
-    self.by-version."winston"."0.8.3";
+  by-spec."winston"."~0.9.0" =
+    self.by-version."winston"."0.9.0";
+  by-version."winston"."0.9.0" = self.buildNodePackage {
+    name = "winston-0.9.0";
+    version = "0.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/winston/-/winston-0.9.0.tgz";
+      name = "winston-0.9.0.tgz";
+      sha1 = "b5726e6c42291e305e36286ce7ae9f3b74a527a8";
+    };
+    deps = {
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "colors-1.0.3" = self.by-version."colors"."1.0.3";
+      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."with"."~1.1.0" =
     self.by-version."with"."1.1.1";
   by-version."with"."1.1.1" = self.buildNodePackage {
@@ -41066,19 +44504,19 @@
     cpu = [ ];
   };
   by-spec."with"."~4.0.0" =
-    self.by-version."with"."4.0.1";
-  by-version."with"."4.0.1" = self.buildNodePackage {
-    name = "with-4.0.1";
-    version = "4.0.1";
+    self.by-version."with"."4.0.3";
+  by-version."with"."4.0.3" = self.buildNodePackage {
+    name = "with-4.0.3";
+    version = "4.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/with/-/with-4.0.1.tgz";
-      name = "with-4.0.1.tgz";
-      sha1 = "accd7a7c321f2d83e303e51c02bb7eb1fff19c32";
+      url = "http://registry.npmjs.org/with/-/with-4.0.3.tgz";
+      name = "with-4.0.3.tgz";
+      sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e";
     };
     deps = {
-      "acorn-0.11.0" = self.by-version."acorn"."0.11.0";
-      "acorn-globals-1.0.2" = self.by-version."acorn-globals"."1.0.2";
+      "acorn-1.0.3" = self.by-version."acorn"."1.0.3";
+      "acorn-globals-1.0.4" = self.by-version."acorn-globals"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -41086,7 +44524,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."wordwrap"."0.0.x" =
+  by-spec."wordwrap"."0.0.2" =
     self.by-version."wordwrap"."0.0.2";
   by-version."wordwrap"."0.0.2" = self.buildNodePackage {
     name = "wordwrap-0.0.2";
@@ -41105,6 +44543,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."wordwrap"."0.0.x" =
+    self.by-version."wordwrap"."0.0.2";
   by-spec."wordwrap".">=0.0.1 <0.1.0" =
     self.by-version."wordwrap"."0.0.2";
   by-spec."wordwrap"."~0.0.2" =
@@ -41183,7 +44623,7 @@
       sha1 = "e114cfb8f82188353f98217c5945451c9b4dc060";
     };
     deps = {
-      "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5";
+      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
     optionalDependencies = {
@@ -41238,6 +44678,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ws"."0.5.0" =
+    self.by-version."ws"."0.5.0";
+  by-version."ws"."0.5.0" = self.buildNodePackage {
+    name = "ws-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ws/-/ws-0.5.0.tgz";
+      name = "ws-0.5.0.tgz";
+      sha1 = "b3980391dc4777d83974718aa361e808d86cf9ca";
+    };
+    deps = {
+      "nan-1.4.3" = self.by-version."nan"."1.4.3";
+      "options-0.0.6" = self.by-version."options"."0.0.6";
+      "ultron-1.0.1" = self.by-version."ultron"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ws"."0.7.1" =
     self.by-version."ws"."0.7.1";
   by-version."ws"."0.7.1" = self.buildNodePackage {
@@ -41261,6 +44723,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ws"."^0.7.1" =
+    self.by-version."ws"."0.7.1";
   by-spec."ws"."~0.4.31" =
     self.by-version."ws"."0.4.32";
   by-spec."ws"."~0.7.1" =
@@ -41318,7 +44782,7 @@
       sha1 = "08d016ed165db0c68a192edeb1cdca0f5d43cb22";
     };
     deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -41381,7 +44845,7 @@
     };
     deps = {
       "each-async-1.1.1" = self.by-version."each-async"."1.1.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -41390,19 +44854,19 @@
     cpu = [ ];
   };
   by-spec."xdg-trash"."^1.0.0" =
-    self.by-version."xdg-trash"."1.0.6";
-  by-version."xdg-trash"."1.0.6" = self.buildNodePackage {
-    name = "xdg-trash-1.0.6";
-    version = "1.0.6";
+    self.by-version."xdg-trash"."1.1.0";
+  by-version."xdg-trash"."1.1.0" = self.buildNodePackage {
+    name = "xdg-trash-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.6.tgz";
-      name = "xdg-trash-1.0.6.tgz";
-      sha1 = "5d13427235e5155ea518d8e7df614300c460521c";
+      url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.1.0.tgz";
+      name = "xdg-trash-1.1.0.tgz";
+      sha1 = "219d24c1417ead112d875131e6cde303cb44c51a";
     };
     deps = {
       "each-async-1.1.1" = self.by-version."each-async"."1.1.1";
-      "fs-extra-0.16.3" = self.by-version."fs-extra"."0.16.3";
+      "fs-extra-0.18.2" = self.by-version."fs-extra"."0.18.2";
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
       "xdg-trashdir-1.1.1" = self.by-version."xdg-trashdir"."1.1.1";
     };
@@ -41473,19 +44937,39 @@
     cpu = [ ];
   };
   by-spec."xml2js"."*" =
-    self.by-version."xml2js"."0.4.5";
-  by-version."xml2js"."0.4.5" = self.buildNodePackage {
-    name = "xml2js-0.4.5";
-    version = "0.4.5";
+    self.by-version."xml2js"."0.4.8";
+  by-version."xml2js"."0.4.8" = self.buildNodePackage {
+    name = "xml2js-0.4.8";
+    version = "0.4.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.8.tgz";
+      name = "xml2js-0.4.8.tgz";
+      sha1 = "9fe56bdb2a4931fdfcefb4cedfdb29d89c32f5a1";
+    };
+    deps = {
+      "sax-0.6.1" = self.by-version."sax"."0.6.1";
+      "xmlbuilder-2.6.2" = self.by-version."xmlbuilder"."2.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xml2js"."0.1.x" =
+    self.by-version."xml2js"."0.1.14";
+  by-version."xml2js"."0.1.14" = self.buildNodePackage {
+    name = "xml2js-0.1.14";
+    version = "0.1.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.5.tgz";
-      name = "xml2js-0.4.5.tgz";
-      sha1 = "fc426751b7cf890aaa909a756eede31c7f38a8fc";
+      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
+      name = "xml2js-0.1.14.tgz";
+      sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-2.6.1" = self.by-version."xmlbuilder"."2.6.1";
     };
     optionalDependencies = {
     };
@@ -41533,6 +45017,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."xml2js"."0.2.8" =
+    self.by-version."xml2js"."0.2.8";
+  by-version."xml2js"."0.2.8" = self.buildNodePackage {
+    name = "xml2js-0.2.8";
+    version = "0.2.8";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
+      name = "xml2js-0.2.8.tgz";
+      sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+    };
+    deps = {
+      "sax-0.5.8" = self.by-version."sax"."0.5.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."xml2js"."0.4.4" =
     self.by-version."xml2js"."0.4.4";
   by-version."xml2js"."0.4.4" = self.buildNodePackage {
@@ -41546,7 +45050,7 @@
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-2.6.1" = self.by-version."xmlbuilder"."2.6.1";
+      "xmlbuilder-2.6.2" = self.by-version."xmlbuilder"."2.6.2";
     };
     optionalDependencies = {
     };
@@ -41555,11 +45059,11 @@
     cpu = [ ];
   };
   by-spec."xml2js".">= 0.0.1" =
-    self.by-version."xml2js"."0.4.5";
+    self.by-version."xml2js"."0.4.8";
   by-spec."xml2js".">=0.1.7" =
-    self.by-version."xml2js"."0.4.5";
+    self.by-version."xml2js"."0.4.8";
   by-spec."xml2js"."^0.4.4" =
-    self.by-version."xml2js"."0.4.5";
+    self.by-version."xml2js"."0.4.8";
   by-spec."xml2json".">=0.3.2" =
     self.by-version."xml2json"."0.6.1";
   by-version."xml2json"."0.6.1" = self.buildNodePackage {
@@ -41572,7 +45076,7 @@
       sha1 = "43883d09e4369f96b83316df833cf1fc20d6c3f1";
     };
     deps = {
-      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
+      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -41592,7 +45096,7 @@
       sha1 = "4667011bf0b34e8ec9830cf83e9476659a94d9ba";
     };
     deps = {
-      "node-expat-2.3.6" = self.by-version."node-expat"."2.3.6";
+      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -41659,18 +45163,18 @@
     cpu = [ ];
   };
   by-spec."xmlbuilder".">=1.0.0" =
-    self.by-version."xmlbuilder"."2.6.1";
-  by-version."xmlbuilder"."2.6.1" = self.buildNodePackage {
-    name = "xmlbuilder-2.6.1";
-    version = "2.6.1";
+    self.by-version."xmlbuilder"."2.6.2";
+  by-version."xmlbuilder"."2.6.2" = self.buildNodePackage {
+    name = "xmlbuilder-2.6.2";
+    version = "2.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.1.tgz";
-      name = "xmlbuilder-2.6.1.tgz";
-      sha1 = "ba6921650133e5808288f35dcab0db696a9ba9a0";
+      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz";
+      name = "xmlbuilder-2.6.2.tgz";
+      sha1 = "f916f6d10d45dc171b1be2e6e673fb6e0cc35d0a";
     };
     deps = {
-      "lodash-3.3.0" = self.by-version."lodash"."3.3.0";
+      "lodash-3.5.0" = self.by-version."lodash"."3.5.0";
     };
     optionalDependencies = {
     };
@@ -41678,6 +45182,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."xmlbuilder".">=2.4.6" =
+    self.by-version."xmlbuilder"."2.6.2";
   by-spec."xmldom"."0.1.x" =
     self.by-version."xmldom"."0.1.19";
   by-version."xmldom"."0.1.19" = self.buildNodePackage {
@@ -41744,9 +45250,9 @@
     version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz";
+      url = "https://github.com/rase-/node-XMLHttpRequest/archive/a6b6f2.tar.gz";
       name = "xmlhttprequest-1.5.0.tgz";
-      sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f";
+      sha256 = "f29574bb6dad260b7856b8dcfd432fc9ceb52161b8ee02f387440bb7f6e39f92";
     };
     deps = {
     };
@@ -41756,6 +45262,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."xmlhttprequest"."https://github.com/rase-/node-XMLHttpRequest/archive/a6b6f2.tar.gz" =
+    self.by-version."xmlhttprequest"."1.5.0";
   by-spec."xoauth2"."~0.1.8" =
     self.by-version."xoauth2"."0.1.8";
   by-version."xoauth2"."0.1.8" = self.buildNodePackage {
@@ -41856,6 +45364,8 @@
   };
   by-spec."xtend"."~3.0.0" =
     self.by-version."xtend"."3.0.0";
+  by-spec."xtend"."~4.0.0" =
+    self.by-version."xtend"."4.0.0";
   by-spec."xtraverse"."0.1.x" =
     self.by-version."xtraverse"."0.1.0";
   by-version."xtraverse"."0.1.0" = self.buildNodePackage {
@@ -41914,10 +45424,58 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."yargs"."^1.3.3" =
+    self.by-version."yargs"."1.3.3";
   by-spec."yargs"."~1.3.1" =
     self.by-version."yargs"."1.3.3";
   by-spec."yargs"."~1.3.2" =
     self.by-version."yargs"."1.3.3";
+  by-spec."yargs"."~3.5.4" =
+    self.by-version."yargs"."3.5.4";
+  by-version."yargs"."3.5.4" = self.buildNodePackage {
+    name = "yargs-3.5.4";
+    version = "3.5.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
+      name = "yargs-3.5.4.tgz";
+      sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
+    };
+    deps = {
+      "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2";
+      "decamelize-1.0.0" = self.by-version."decamelize"."1.0.0";
+      "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
+      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."yargs"."~3.6.0" =
+    self.by-version."yargs"."3.6.0";
+  by-version."yargs"."3.6.0" = self.buildNodePackage {
+    name = "yargs-3.6.0";
+    version = "3.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yargs/-/yargs-3.6.0.tgz";
+      name = "yargs-3.6.0.tgz";
+      sha1 = "587e098615d8f627ffbf53ebb61eac827268e51a";
+    };
+    deps = {
+      "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2";
+      "decamelize-1.0.0" = self.by-version."decamelize"."1.0.0";
+      "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
+      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."zeparser"."0.0.5" =
     self.by-version."zeparser"."0.0.5";
   by-version."zeparser"."0.0.5" = self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 4c8e5bbcd88..11fd19af29b 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -31,7 +31,7 @@
 , "browserchannel"
 , "node-gyp"
 , "semver"
-, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.11.0" }
+, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
 , "ansi-remover"
 , "mkdirp"
 , "jshint"
@@ -66,7 +66,7 @@
 , "flatiron"
 , "ironhorse"
 , "fs-walk"
-, "statsd"
+, { "statsd": "https://github.com/etsy/statsd/tarball/23b331895cc4b22b64a19fd0e7b6def6f6f30d9e"}
 , "statsd-librato-backend"
 , "stackdriver-statsd-backend"
 , "statsd-influxdb-backend"
@@ -147,7 +147,7 @@
 , "empty-trash"
 , "castnow"
 , "parsoid"
-, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy" }
+, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
 , "react-tools"
 , "json"
 , "bipio"
@@ -192,4 +192,6 @@
 , "bip-pod-github"
 , "sleep"
 , "node-red"
+, "sinopia"
+, "docker-registry-server"
 ]
diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix
index b418f59e33c..fca110d2a01 100644
--- a/pkgs/top-level/node-packages.nix
+++ b/pkgs/top-level/node-packages.nix
@@ -63,7 +63,6 @@ in rec {
         sha1 = "26220f7e43ee3c0d714860db61c4d0ecc9bb3d89";
       }} ../webdrvr/chromedriver_linux64.zip
     '';
-    statsd.skipOptionalDependencies = ["hashring" "node-syslog"];
   } // args.overrides or {};
 
   # Apply overrides and back compatiblity transformations
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 81a1701ac77..9a17e21e9cf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -104,11 +104,11 @@ let self = _self // overrides; _self = with self; {
     propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK ModulePluggable ];
   };
 
-  AnyEvent = buildPerlPackage {
-    name = "AnyEvent-7.07";
+  AnyEvent = buildPerlPackage rec {
+    name = "AnyEvent-7.08";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.07.tar.gz;
-      sha256 = "01iilh11xc2gw6fxxr6il3r6n1k4cf6swaddgbhi525wfzlchk2c";
+      url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz";
+      sha256 = "16nnqzxy5baiar6gxnq5w296mmjgijcn1jq8rp867nksph03mxz8";
     };
     meta = {
       maintainers = with maintainers; [ ocharles ];
@@ -117,10 +117,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AnyEventI3 = buildPerlPackage rec {
-    name = "AnyEvent-I3-0.15";
+    name = "AnyEvent-I3-0.16";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz";
-      sha256 = "0x8zi06667bdgaxn7driqx0d71mp6021r51hdzmj5m5qbhi2hvqi";
+      sha256 = "1qwva5vmmn929l6k9wzhp4h80ad4qm4m1g2dyv4nlas624003hig";
     };
     propagatedBuildInputs = [ AnyEvent JSONXS ];
     meta = {
@@ -6727,7 +6727,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0s0albdw0zvg3w37s7is7gddr4mqwicjxxsy400n1p96l7ipnw4x";
     };
     meta = {
-      description = "Mozilla's ldap client library.";
+      description = "Mozilla's ldap client library";
       license = "unknown";
     };
   };
@@ -7353,6 +7353,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ParseDebControl = buildPerlPackage rec {
+    name = "Parse-DebControl-2.005";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JA/JAYBONCI/${name}.tar.gz";
+      sha256 = "0ad78qri4sg9agghqdm83xsjgks94yvffs23kppy7mqjy8gwwjxn";
+    };
+    buildInputs = [ TestPod LWPUserAgent ];
+    propagatedBuildInputs = [ IOStringy ];
+    meta = with stdenv.lib; {
+      homepage = http://search.cpan.org/~jaybonci/Parse-DebControl;
+      license = with licenses; [ artistic1 gpl1Plus ];
+      maintainers = with maintainers; [ nckx ];
+    };
+  };
+
   ParseRecDescent = buildPerlPackage rec {
     name = "Parse-RecDescent-1.967009";
     src = fetchurl {
@@ -10573,10 +10588,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   X11XCB = buildPerlPackage rec {
-    name = "X11-XCB-0.11";
+    name = "X11-XCB-0.12";
     src = fetchurl {
       url = "mirror://cpan/authors/id/M/MS/MSTPLBG/${name}.tar.gz";
-      sha256 = "18i3z1fzw76kl9n5driys12r6vhp3r6rmb2pjn5nc7m9n4bwgh38";
+      sha256 = "15jq55qcc27s5bn925pwry0vx2f4d42rlyz2hlfglnn2qnhsp37s";
     };
     AUTOMATED_TESTING = false;
     buildInputs = [
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d3d0d179af..e241fc6fc6d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -50,6 +50,32 @@ let
     { deps = pkgs.makeWrapper;
       substitutions.libPrefix = python.libPrefix;
       substitutions.executable = "${python}/bin/${python.executable}";
+      substitutions.magicalSedExpression = let
+        # Looks weird? Of course, it's between single quoted shell strings.
+        # NOTE: Order DOES matter here, so single character quotes need to be
+        #       at the last position.
+        quoteVariants = [ "'\"'''\"'" "\"\"\"" "\"" "'\"'\"'" ]; # hey Vim: ''
+
+        mkStringSkipper = labelNum: quote: let
+          label = "q${toString labelNum}";
+          isSingle = elem quote [ "\"" "'\"'\"'" ];
+          endQuote = if isSingle then "[^\\\\]${quote}" else quote;
+        in ''
+          /^ *[a-z]?${quote}/ {
+            /${quote}${quote}|${quote}.*${endQuote}/{n;br}
+            :${label}; n; /^${quote}/{n;br}; /${endQuote}/{n;br}; b${label}
+          }
+        '';
+
+      in ''
+        1 {
+          /^#!/!b; :r
+          /\\$/{N;br}
+          /__future__|^ *(#.*)?$/{n;br}
+          ${concatImapStrings mkStringSkipper quoteVariants}
+          /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"'
+        }
+      '';
     }
    ../development/python-modules/generic/wrap.sh;
 
@@ -255,6 +281,22 @@ let
   };
 
 
+  alabaster = buildPythonPackage rec {
+    name = "alabaster-0.7.3";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/alabaster/${name}.tar.gz";
+      md5 = "67428d1383fd833f1282fed5deba0898";
+    };
+
+    meta = {
+      homepage = https://github.com/bitprophet/alabaster;
+      description = "a Sphinx theme";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
+
+
   alembic = buildPythonPackage rec {
     name = "alembic-0.6.6";
 
@@ -394,7 +436,7 @@ let
 
     meta = {
       homepage = http://github.com/celery/py-amqp;
-      description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project.";
+      description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project";
       license = licenses.lgpl21;
     };
   };
@@ -417,6 +459,37 @@ let
     };
   };
 
+  apipkg = buildPythonPackage rec {
+    name = "apipkg-1.4";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/apipkg/${name}.tar.gz";
+      md5 = "17e5668601a2322aff41548cb957e7c8";
+    };
+
+    buildInputs = with self; [ ];
+
+    meta = {
+      description = "namespace control and lazy-import mechanism";
+      homepage = "http://bitbucket.org/hpk42/apipkg";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
+  appdirs = buildPythonPackage rec {
+    name = "appdirs-1.4.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/appdirs/appdirs-1.4.0.tar.gz";
+      md5 = "1d17b4c9694ab84794e228f28dc3275b";
+    };
+
+    meta = with stdenv.lib; {
+      description = "A python module for determining appropriate platform-specific dirs";
+      homepage = http://github.com/ActiveState/appdirs;
+      license = licenses.mit;
+    };
+  };
 
   application = buildPythonPackage rec {
     name = "python-application-${version}";
@@ -485,11 +558,11 @@ let
 
   arrow = buildPythonPackage rec {
     name = "arrow-${version}";
-    version = "0.4.4";
+    version = "0.5.0";
 
     src = pkgs.fetchurl {
       url    = "https://pypi.python.org/packages/source/a/arrow/${name}.tar.gz";
-      sha256 = "1sdr4gyjgvz86yr0ll0i11mgy8l1slndr7f0ngam87rpy78gp052";
+      sha256 = "1q3a6arjm6ysl2ff6lgdm504np7b1rbivrzspybjypq1nczcb7qy";
     };
 
     doCheck = false;
@@ -596,7 +669,7 @@ let
     };
 
     meta = {
-      description = "Utilities and Python modules for handling audio.";
+      description = "Utilities and Python modules for handling audio";
       homepage = "http://audiotools.sourceforge.net/";
       license = stdenv.lib.licenses.gpl2Plus;
     };
@@ -722,7 +795,7 @@ let
 
     meta = {
       homepage = http://pypi.python.org/pypi/babelfish;
-      description = "A module to work with countries and languages.";
+      description = "A module to work with countries and languages";
       license = stdenv.lib.licenses.bsd3;
     };
   };
@@ -974,6 +1047,24 @@ let
     };
   };
 
+  proboscis = pythonPackages.buildPythonPackage rec {
+    name = "proboscis-1.2.6.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/proboscis/proboscis-1.2.6.0.tar.gz";
+      md5 = "e4b36449ef7c18f70b8243f4c8bddbca";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [ nose ];
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG";
+      homepage = https://github.com/rackspace/python-proboscis;
+      license = licenses.asl20;
+    };
+  };
+
   pyechonest = self.buildPythonPackage rec {
     name = "pyechonest-8.0.2";
 
@@ -1082,7 +1173,7 @@ let
     propagatedBuildInputs = with self; [ six html5lib ];
 
     meta = with stdenv.lib; {
-      description = "An easy, HTML5, whitelisting HTML sanitizer.";
+      description = "An easy, HTML5, whitelisting HTML sanitizer";
       longDescription = ''
         Bleach is an HTML sanitizing library that escapes or strips markup and
         attributes based on a white list. Bleach can also linkify text safely,
@@ -2386,11 +2477,11 @@ let
 
 
   deform = buildPythonPackage rec {
-    name = "deform-0.9.9";
+    name = "deform-2.0a2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
-      sha256 = "0ympsjhxz5v8h4hi1mv811h064221bh26d68l9hv1x6m7sxbxpd0";
+      md5 = "7a90d41f7fbc18002ce74f39bd90a5e4";
     };
 
     buildInputs = with self; [] ++ optional isPy26 unittest2;
@@ -2532,11 +2623,11 @@ let
   };
 
   docker = buildPythonPackage rec {
-    name = "docker-py-0.4.0";
+    name = "docker-py-1.1.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz";
-      md5 = "21ab8fd729105487e6423b654d6c0860";
+      md5 = "b44f34530a21ed1129887f9a8b01ecec";
     };
 
     propagatedBuildInputs = with self; [ six requests websocket_client ];
@@ -3049,6 +3140,36 @@ let
     propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ];
   };
 
+  gmusicapi = with pkgs; pythonPackages.buildPythonPackage rec {
+    name = "gmusicapi-4.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gmusicapi/gmusicapi-4.0.0.tar.gz";
+      md5 = "12ba66607531978b349c7035c9bab311";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [
+      validictory
+      decorator
+      mutagen
+      protobuf
+      setuptools
+      requests
+      dateutil
+      proboscis
+      mock
+      appdirs
+      oauth2client
+    ];
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "An unofficial API for Google Play Music";
+      homepage = http://pypi.python.org/pypi/gmusicapi/;
+      license = licenses.bsd3;
+    };
+  };
+
   gnutls = buildPythonPackage rec {
     name = "python-gnutls";
     src = pkgs.fetchurl {
@@ -3285,6 +3406,92 @@ let
     };
   };
 
+  mwlib = buildPythonPackage rec {
+    version = "0.15.15";
+    name = "mwlib-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.pediapress.com/packages/mirror/${name}.tar.gz";
+      sha256 = "1dnmnkc21zdfaypskbpvkwl0wpkpn0nagj1fc338w64mbxrk8ny7";
+    };
+
+    commonDeps = with self;
+      [
+        apipkg
+        bottle
+        gevent
+        lxml
+        odfpy
+        pillow
+        py
+        pyPdf
+        pyparsing1
+        qserve
+        roman
+        simplejson
+        sqlite3dbm
+        timelib
+      ];
+
+    pythonPath = commonDeps ++
+      [
+        modules.sqlite3
+      ];
+
+    propagatedBuildInputs = commonDeps;
+
+    buildInputs = with self;
+      [
+        pil
+      ] ++ propagatedBuildInputs;
+
+    meta = {
+      description = "Library for parsing MediaWiki articles and converting them to different output formats";
+      homepage = "http://pediapress.com/code/";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
+
+  mwlib-ext = buildPythonPackage rec {
+    version = "0.13.2";
+    name = "mwlib.ext-${version}";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.pediapress.com/packages/mirror/${name}.zip";
+      md5 = "36193837359204d3337b297ba0f20bc8";
+    };
+
+    meta = {
+      description = "dependencies for mwlib markup";
+      homepage = "http://pediapress.com/code/";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
+
+  mwlib-rl = buildPythonPackage rec {
+    version = "0.14.6";
+    name = "mwlib.rl-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.pediapress.com/packages/mirror/${name}.zip";
+      md5 = "49d72b0172f69cbe039f62dd4efb65ea";
+    };
+
+    buildInputs = with self;
+      [
+        mwlib
+        mwlib-ext
+        pygments
+      ];
+
+    meta = {
+      description = "generate pdfs from mediawiki markup";
+      homepage = "http://pediapress.com/code/";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
+
   logster = buildPythonPackage {
     name = "logster-7475c53822";
     src = pkgs.fetchgit {
@@ -3294,6 +3501,26 @@ let
     };
   };
 
+  odfpy = buildPythonPackage rec {
+    version = "0.9.6";
+    name = "odfpy-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/o/odfpy/${name}.tar.gz";
+      md5 = "3f570ead2b5f5eb6eab97eecce22d491";
+    };
+
+    buildInputs = with self; with pkgs; [ ];
+
+    propagatedBuildInputs = with self; [ ];
+
+    meta = {
+      description = "Python API and tools to manipulate OpenDocument files";
+      homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
+      license = stdenv.lib.licenses.asl20;
+    };
+  };
+
   pathtools = buildPythonPackage rec {
     name = "pathtools-${version}";
     version = "0.1.2";
@@ -3354,11 +3581,11 @@ let
 
 
   peppercorn = buildPythonPackage rec {
-    name = "peppercorn-0.4";
+    name = "peppercorn-0.5";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/peppercorn/${name}.tar.gz";
-      md5 = "464d6f2342eaf704dfb52046c1f5c320";
+      md5 = "f08efbca5790019ab45d76b7244abd40";
     };
 
     meta = {
@@ -3438,11 +3665,11 @@ let
 
 
   pyramid = buildPythonPackage rec {
-    name = "pyramid-1.5.1";
+    name = "pyramid-1.5.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz";
-      md5 = "8a1ab3b773d8e22437828f7df22852c1";
+      md5 = "d56b140b41d42f818f4349d94d968c9a";
     };
 
     preCheck = ''
@@ -3582,11 +3809,11 @@ let
 
 
   pyramid_tm = buildPythonPackage rec {
-    name = "pyramid_tm-0.7";
+    name = "pyramid_tm-0.10";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyramid_tm/${name}.tar.gz";
-      md5 = "6dc917d262c69366630c542bd21859a3";
+      md5 = "89a293488093d6c30036345fa46184d2";
     };
 
     # tests are failing in version 0.7 but are fixed in trunk
@@ -3683,6 +3910,26 @@ let
     };
   };
 
+  roman = buildPythonPackage rec {
+    version = "2.0.0";
+    name = "roman-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/r/roman/${name}.zip";
+      md5 = "aa71d131eec16d45c030fd06a27c9d17";
+    };
+
+    buildInputs = with self; with pkgs; [ ];
+
+    propagatedBuildInputs = with self; [ ];
+
+    meta = {
+      description = "Integer to Roman numerals converter";
+      homepage = "https://pypi.python.org/pypi/roman";
+      license = stdenv.lib.licenses.psfl;
+    };
+  };
+
 
   hypatia = buildPythonPackage rec {
     name = "hypatia-0.3";
@@ -4011,11 +4258,11 @@ let
 
 
   zope_deprecation = buildPythonPackage rec {
-    name = "zope.deprecation-3.5.1";
+    name = "zope.deprecation-4.1.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.deprecation/${name}.tar.gz";
-      md5 = "836cfea5fad548cd5a0d9af1300ec05e";
+      md5 = "e9a663ded58f4f9f7881beb56cae2782";
     };
 
     buildInputs = with self; [ zope_testing ];
@@ -4029,13 +4276,30 @@ let
     };
   };
 
+  validictory = pythonPackages.buildPythonPackage rec {
+    name = "validictory-1.0.0a2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/v/validictory/validictory-1.0.0a2.tar.gz";
+      md5 = "54c206827931cc4ed8a9b1cc78e380c5";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [  ];
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "Validate dicts against a schema";
+      homepage = http://github.com/sunlightlabs/validictory;
+      license = licenses.mit;
+    };
+  };
 
   venusian = buildPythonPackage rec {
-    name = "venusian-1.0a7";
+    name = "venusian-1.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/v/venusian/${name}.tar.gz";
-      md5 = "6f67506dd3cf77116f1c01682a6c3f27";
+      md5 = "dccf2eafb7113759d60c86faf5538756";
     };
 
     # TODO: https://github.com/Pylons/venusian/issues/23
@@ -4168,6 +4432,31 @@ let
 
   django = self.django_1_7;
 
+  django_1_8 = buildPythonPackage rec {
+    name = "Django-${version}";
+    version = "1.8";
+    disabled = pythonOlder "2.7";
+
+    src = pkgs.fetchurl {
+      url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
+      sha256 = "04mlx3920r46vn69alrf4bmv1xqp7m6k1xzwgr798rjcrd1assq6";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    # patch only $out/bin to avoid problems with starter templates (see #3134)
+    postFixup = ''
+      wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    '';
+
+    meta = {
+      description = "A high-level Python Web framework";
+      homepage = https://www.djangoproject.com/;
+    };
+  };
+
+
   django_1_7 = buildPythonPackage rec {
     name = "Django-${version}";
     version = "1.7.7";
@@ -4181,6 +4470,11 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
+    # patch only $out/bin to avoid problems with starter templates (see #3134)
+    postFixup = ''
+      wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    '';
+
     meta = {
       description = "A high-level Python Web framework";
       homepage = https://www.djangoproject.com/;
@@ -4199,6 +4493,11 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
+    # patch only $out/bin to avoid problems with starter templates (see #3134)
+    postFixup = ''
+      wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    '';
+
     meta = {
       description = "A high-level Python Web framework";
       homepage = https://www.djangoproject.com/;
@@ -4217,6 +4516,11 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
+    # patch only $out/bin to avoid problems with starter templates (see #3134)
+    postFixup = ''
+      wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    '';
+
     meta = {
       description = "A high-level Python Web framework";
       homepage = https://www.djangoproject.com/;
@@ -4235,6 +4539,11 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
+    # patch only $out/bin to avoid problems with starter templates (see #3134)
+    postFixup = ''
+      wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    '';
+
     meta = {
       description = "A high-level Python Web framework";
       homepage = https://www.djangoproject.com/;
@@ -4252,6 +4561,11 @@ let
     # error: invalid command 'test'
     doCheck = false;
 
+    # patch only $out/bin to avoid problems with starter templates (see #3134)
+    postFixup = ''
+      wrapPythonProgramsIn $out/bin "$out $pythonPath"
+    '';
+
     meta = {
       description = "A high-level Python Web framework";
       homepage = https://www.djangoproject.com/;
@@ -4308,7 +4622,7 @@ let
     };
 
     propagatedBuildInputs = with self; [ django_1_7 ];
-    
+
     # tests appear to be broken on 0.6.1 at least
     doCheck = ( version != "0.6.1" );
 
@@ -4399,11 +4713,11 @@ let
 
 
   docutils = buildPythonPackage rec {
-    name = "docutils-0.11";
+    name = "docutils-0.12";
 
     src = pkgs.fetchurl {
       url = "mirror://sourceforge/docutils/${name}.tar.gz";
-      sha256 = "1jbybs5a396nrjy9m13pgvsxdwaj7jw7nsawkhl4fi1nvxm1dx4s";
+      md5 = "4622263b62c5c771c03502afa3157768";
     };
 
     # error: invalid command 'test'
@@ -4616,27 +4930,27 @@ let
     };
   });
 
-  fig = buildPythonPackage rec {
-    name = "fig-1.0.1";
+  docker_compose = buildPythonPackage rec {
+    name = "docker-compose-1.2.0rc2";
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/fig/${name}.tar.gz";
-      md5 = "e1c82296fe2362fae21b3cb0dfee8cb2";
+      url = "https://pypi.python.org/packages/source/d/docker-compose/${name}.tar.gz";
+      md5 = "311ec5023e51097ca3acbf37fac062bd";
     };
 
     propagatedBuildInputs = with self; [
-      six requests2 pyyaml texttable docopt
-      (dockerpty.override {
+      six requests pyyaml texttable docopt docker
+      (requests2.override {
         src = pkgs.fetchurl {
-          url = "https://pypi.python.org/packages/source/d/dockerpty/dockerpty-0.3.2.tar.gz";
-          md5 = "1f97b24d2f4b2c345f176f91655002dd";
+          url = "https://pypi.python.org/packages/source/r/requests/requests-2.5.3.tar.gz";
+          md5 = "23bf4fcc89ea8d353eb5353bb4a475b1";
         };
       })
-      (docker.override {
+      (dockerpty.override {
         src = pkgs.fetchurl {
-          url = "https://pypi.python.org/packages/source/d/docker-py/docker-py-0.5.3.tar.gz";
-          md5 = "809b7b8c144f5e37787e72b030ee353f";
+          url = "https://pypi.python.org/packages/source/d/dockerpty/dockerpty-0.3.2.tar.gz";
+          md5 = "1f97b24d2f4b2c345f176f91655002dd";
         };
       })
       (websocket_client.override {
@@ -4686,11 +5000,11 @@ let
   };
 
   flake8 = buildPythonPackage (rec {
-    name = "flake8-2.1.0";
+    name = "flake8-2.3.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz";
-      md5 = "cf326cfb88a1db6c5b29a3a6d9efb257";
+      md5 = "488d6166f6b9ef9fe9d433b95e77dc07";
     };
 
     buildInputs = with self; [ nose mock ];
@@ -5299,14 +5613,14 @@ let
 
   glances = buildPythonPackage rec {
     name = "glances-${version}";
-    version = "2.1";
+    version = "2.3";
     disabled = isPyPy;
 
     src = pkgs.fetchFromGitHub {
       owner = "nicolargo";
       repo = "glances";
       rev = "v${version}";
-      sha256 = "1bgr7lif0bpnz39arcdrsfdy7ra4c3ay2pxz1lvh4fqxyxwp3gm6";
+      sha256 = "09x9g4wzfxfhpby3aa1fbhw3iqv1vyd6h526nrm9612ba5d0myh9";
     };
 
     doCheck = false;
@@ -5325,7 +5639,7 @@ let
   };
 
   goobook = buildPythonPackage rec {
-    name = "goobook-1.5";
+    name = "goobook-1.6";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
@@ -5333,7 +5647,7 @@ let
       sha256 = "05vpriy391l5i05ckl5ja5bswqyvl3rwrbmks9pi46w1813j7p5z";
     };
 
-    buildInputs = with self; [ six ];
+    buildInputs = with self; [ ];
 
     preConfigure = ''
       sed -i '/distribute/d' setup.py
@@ -5343,11 +5657,11 @@ let
       description = "Search your google contacts from the command-line or mutt";
       homepage    = https://pypi.python.org/pypi/goobook;
       license     = licenses.gpl3;
-      maintainers = with maintainers; [ lovek323 ];
+      maintainers = with maintainers; [ lovek323 hbunke ];
       platforms   = platforms.unix;
     };
 
-    propagatedBuildInputs = with self; [ gdata hcs_utils keyring simplejson ];
+    propagatedBuildInputs = with self; [ gdata hcs_utils keyring simplejson six];
   };
 
   google_api_python_client = buildPythonPackage rec {
@@ -5471,7 +5785,7 @@ let
     meta = {
       homepage = http://pypi.python.org/pypi/guessit;
       license = stdenv.lib.licenses.lgpl3;
-      description = "A library for guessing information from video files.";
+      description = "A library for guessing information from video files";
     };
   };
 
@@ -5914,7 +6228,7 @@ let
 
     meta = with stdenv.lib; {
       homepage = http://maebert.github.io/jrnl/;
-      description = "A simple command line journal application that stores your journal in a plain text file.";
+      description = "A simple command line journal application that stores your journal in a plain text file";
       license = licenses.mit;
     };
   };
@@ -6336,14 +6650,21 @@ let
 
 
   mccabe = buildPythonPackage (rec {
-    name = "mccabe-0.2.1";
+    name = "mccabe-0.3";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz";
-      md5 = "5a3f3fa6a4bad126c88aaaa7dab682f5";
+      md5 = "81640948ff226f8c12b3277059489157";
     };
 
-    buildInputs = with self; [ ];
+    # See https://github.com/flintwork/mccabe/issues/31
+    postPatch = ''
+      cp "${pkgs.fetchurl {
+        url = "https://raw.githubusercontent.com/flintwork/mccabe/"
+            + "e8aea16d28e92bd3c62601275762fc9c16808f6c/test_mccabe.py";
+        sha256 = "0xhjxpnaxvbpi4myj9byrban7a5nrw931br9sgvfk42ayg4sn6lm";
+      }}" test_mccabe.py
+    '';
 
     meta = {
       description = "McCabe checker, plugin for flake8";
@@ -6455,7 +6776,7 @@ let
 
     meta = with stdenv.lib; {
       description = ''
-        A content management platform built using the Django framework.
+        A content management platform built using the Django framework
       '';
       longDescription = ''
         Mezzanine is a powerful, consistent, and flexible content management
@@ -6500,11 +6821,11 @@ let
 
   rainbowstream = buildPythonPackage rec {
     name = "rainbowstream-${version}";
-    version = "1.1.6";
+    version = "1.2.5";
 
     src = pkgs.fetchurl {
       url    = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz";
-      sha256 = "04i2a8a5k6n6lgfpa9bzzbkhvywgd4bn3qlspl97pn8ply9kgszm";
+      sha256 = "1fch1vckzf4nmq67fk2jgfxpvyygviavx8di4xhjq2mib9nfc3mr";
     };
 
     doCheck = false;
@@ -6957,12 +7278,12 @@ let
   nameparser = buildPythonPackage rec {
     name = "nameparser-${version}";
     version = "0.3.4";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/nameparser/${name}.tar.gz";
       sha256 = "1zi94m99ziwwd6kkip3w2xpnl05r2cfv9iq68inz7np81c3g8vag";
     };
-    
+
     meta = {
       description = "A simple Python module for parsing human names into their individual components";
       homepage = https://github.com/derek73/python-nameparser;
@@ -7393,8 +7714,8 @@ let
     };
 
     meta = {
-      homepage = "http://code.google.com/p/oauth";
-      description = "Library for OAuth version 1.0a.";
+      homepage = http://code.google.com/p/oauth;
+      description = "Library for OAuth version 1.0a";
       license = licenses.mit;
       platforms = stdenv.lib.platforms.all;
     };
@@ -7425,6 +7746,23 @@ let
     };
   });
 
+  oauth2client = pythonPackages.buildPythonPackage rec {
+    name = "oauth2client-1.4.7";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/o/oauth2client/oauth2client-1.4.7.tar.gz";
+      md5 = "62747643d5af57e57b09e176eda1c1dd";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [ httplib2 pyasn1 pyasn1-modules rsa ];
+    doCheck = false;
+
+    meta = with stdenv.lib; {
+      description = "A client library for OAuth 2.0";
+      homepage = http://github.com/google/oauth2client/;
+      license = licenses.bsd2;
+    };
+  };
 
   oauthlib = buildPythonPackage rec {
     version = "0.7.2";
@@ -7450,12 +7788,12 @@ let
 
   obfsproxy = buildPythonPackage ( rec {
     name = "obfsproxy-${version}";
-    version = "0.2.12";
+    version = "0.2.13";
 
     src = pkgs.fetchgit {
       url = meta.repositories.git;
       rev = "refs/tags/${name}";
-      sha256 = "82d694aa7f3de7327fc4dc517fb262ab076f536ed6d4377573c76df8cf019dcf";
+      sha256 = "16jb8x5hbs3g4dq10y6rqc1005bnffwnlws8x7j1d96n7k9mjn8h";
     };
 
     propagatedBuildInputs = with self;
@@ -7792,7 +8130,7 @@ let
 
     propagatedBuildInputs = with self; [
       jinja2 pygments docutils pytz unidecode six dateutil feedgenerator
-      blinker pillow beautifulsoup4
+      blinker pillow beautifulsoup4 markupsafe
     ];
 
     meta = {
@@ -7877,11 +8215,11 @@ let
 
 
   pg8000 = buildPythonPackage rec {
-    name = "pg8000-1.9.14";
+    name = "pg8000-1.10.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pg8000/${name}.tar.gz";
-      sha256 = "1vandvfaf1m3a1fbc7nbm6syfqr9bazhzsnmai0jpjkbmb349izs";
+      md5 = "173275fd76628b0e0cbed70ed9ce9eb9";
     };
 
     propagatedBuildInputs = with self; [ pytz ];
@@ -7978,6 +8316,12 @@ let
           -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ;
               s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ;
               s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;'
+    ''
+    # Remove impurities
+    + stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace setup.py \
+        --replace '"/Library/Frameworks",' "" \
+        --replace '"/System/Library/Frameworks"' ""
     '';
 
     checkPhase = "${python}/bin/${python.executable} selftest.py";
@@ -8019,10 +8363,16 @@ let
               s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
               s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;
               s|^TCL_ROOT=.*$|TCL_ROOT = _lib_include("${pkgs.tcl}")|g ;'
+    ''
+    # Remove impurities
+    + stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace setup.py \
+        --replace '"/Library/Frameworks",' "" \
+        --replace '"/System/Library/Frameworks"' ""
     '';
 
     meta = {
-      homepage = http://python-imaging.github.com/Pillow;
+      homepage = "https://python-pillow.github.io/";
 
       description = "Fork of The Python Imaging Library (PIL)";
 
@@ -9141,6 +9491,21 @@ let
 
     meta = {
       homepage = http://pyparsing.wikispaces.com/;
+      description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
+    };
+  };
+
+  pyparsing1 = buildPythonPackage rec {
+    name = "pyparsing-1.5.7";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyparsing/${name}.tar.gz";
+      md5 = "9be0fcdcc595199c646ab317c1d9a709";
+    };
+
+    meta = {
+      homepage = http://pyparsing.wikispaces.com/;
       description = "The pyparsing module is an alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions.";
     };
   };
@@ -9239,6 +9604,22 @@ let
     };
   };
 
+  PyStemmer = buildPythonPackage (rec {
+    name = "PyStemmer-1.3.0";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/P/PyStemmer/${name}.tar.gz";
+      md5 = "46ee623eeeba5a7cc0d95cbfa7e18abd";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Snowball stemming algorithms, for information retrieval";
+      homepage = http://snowball.tartarus.org/;
+      license = licenses.mit;
+      platforms = platforms.unix;
+    };
+  });
+
   pyro3 = buildPythonPackage (rec {
     name = "Pyro-3.16";
     disabled = isPy3k;
@@ -9480,6 +9861,22 @@ let
     };
   };
 
+  pyPdf = buildPythonPackage rec {
+    name = "pyPdf-1.13";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pyPdf/${name}.tar.gz";
+      md5 = "7a75ef56f227b78ae62d6e38d4b6b1da";
+    };
+
+    buildInputs = with self; [ ];
+
+    meta = {
+      description = "Pure-Python PDF toolkit";
+      homepage = "http://pybrary.net/pyPdf/";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
 
   pyopengl = buildPythonPackage rec {
     name = "pyopengl-${version}";
@@ -9989,6 +10386,24 @@ let
     };
   };
 
+  qserve = buildPythonPackage rec {
+    name = "qserve-0.2.8";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/q/qserve/${name}.zip";
+      md5 = "d481f0dad66a93d0479022fe0487e8ee";
+    };
+
+    buildInputs = with self; [ ];
+
+    meta = {
+      description = "job queue server";
+      homepage = "https://github.com/pediapress/qserve";
+      license = stdenv.lib.licenses.bsd3;
+    };
+  };
+
   quantities = buildPythonPackage rec {
     name = "quantities-0.10.1";
 
@@ -10163,13 +10578,13 @@ let
   };
 
   robotframework = buildPythonPackage rec {
-    version = "2.8.6";
+    version = "2.8.7";
     name = "robotframework-${version}";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz";
-      sha256 = "0hl44pwfkagr5272s90y0bkfllj0q1l4yw4rvkdrc6ikn6l61d9v";
+      sha256 = "0mfd0s989j3jrpl8q0lb4wsjy1x280chfr9r74m2dyi9c7rxzc58";
     };
 
     # error: invalid command 'test'
@@ -10718,6 +11133,42 @@ let
     };
   };
 
+  snowballstemmer = buildPythonPackage rec {
+    name = "snowballstemmer-1.2.0";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/snowballstemmer/${name}.tar.gz";
+      md5 = "51f2ef829db8129dd0f2354f0b209970";
+    };
+
+    propagatedBuildInputs = with self; [ PyStemmer ];
+
+    meta = with stdenv.lib; {
+      description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms";
+      homepage = http://sigal.saimon.org/en/latest/index.html;
+      license = licenses.bsd3;
+      platforms = platforms.unix;
+    };
+  };
+
+  sqlite3dbm = buildPythonPackage rec {
+    name = "sqlite3dbm-0.1.4";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/sqlite3dbm/${name}.tar.gz";
+      md5 = "fc2f8fb09a4bbc0260b97e835b369184";
+    };
+
+    buildInputs = with self; [ modules.sqlite3 ];
+
+    meta = with stdenv.lib; {
+      description = "sqlite-backed dictionary";
+      homepage = "http://github.com/Yelp/sqlite3dbm";
+      license = stdenv.lib.licenses.asl20;
+    };
+  };
+
   pgpdump = self.buildPythonPackage rec {
     name = "pgpdump-1.5";
 
@@ -10794,6 +11245,23 @@ let
     };
   };
 
+  timelib = buildPythonPackage rec {
+    name = "timelib-0.2.4";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/timelib/${name}.zip";
+      md5 = "400e316f81001ec0842fa9b2cef5ade9";
+    };
+
+    buildInputs = with self; [ ];
+
+    meta = {
+      description = "parse english textual date descriptions";
+      homepage = "https://github.com/pediapress/timelib/";
+      license = stdenv.lib.licenses.zlib;
+    };
+  };
+
   pydns = buildPythonPackage rec {
     name = "pydns-2.3.6";
     disabled = isPy3k;
@@ -11159,21 +11627,42 @@ let
 
 
   sphinx = buildPythonPackage (rec {
-    name = "Sphinx-1.2.3";
+    name = "Sphinx-1.3.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
-      md5 = "a98c93124035b4cd7183604aec656cb3";
+      md5 = "8786a194acf9673464c5455b11fd4332";
     };
 
-    propagatedBuildInputs = with self; [docutils jinja2 pygments];
-
-    meta = {
-      description = "Sphinx is a tool that makes it easy to create intelligent and beautiful documentation for Python projects.";
+    propagatedBuildInputs = with self; [ docutils jinja2 pygments sphinx_rtd_theme alabaster Babel snowballstemmer  six ];
 
+    meta = with stdenv.lib; {
+      description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects";
       homepage = http://sphinx.pocoo.org/;
+      license = licenses.bsd3;
+      platforms = platforms.unix;
+    };
+  });
 
-      license = "BSD";
+
+  sphinx_rtd_theme = buildPythonPackage (rec {
+    name = "sphinx_rtd_theme-0.1.7";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz";
+      md5 = "3ffe014445195705968d899c38b305fd";
+    };
+
+    postPatch = ''
+      rm requirements.txt
+      touch requirements.txt
+    '';
+
+    meta = with stdenv.lib; {
+      description = "ReadTheDocs.org theme for Sphinx, 2013 version";
+      homepage = https://github.com/snide/sphinx_rtd_theme/;
+      license = licenses.bsd3;
+      platforms = platforms.unix;
     };
   });
 
@@ -11952,11 +12441,11 @@ let
 
 
   turses = buildPythonPackage (rec {
-    name = "turses-0.2.22";
+    name = "turses-0.2.23";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
-      sha256 = "1dqgvdqly4c4d6819mbkqy4g8r7zch4dkmxicfwck7q8h96wmyx3";
+      md5 = "71b9e3ab12d9186798e739b5273d1438";
     };
 
     propagatedBuildInputs = with self; [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
@@ -11980,7 +12469,7 @@ let
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
-      sha256 = "0wcj5g21brcqr1g7m4by4rs72lfiib4scg19qynn2wz1x77jyrzp";
+      md5 = "065c80d244360988c61d64b5dfb7e229";
     };
 
     meta = {
@@ -12173,14 +12662,14 @@ let
 
 
   urwid = buildPythonPackage (rec {
-    name = "urwid-1.2.1";
+    name = "urwid-1.3.0";
 
     # multiple:  NameError: name 'evl' is not defined
     doCheck = false;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/u/urwid/${name}.tar.gz";
-      md5 = "6a05ada11b87e7b026b01fc5150855b0";
+      md5 = "a989acd54f4ff1a554add464803a9175";
     };
 
     meta = {
@@ -12325,11 +12814,11 @@ let
   });
 
   waitress = buildPythonPackage rec {
-    name = "waitress-0.8.7";
+    name = "waitress-0.8.9";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/w/waitress/${name}.tar.gz";
-      md5 = "714f3d458d82a47f12fb168460de8366";
+      md5 = "da3f2e62b3676be5dd630703a68e2a04";
     };
 
     doCheck = false;
@@ -12516,7 +13005,7 @@ let
     propagatedBuildInputs = with pythonPackages; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ];
 
     meta = with stdenv.lib; {
-      description = "Willie is a simple, lightweight, open source, easy-to-use IRC utility bot, written in Python.";
+      description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python";
       homepage = http://willie.dftba.net/;
       license = licenses.efl20;
     };
@@ -13545,11 +14034,11 @@ let
   };
 
   translationstring = buildPythonPackage rec {
-    name = "translationstring-1.1";
+    name = "translationstring-1.3";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz";
-      md5 = "0979b46d8f0f852810c8ec4be5c26cf2";
+      md5 = "a4b62e0f3c189c783a1685b3027f7c90";
     };
 
     meta = {
@@ -14308,8 +14797,8 @@ let
     propagatedBuildInputs = with self; [ nose ];
 
     meta = {
-      homepage = "https://more-itertools.readthedocs.org";
-      description = "Expansion of the itertools module.";
+      homepage = https://more-itertools.readthedocs.org;
+      description = "Expansion of the itertools module";
       license = licenses.mit;
     };
   };
@@ -14342,7 +14831,7 @@ let
     };
 
     meta = with stdenv.lib; {
-      description = "Collection of fancy functional tools focused on practicality.";
+      description = "Collection of fancy functional tools focused on practicality";
       homepage = "http://funcy.readthedocs.org/";
       license = stdenv.lib.licenses.bsd3;
 
@@ -14716,7 +15205,7 @@ let
       licences = [ licenses.mit licenses.gpl2 ];
     };
   };
-  
+
   dicttoxml = buildPythonPackage rec {
     name = "dicttoxml-1.6.4";
 
@@ -14733,4 +15222,95 @@ let
     };
   };
 
+  
+  markdown2 = buildPythonPackage rec {
+    name = "markdown2-${version}";
+    version = "2.3.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/markdown2/${name}.zip";
+      sha256 = "073zyx3caqa9zlzxa82k9k2nhhn8c5imqpgp5nwqnh0fgaj9pqn8";
+    };
+    propagatedBuildInputs = with self; [];
+    meta = with stdenv.lib; {
+      description = "A fast and complete Python implementation of Markdown";
+      homepage =  https://github.com/trentm/python-markdown2;
+      license = licenses.mit;
+      maintainers = with maintainers; [ hbunke ];
+    };
+  };
+  
+  
+  evernote = buildPythonPackage rec {
+    name = "evernote-${version}";
+    version = "1.25.0";
+    disabled = ! isPy27; #some dependencies do not work with py3
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/e/evernote/${name}.tar.gz";
+      sha256 = "1lwlg6fpi3530245jzham1400a5b855bm4sbdyck229h9kg1v02d";
+    };
+
+     propagatedBuildInputs = with self; [ oauth2 ];
+
+     meta = with stdenv.lib; {
+      description = "Evernote SDK for Python";
+      homepage = http://dev.evernote.com;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ hbunke ];
+     };
+  };
+    
+  thrift = buildPythonPackage rec {
+    name = "thrift-${version}";
+    version = "0.9.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/thrift/${name}.tar.gz";
+      sha256 = "1yla6wg18x2a0l0lrvkp1v464hqhff98ck8pnv8d5j9kn3j6bxh8";
+    };
+
+    meta = with stdenv.lib; {
+      description = "Python bindings for the Apache Thrift RPC system";
+      homepage = http://thrift.apache.org/;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ hbunke ];
+
+    };
+  };
+  
+  geeknote = buildPythonPackage rec {
+    version = "2015-03-02";
+    name = "geeknote-${version}";
+    disabled = ! isPy27; 
+
+    src = pkgs.fetchFromGitHub {
+      owner = "VitaliyRodnenko";
+      repo = "geeknote";
+      rev = "7ea2255bb6";
+      sha256 = "0lw3m8g7r8r7dxhqih08x0i6agd201q2ig35a59rd4vygr3xqw2j";
+    };
+
+    /* build with tests fails with "Can not create application dirictory : 
+     /homeless-shelter/.geeknotebuilder". */
+    doCheck = false;
+
+    propagatedBuildInputs = with self; [ 
+        thrift 
+        beautifulsoup4 
+        markdown2
+        sqlalchemy
+        html2text
+        evernote
+    ];
+
+    meta = with stdenv.lib; {
+      description = "Work with Evernote from command line";
+      homepage = http://www.geeknote.me;
+      license = licenses.gpl1;
+      maintainers = with maintainers; [ hbunke ];
+
+    };
+  };
+
 }; in pythonPackages
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index cb469e61305..361b9ab6cc3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -23,7 +23,7 @@ let
     { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; };
 
       manual = import ../../doc;
-      lib.tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
+      lib-tests = import ../../lib/tests/release.nix { inherit nixpkgs; };
 
       unstable = pkgs.releaseTools.aggregate
         { name = "nixpkgs-${jobs.tarball.version}";
@@ -31,7 +31,7 @@ let
           constituents =
             [ jobs.tarball
               jobs.manual
-              jobs.lib.tests
+              jobs.lib-tests
               jobs.stdenv.x86_64-linux
               jobs.stdenv.i686-linux
               jobs.stdenv.x86_64-darwin
@@ -40,10 +40,8 @@ let
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
               jobs.thunderbird.i686-linux
-              /* not ready yet
               jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
               jobs.glib-tested.i686-linux
-              */
             ];
         };