Merge branch 'master.upstream' into staging.upstream

author: William A. Kennington III <william@wkennington.com> 2015-08-28 17:55:20 -0700
committer: William A. Kennington III <william@wkennington.com> 2015-08-28 17:55:20 -0700
commit: 5ca1c32a9d3705b36caef94bd8a8628a81c2d210 (patch)
tree: 0baaad6405c8483726accb0b28c7aa5ffbea068b
parent: 28a18999faeab25b92649027f4411e7f41d793da (diff)
parent: d2dce19793069b6104ff7df29af92316e7fe3b50 (diff)
download: nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar
nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.gz
nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.bz2
nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.lz
nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.xz
nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.zst
nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.zip
192 files changed, 4297 insertions, 2861 deletions
diff --git a/.version b/.version
index 49aab0cba12a..1c1d9713015b 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-15.08
\ No newline at end of file
+16.03
\ No newline at end of file
diff --git a/doc/functions.xml b/doc/functions.xml
index aec8a57c21a9..3e4ac3f3c6b1 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -155,4 +155,119 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
 
 </section>
 
+
+<section xml:id="sec-fhs-environments">
+  <title>buildFHSChrootEnv/buildFHSUserEnv</title>
+
+  <para>
+    <function>buildFHSChrootEnv</function> and
+    <function>buildFHSUserEnv</function> provide a way to build and run
+    FHS-compatible lightweight sandboxes. They get their own isolated root with
+    binded <filename>/nix/store</filename>, so their footprint in terms of disk
+    space needed is quite small. This allows one to run software which is hard or
+    unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions,
+    games distributed as tarballs, software with integrity checking and/or external
+    self-updated binaries.
+  </para>
+
+  <para>
+    <function>buildFHSChrootEnv</function> allows to create persistent
+    environments, which can be constructed, deconstructed and entered by
+    multiple users at once. A downside is that it requires
+    <literal>root</literal> access for both those who create and destroy and
+    those who enter it. It can be useful to create environments for daemons that
+    one can enter and observe.
+  </para>
+
+  <para>
+    <function>buildFHSUserEnv</function> uses Linux namespaces feature to create
+    temporary lightweight environments which are destroyed after all child
+    processes exit. It does not require root access, and can be useful to create
+    sandboxes and wrap applications.
+  </para>
+
+  <para>
+    Those functions both rely on <function>buildFHSEnv</function>, which creates
+    an actual directory structure given a list of necessary packages and extra
+    build commands.
+    <function>buildFHSChrootEnv</function> and <function>buildFHSUserEnv</function>
+    both accept those arguments which are passed to
+    <function>buildFHSEnv</function>:
+  </para>
+
+  <variablelist>
+    <varlistentry>
+    <term><literal>name</literal></term>
+
+    <listitem><para>Environment name.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>targetPkgs</literal></term>
+
+    <listitem><para>Packages to be installed for the main host's architecture
+    (i.e. x86_64 on x86_64 installations).</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>multiPkgs</literal></term>
+
+    <listitem><para>Packages to be installed for all architectures supported by
+    a host (i.e. i686 and x86_64 on x86_64 installations).</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>extraBuildCommands</literal></term>
+
+    <listitem><para>Additional commands to be executed for finalizing the
+    directory structure.</para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+    <term><literal>extraBuildCommandsMulti</literal></term>
+
+    <listitem><para>Like <literal>extraBuildCommandsMulti</literal>, but
+    executed only on multilib architectures.</para></listitem>
+    </varlistentry>
+  </variablelist>
+
+  <para>
+    Additionally, <function>buildFHSUserEnv</function> accepts
+    <literal>runScript</literal> parameter, which is a command that would be
+    executed inside the sandbox and passed all the command line arguments. It
+    default to <literal>bash</literal>.
+    One can create a simple environment using a <literal>shell.nix</literal>
+    like that:
+  </para>
+
+<programlisting><![CDATA[
+{ pkgs ? import <nixpkgs> {} }:
+
+(pkgs.buildFHSUserEnv {
+  name = "simple-x11-env";
+  targetPkgs = pkgs: (with pkgs;
+    [ udev
+      alsaLib
+    ]) ++ (with pkgs.xlibs;
+    [ libX11
+      libXcursor
+      libXrandr
+    ]);
+  multiPkgs = pkgs: (with pkgs;
+    [ udev
+      alsaLib
+    ]) ++ (with [];
+  runScript = "bash";
+}).env
+]]></programlisting>
+
+  <para>
+    Running <literal>nix-shell</literal> would then drop you into a shell with
+    these libraries and binaries available. You can use this to run
+    closed-source applications which expect FHS structure without hassles:
+    simply change <literal>runScript</literal> to the application path,
+    e.g. <filename>./bin/start.sh</filename> -- relative paths are supported.
+  </para>
+</section>
+
 </chapter>
diff --git a/doc/haskell-users-guide.xml b/doc/haskell-users-guide.xml
index 9a945d30a9ba..35eac42e0cfb 100644
--- a/doc/haskell-users-guide.xml
+++ b/doc/haskell-users-guide.xml
@@ -755,4 +755,69 @@ export NIX_CFLAGS_LINK=&quot;-L/usr/lib&quot;
   </section>
 </section>
 
+<section xml:id="other-resources">
+  <title>Other resources</title>
+  <itemizedlist>
+    <listitem>
+      <para>
+        The Youtube video
+        <link xlink:href="https://www.youtube.com/watch?v=BsBhi_r-OeE">Nix
+        Loves Haskell</link> provides an introduction into Haskell NG
+        aimed at beginners. The slides are available at
+        http://cryp.to/nixos-meetup-3-slides.pdf and also -- in a form
+        ready for cut &amp; paste -- at
+        https://github.com/NixOS/cabal2nix/blob/master/doc/nixos-meetup-3-slides.md.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Another Youtube video is
+        <link xlink:href="https://www.youtube.com/watch?v=mQd3s57n_2Y">Escaping
+        Cabal Hell with Nix</link>, which discusses the subject of
+        Haskell development with Nix but also provides a basic
+        introduction to Nix as well, i.e. it's suitable for viewers with
+        almost no prior Nix experience.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        Oliver Charles wrote a very nice
+        <link xlink:href="http://wiki.ocharles.org.uk/Nix">Tutorial how to
+        develop Haskell packages with Nix</link>.
+      </para>
+    </listitem>
+    <listitem>
+      <para>
+        The <emphasis>Journey into the Haskell NG
+        infrastructure</emphasis> series of postings describe the new
+        Haskell infrastructure in great detail:
+      </para>
+      <itemizedlist>
+        <listitem>
+          <para>
+            <link xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015591.html">Part
+            1</link> explains the differences between the old and the
+            new code and gives instructions how to migrate to the new
+            setup.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <link xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-January/015608.html">Part
+            2</link> looks in-depth at how to tweak and configure your
+            setup by means of overrides.
+          </para>
+        </listitem>
+        <listitem>
+          <para>
+            <link xlink:href="http://lists.science.uu.nl/pipermail/nix-dev/2015-April/016912.html">Part
+            3</link> describes the infrastructure that keeps the
+            Haskell package set in Nixpkgs uptodate.
+          </para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+  </itemizedlist>
+</section>
+
 </chapter>
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index db37043594a5..a1ec32aba0ef 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -75,6 +75,7 @@
   desiderius = "Didier J. Devroye <didier@devroye.name>";
   devhell = "devhell <\"^\"@regexmail.net>";
   dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
+  dfoxfranke = "Daniel Fox Franke <dfoxfranke@gmail.com>";
   dmalikov = "Dmitry Malikov <malikov.d.y@gmail.com>";
   doublec = "Chris Double <chris.double@double.co.nz>";
   ederoyd46 = "Matthew Brown <matt@ederoyd.co.uk>";
@@ -140,6 +141,7 @@
   kragniz = "Louis Taylor <kragniz@gmail.com>";
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lassulus = "Lassulus <lassulus@gmail.com>";
+  lebastr = "Alexander Lebedev <lebastr@gmail.com>";
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lhvwb = "Nathaniel Baxter <nathaniel.baxter@gmail.com>";
@@ -202,6 +204,7 @@
   pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
   pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
   prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
+  psibi = "Sibi <sibi@psibi.in>";
   pSub = "Pascal Wittmann <mail@pascal-wittmann.de>";
   puffnfresh = "Brian McKenna <brian@brianmckenna.org>";
   qknight = "Joachim Schiele <js@lastlog.de>";
@@ -211,6 +214,7 @@
   refnil = "Martin Lavoie <broemartino@gmail.com>";
   relrod = "Ricky Elrod <ricky@elrod.me>";
   renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
+  rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 70cd2d6070b5..e326f89d4f40 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,7 +9,7 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
-<xi:include href="rl-unstable.xml" />
+<xi:include href="rl-1509.xml" />
 <xi:include href="rl-1412.xml" />
 <xi:include href="rl-1404.xml" />
 <xi:include href="rl-1310.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 8fbac05e9684..d7d3d1a7fb13 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -2,9 +2,9 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
-         xml:id="sec-release-unstable">
+         xml:id="sec-release-15.09">
 
-<title>Release 15.07 (“Dingo”, 2015/07/??)</title>
+<title>Release 15.09 (“Dingo”, 2015/09/??)</title>
 
 <para>In addition to numerous new and upgraded packages, this release has the following highlights:
 
diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix
index 59d05f87d5fe..aa1cec1ea02d 100644
--- a/nixos/lib/testing.nix
+++ b/nixos/lib/testing.nix
@@ -15,6 +15,8 @@ rec {
 
     unpackPhase = "true";
 
+    preferLocalBuild = true;
+
     installPhase =
       ''
         mkdir -p $out/bin
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ebfe5afe52f3..8ee54ce7ef4b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -331,6 +331,7 @@
   ./services/networking/seeks.nix
   ./services/networking/skydns.nix
   ./services/networking/shout.nix
+  ./services/networking/softether.nix
   ./services/networking/spiped.nix
   ./services/networking/sslh.nix
   ./services/networking/ssh/lshd.nix
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index d3183f7d2dc7..cf7ef455eb85 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -18,6 +18,14 @@ let
       exec ${askPassword}
     '';
 
+  knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
+
+  knownHostsText = flip (concatMapStringsSep "\n") knownHosts
+    (h: assert h.hostNames != [];
+      concatStringsSep "," h.hostNames + " "
+      + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
+    );
+
 in
 {
   ###### interface
@@ -92,16 +100,76 @@ in
         '';
       };
 
+      knownHosts = mkOption {
+        default = {};
+        type = types.loaOf (types.submodule ({ name, ... }: {
+          options = {
+            hostNames = mkOption {
+              type = types.listOf types.str;
+              default = [];
+              description = ''
+                A list of host names and/or IP numbers used for accessing
+                the host's ssh service.
+              '';
+            };
+            publicKey = mkOption {
+              default = null;
+              type = types.nullOr types.str;
+              example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg==";
+              description = ''
+                The public key data for the host. You can fetch a public key
+                from a running SSH server with the <command>ssh-keyscan</command>
+                command. The public key should not include any host names, only
+                the key type and the key itself.
+              '';
+            };
+            publicKeyFile = mkOption {
+              default = null;
+              type = types.nullOr types.path;
+              description = ''
+                The path to the public key file for the host. The public
+                key file is read at build time and saved in the Nix store.
+                You can fetch a public key file from a running SSH server
+                with the <command>ssh-keyscan</command> command. The content
+                of the file should follow the same format as described for
+                the <literal>publicKey</literal> option.
+              '';
+            };
+          };
+          config = {
+            hostNames = mkDefault [ name ];
+          };
+        }));
+        description = ''
+          The set of system-wide known SSH hosts.
+        '';
+        example = [
+          {
+            hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
+            publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub";
+          }
+          {
+            hostNames = [ "myhost2" ];
+            publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub";
+          }
+        ];
+      };
+
     };
 
   };
 
   config = {
 
-    assertions = singleton
-      { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
-        message = "cannot enable X11 forwarding without setting XAuth location";
-      };
+    assertions =
+      [ { assertion = cfg.forwardX11 -> cfg.setXAuthLocation;
+          message = "cannot enable X11 forwarding without setting XAuth location";
+        }
+      ] ++ flip mapAttrsToList cfg.knownHosts (name: data: {
+        assertion = (data.publicKey == null && data.publicKeyFile != null) ||
+                    (data.publicKey != null && data.publicKeyFile == null);
+        message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
+      });
 
     # SSH configuration. Slight duplication of the sshd_config
     # generation in the sshd service.
@@ -118,6 +186,8 @@ in
         ${cfg.extraConfig}
       '';
 
+    environment.etc."ssh/ssh_known_hosts".text = knownHostsText;
+
     # FIXME: this should really be socket-activated for über-awesomeness.
     systemd.user.services.ssh-agent =
       { enable = cfg.startAgent;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 4db08b7ad3d0..6f7dcb837a07 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -110,6 +110,7 @@ in zipModules ([]
 ++ obsolete [ "services" "sshd" "permitRootLogin" ] [ "services" "openssh" "permitRootLogin" ]
 ++ obsolete [ "services" "xserver" "startSSHAgent" ] [ "services" "xserver" "startOpenSSHAgent" ]
 ++ obsolete [ "services" "xserver" "startOpenSSHAgent" ] [ "programs" "ssh" "startAgent" ]
+++ alias [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ]
 
 # VirtualBox
 ++ obsolete [ "services" "virtualbox" "enable" ] [ "virtualisation" "virtualbox" "guest" "enable" ]
diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix
index db3a266d011f..5843a6745f58 100644
--- a/nixos/modules/services/mail/mlmmj.nix
+++ b/nixos/modules/services/mail/mlmmj.nix
@@ -11,7 +11,7 @@ let
   listCtl = domain: list: "${listDir domain list}/control";
   transport = domain: list: "${domain}--${list}@local.list.mlmmj mlmmj:${domain}/${list}";
   virtual = domain: list: "${list}@${domain} ${domain}--${list}@local.list.mlmmj";
-  alias = domain: list: "${list}: \"|${pkgs.mlmmj}/mlmmj-receive -L ${listDir domain list}/\"";
+  alias = domain: list: "${list}: \"|${pkgs.mlmmj}/bin/mlmmj-receive -L ${listDir domain list}/\"";
   subjectPrefix = list: "[${list}]";
   listAddress = domain: list: "${list}@${domain}";
   customHeaders = list: domain: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ];
diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
new file mode 100644
index 000000000000..49538af7d351
--- /dev/null
+++ b/nixos/modules/services/networking/softether.nix
@@ -0,0 +1,150 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  pkg = pkgs.softether;
+  cfg = config.services.softether;
+
+in
+{
+
+  ###### interface
+
+  options = {
+
+    services.softether = {
+
+      enable = mkEnableOption "SoftEther VPN services";
+
+      vpnserver.enable = mkEnableOption "SoftEther VPN Server";
+
+      vpnbridge.enable = mkEnableOption "SoftEther VPN Bridge";
+
+      vpnclient = {
+        enable = mkEnableOption "SoftEther VPN Client";
+        up = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Shell commands executed when the Virtual Network Adapter(s) is/are starting.
+          '';
+        };
+        down = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Shell commands executed when the Virtual Network Adapter(s) is/are shutting down.
+          '';
+        };
+      };
+
+      dataDir = mkOption {
+        type = types.string;
+        default = "${pkg.dataDir}";
+        description = ''
+          Data directory for SoftEther VPN.
+        '';
+      };
+
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable (
+
+    mkMerge [{
+      environment.systemPackages = [
+          (pkgs.lib.overrideDerivation pkg (attrs: {
+            dataDir = cfg.dataDir;
+          }))
+        ];
+      jobs.softether = {
+        description = "SoftEther VPN services initial job";
+        startOn = "started network-interfaces";
+        preStart = ''
+            for d in vpnserver vpnbridge vpnclient vpncmd; do
+                if ! test -e ${cfg.dataDir}/$d; then
+                    ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
+                    install -m0600 ${pkg}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
+                fi
+            done
+            rm -rf ${cfg.dataDir}/vpncmd/vpncmd
+            ln -s ${pkg}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
+        '';
+        exec = "true";
+      };
+    }
+
+    (mkIf (cfg.vpnserver.enable) {
+      systemd.services.vpnserver = {
+        description = "SoftEther VPN Server";
+        after = [ "network-interfaces.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${pkg}/bin/vpnserver start";
+          ExecStop = "${pkg}/bin/vpnserver stop";
+          Type = "forking";
+        };
+        preStart = ''
+            rm -rf ${cfg.dataDir}/vpnserver/vpnserver
+            ln -s ${pkg}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
+        '';
+        postStop = ''
+            rm -rf ${cfg.dataDir}/vpnserver/vpnserver
+        '';
+      };
+    })
+
+    (mkIf (cfg.vpnbridge.enable) {
+      systemd.services.vpnbridge = {
+        description = "SoftEther VPN Bridge";
+        after = [ "network-interfaces.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${pkg}/bin/vpnbridge start";
+          ExecStop = "${pkg}/bin/vpnbridge stop";
+          Type = "forking";
+        };
+        preStart = ''
+            rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
+            ln -s ${pkg}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
+        '';
+        postStop = ''
+            rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
+        '';
+      };
+    })
+
+    (mkIf (cfg.vpnclient.enable) {
+      systemd.services.vpnclient = {
+        description = "SoftEther VPN Client";
+        after = [ "network-interfaces.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = "${pkg}/bin/vpnclient start";
+          ExecStop = "${pkg}/bin/vpnclient stop";
+          Type = "forking";
+        };
+        preStart = ''
+            rm -rf ${cfg.dataDir}/vpnclient/vpnclient
+            ln -s ${pkg}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
+        '';
+        postStart = ''
+            sleep 1
+            ${cfg.vpnclient.up}
+        '';
+        postStop = ''
+            rm -rf ${cfg.dataDir}/vpnclient/vpnclient
+            sleep 1
+            ${cfg.vpnclient.down}
+        '';
+      };
+      boot.kernelModules = [ "tun" ];
+    })
+
+  ]);
+
+}
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 1c428ceddfd2..4c7e4d8d088c 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -9,14 +9,6 @@ let
 
   nssModulesPath = config.system.nssModules.path;
 
-  knownHosts = map (h: getAttr h cfg.knownHosts) (attrNames cfg.knownHosts);
-
-  knownHostsText = flip (concatMapStringsSep "\n") knownHosts
-    (h:
-      concatStringsSep "," h.hostNames + " "
-      + (if h.publicKey != null then h.publicKey else readFile h.publicKeyFile)
-    );
-
   userOptions = {
 
     openssh.authorizedKeys = {
@@ -48,8 +40,7 @@ let
   };
 
   authKeysFiles = let
-    mkAuthKeyFile = u: {
-      target = "ssh/authorized_keys.d/${u.name}";
+    mkAuthKeyFile = u: nameValuePair "ssh/authorized_keys.d/${u.name}" {
       mode = "0444";
       source = pkgs.writeText "${u.name}-authorized_keys" ''
         ${concatStringsSep "\n" u.openssh.authorizedKeys.keys}
@@ -59,7 +50,7 @@ let
     usersWithKeys = attrValues (flip filterAttrs config.users.extraUsers (n: u:
       length u.openssh.authorizedKeys.keys != 0 || length u.openssh.authorizedKeys.keyFiles != 0
     ));
-  in map mkAuthKeyFile usersWithKeys;
+  in listToAttrs (map mkAuthKeyFile usersWithKeys);
 
 in
 
@@ -211,57 +202,6 @@ in
         description = "Verbatim contents of <filename>sshd_config</filename>.";
       };
 
-      knownHosts = mkOption {
-        default = {};
-        type = types.loaOf types.optionSet;
-        description = ''
-          The set of system-wide known SSH hosts.
-        '';
-        example = [
-          {
-            hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ];
-            publicKeyFile = literalExample "./pubkeys/myhost_ssh_host_dsa_key.pub";
-          }
-          {
-            hostNames = [ "myhost2" ];
-            publicKeyFile = literalExample "./pubkeys/myhost2_ssh_host_dsa_key.pub";
-          }
-        ];
-        options = {
-          hostNames = mkOption {
-            type = types.listOf types.str;
-            default = [];
-            description = ''
-              A list of host names and/or IP numbers used for accessing
-              the host's ssh service.
-            '';
-          };
-          publicKey = mkOption {
-            default = null;
-            type = types.nullOr types.str;
-            example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg==";
-            description = ''
-              The public key data for the host. You can fetch a public key
-              from a running SSH server with the <command>ssh-keyscan</command>
-              command. The public key should not include any host names, only
-              the key type and the key itself.
-            '';
-          };
-          publicKeyFile = mkOption {
-            default = null;
-            type = types.nullOr types.path;
-            description = ''
-              The path to the public key file for the host. The public
-              key file is read at build time and saved in the Nix store.
-              You can fetch a public key file from a running SSH server
-              with the <command>ssh-keyscan</command> command. The content
-              of the file should follow the same format as described for
-              the <literal>publicKey</literal> option.
-            '';
-          };
-        };
-      };
-
       moduliFile = mkOption {
         example = "services.openssh.moduliFile = /etc/my-local-ssh-moduli;";
         type = types.path;
@@ -292,14 +232,8 @@ in
 
     services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
 
-    environment.etc = authKeysFiles ++ [
-      { source = cfg.moduliFile;
-        target = "ssh/moduli";
-      }
-      { text = knownHostsText;
-        target = "ssh/ssh_known_hosts";
-      }
-    ];
+    environment.etc = authKeysFiles //
+      { "ssh/moduli".source = cfg.moduliFile; };
 
     systemd =
       let
@@ -417,11 +351,6 @@ in
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
                     message = "cannot enable X11 forwarding without setting xauth location";}]
-      ++ flip mapAttrsToList cfg.knownHosts (name: data: {
-        assertion = (data.publicKey == null && data.publicKeyFile != null) ||
-                    (data.publicKey != null && data.publicKeyFile == null);
-        message = "knownHost ${name} must contain either a publicKey or publicKeyFile";
-      })
       ++ flip map cfg.listenAddresses ({ addr, port, ... }: {
         assertion = addr != null;
         message = "addr must be specified in each listenAddresses entry";
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index e3f1a7fb1bda..7350a6a68c70 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -117,7 +117,6 @@ let
     ]
     ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ])
     ++ optional enableSSL "ssl"
-    ++ optional mainCfg.enableCompression "deflate"
     ++ extraApacheModules;
 
 
@@ -177,27 +176,6 @@ let
     SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP
   '';
 
-  # From http://paulstamatiou.com/how-to-optimize-your-apache-site-with-mod-deflate/
-  compressConf = ''
-    SetOutputFilter DEFLATE
-
-    # Don't compress binaries
-    SetEnvIfNoCase Request_URI .(?:exe|t?gz|zip|iso|tar|bz2|sit|rar) no-gzip dont-vary
-    # Don't compress images
-    SetEnvIfNoCase Request_URI .(?:gif|jpe?g|jpg|ico|png)  no-gzip dont-vary
-    # Don't compress PDFs
-    SetEnvIfNoCase Request_URI .pdf no-gzip dont-vary
-    # Don't compress flash files (only relevant if you host your own videos)
-    SetEnvIfNoCase Request_URI .flv no-gzip dont-vary
-    # Netscape 4.X has some problems
-    BrowserMatch ^Mozilla/4 gzip-only-text/html
-    # Netscape 4.06-4.08 have some more problems
-    BrowserMatch ^Mozilla/4.0[678] no-gzip
-    # MSIE masquerades as Netscape, but it is fine
-    BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-    # Make sure proxies don't deliver the wrong content
-    Header append Vary User-Agent env=!dont-vary
-  '';
 
   mimeConf = ''
     TypesConfig ${httpd}/conf/mime.types
@@ -373,7 +351,6 @@ let
     ${mimeConf}
     ${loggingConf}
     ${browserHacks}
-    ${optionalString mainCfg.enableCompression compressConf}
 
     Include ${httpd}/conf/extra/httpd-default.conf
     Include ${httpd}/conf/extra/httpd-autoindex.conf
@@ -446,7 +423,7 @@ in
       enable = mkOption {
         type = types.bool;
         default = false;
-        description = "Enable the Apache HTTP Server.";
+        description = "Whether to enable the Apache HTTP Server.";
       };
 
       package = mkOption {
@@ -609,12 +586,6 @@ in
         description =
           "Maximum number of httpd requests answered per httpd child (prefork), 0 means unlimited";
       };
-
-      enableCompression = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable compression of responses using mod_deflate.";
-      };
     }
 
     # Include the options shared between the main server and virtual hosts.
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c3c52730863..b9808f1ffa69 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -18,14 +18,45 @@ in
 
     services.xserver.displayManager.gdm = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
+      enable = mkEnableOption ''
+        GDM as the display manager.
+        <emphasis>GDM is very experimental and may render system unusable.</emphasis>
+      '';
+
+      autoLogin = mkOption {
+        default = {};
         description = ''
-          Whether to enable GDM as the display manager.
-          <emphasis>GDM is very experimental and may render system unusable.</emphasis>
+          Auto login configuration attrset.
         '';
+
+        type = types.submodule {
+          options = {
+            enable = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Automatically log in as the sepecified <option>auto.user</option>.
+              '';
+            };
+
+            user = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                User to be used for the autologin.
+              '';
+            };
+
+            delay = mkOption {
+              type = types.int;
+              default = 0;
+              description = ''
+                Seconds of inactivity after which the autologin will be performed.
+              '';
+            };
+
+          };
+        };
       };
 
     };
@@ -50,7 +81,7 @@ in
     users.extraGroups.gdm.gid = config.ids.gids.gdm;
 
     services.xserver.displayManager.job =
-      { 
+      {
         environment = {
           GDM_X_SERVER = "${cfg.xserverBin} ${cfg.xserverArgs}";
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
@@ -71,6 +102,25 @@ in
 
     programs.dconf.profiles.gdm = "${gdm}/share/dconf/profile/gdm";
 
+    environment.etc."gdm/custom.conf".text = ''
+      [daemon]
+      ${optionalString cfg.gdm.autoLogin.enable ''
+      TimedLoginEnable=true
+      TimedLogin=${cfg.gdm.autoLogin.user}
+      TimedLoginDelay=${toString cfg.gdm.autoLogin.delay}
+      ''}
+
+      [security]
+
+      [xdmcp]
+
+      [greeter]
+
+      [chooser]
+
+      [debug]
+    '';
+
     # GDM LFS PAM modules, adapted somehow to NixOS
     security.pam.services = {
       gdm-launch-environment.text = ''
@@ -89,7 +139,7 @@ in
         session  optional       pam_permit.so
       '';
 
-     gdm.text = ''
+      gdm.text = ''
         auth     requisite      pam_nologin.so
         auth     required       pam_env.so
 
@@ -130,7 +180,7 @@ in
           "auth     required       pam_deny.so"}
 
         account  sufficient     pam_unix.so
-        
+
         password requisite      pam_unix.so nullok sha512
         ${optionalString config.security.pam.enableEcryptfs
           "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"}
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 1314b7277723..05369da4f16b 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -713,6 +713,14 @@ in
         })
         (filterAttrs (name: service: service.startAt != "") cfg.services);
 
+    # Generate timer units for all services that have a ‘startAt’ value.
+    systemd.user.timers =
+      mapAttrs (name: service:
+        { wantedBy = [ "timers.target" ];
+          timerConfig.OnCalendar = service.startAt;
+        })
+        (filterAttrs (name: service: service.startAt != "") cfg.user.services);
+
     systemd.sockets.systemd-journal-gatewayd.wantedBy =
       optional config.services.journald.enableHttpGateway "sockets.target";
 
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index da39dda85353..59f486ff78b7 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -120,6 +120,15 @@ in
               '';
             };
 
+            interfaces = mkOption {
+              type = types.listOf types.string;
+              default = [];
+              example = [ "eth1" "eth2" ];
+              description = ''
+                The list of interfaces to be moved into the container.
+              '';
+            };
+
             autoStart = mkOption {
               type = types.bool;
               default = false;
@@ -218,6 +227,10 @@ in
               extraFlags+=" --network-veth"
             fi
 
+            for iface in $INTERFACES; do
+              extraFlags+=" --network-interface=$iface"
+            done
+
             for iface in $MACVLANS; do
               extraFlags+=" --network-macvlan=$iface"
             done
@@ -331,6 +344,7 @@ in
                 LOCAL_ADDRESS=${cfg.localAddress}
               ''}
             ''}
+             INTERFACES="${toString cfg.interfaces}"
            ${optionalString cfg.autoStart ''
              AUTO_START=1
            ''}
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 67a2779afc24..1bdabe93fec1 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ... }: {
   testScript =
     ''
       $machine->waitForX;
-      $machine->execute("firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
+      $machine->execute("firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html &");
       $machine->waitForWindow(qr/Valgrind/);
       $machine->sleep(40); # wait until Firefox has finished loading the page
       $machine->screenshot("screen");
diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index f5e0159f1c7d..3425ca09951c 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -11,8 +11,13 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
-      services.xserver.displayManager.auto.enable = true;
-      services.xserver.displayManager.auto.user = "alice";
+      services.xserver.displayManager.gdm = {
+        enable = true;
+        autoLogin = {
+          enable = true;
+          user = "alice";
+        };
+      };
       services.xserver.desktopManager.gnome3.enable = true;
 
       virtualisation.memorySize = 512;
@@ -21,7 +26,7 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript =
     ''
       $machine->waitForX;
-      $machine->sleep(15);
+      $machine->sleep(60);
 
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
index 981813ba2bda..dc61658cd1c4 100644
--- a/nixos/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
       services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
-      services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+      services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
 
       services.xserver.displayManager.kdm.enable = true;
       services.xserver.displayManager.kdm.extraConfig =
diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index ea18114b61c4..02980cee2fbd 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -63,7 +63,7 @@ import ./make-test.nix ({pkgs, ... }: {
       foreach my $file ("${pkgs.groff.doc}/share/doc/*/examples/mom/penguin.pdf",
                         "${pkgs.groff.doc}/share/doc/*/meref.ps",
                         "${pkgs.cups}/share/doc/cups/images/cups.png",
-                        "${pkgs.pcre}/share/doc/pcre/pcre.txt")
+                        "${pkgs.pcre.doc}/share/doc/pcre/pcre.txt")
       {
           $file =~ /([^\/]*)$/; my $fn = $1;
 
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 1653c9b2fda7..b43ce1b8e680 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -7,7 +7,7 @@ let
 
     { services.httpd.enable = true;
       services.httpd.adminAddr = "foo@example.org";
-      services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html";
+      services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
       networking.firewall.allowedTCPPorts = [ 80 ];
     };
 
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix
index 50db71ea7239..7fdf1c347719 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.7.0";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/drumkv1/${name}.tar.gz";
-    sha256 = "1fbi835559qsg9fxgdbdyf5z1zlzf9n8zrq0p67damb55mmigaj8";
+    sha256 = "0mpf8akqaakg7vbn8gba0ns64hzhn5xzh1qxqpchcv32swn21cq4";
   };
 
   buildInputs = [ libjack2 libsndfile lv2 qt4 ];
diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix
new file mode 100644
index 000000000000..badac0887a1a
--- /dev/null
+++ b/pkgs/applications/audio/qmidiroute/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, qt4, alsaLib }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.0";
+  name = "qmidiroute-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz";
+    sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2";
+  };
+
+  buildInputs = [ pkgconfig qt4 alsaLib ];
+
+  meta = with stdenv.lib; {
+    description = "MIDI event processor and router";
+    longDescription = ''
+    qmidiroute is a versatile MIDI event processor and router for the ALSA
+    sequencer.  The graphical  interface  is  based  on  the  Qt4  toolkit.
+    qmidiroute permits setting up an unlimited number of MIDI maps in which
+    incoming events are selected, modified or even changed in  type  before
+    being  directed  to  a  dedicated  ALSA  output  port. The maps work in
+    parallel, and they are organized in tabs.
+    '';
+
+    license = licenses.gpl2;
+    maintainers = [ maintainers.lebastr ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
new file mode 100644
index 000000000000..b22018f1612c
--- /dev/null
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, qt4, pkgconfig, ladspaPlugins, ladspaH,
+  dssi, liblo, liblrdf, fftwSinglePrec, libsndfile,
+  libsamplerate, perl, makedepend, libjack2,
+  withLirc ? false, lirc ? null } :
+
+stdenv.mkDerivation (rec {
+  version = "14.12";
+  name = "rosegarden-${version}";
+  src = fetchurl {
+    url  = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
+    sha256 = "0zhlxr1njyy6837f09l6p75js0j5mxmls6m02bqafv9j32wgnxpq";
+  };
+
+  QTDIR=qt4;
+  
+  buildInputs = [ qt4 pkgconfig ladspaPlugins ladspaH dssi liblo liblrdf fftwSinglePrec
+                  libsndfile libsamplerate perl makedepend libjack2 ]
+		++ stdenv.lib.optional withLirc [ lirc ];
+  
+  enableParallelBuilding = true;
+  
+  meta = with stdenv.lib; {
+    homepage = http://www.rosegardenmusic.com/;
+    description = "Music composition and editing environment";
+    longDescription = ''
+      Rosegarden is a music composition and editing environment based around a MIDI sequencer that features a rich understanding of music notation and includes basic support for digital audio.
+      Rosegarden is an easy-to-learn, attractive application that runs on Linux, ideal for composers, musicians, music students, and small studio or home recording environments.
+      '';
+
+    maintainers = [ maintainers.lebastr ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix
index 544422cfaea3..fa9df2f603e1 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.7.0";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/samplv1/${name}.tar.gz";
-    sha256 = "0w1cl1vjhzzdyxfn8fcfgx5j5d4gi182w5b89f7qzg1akhmsqmfr";
+    sha256 = "0494w1xhhadwzvdr0v4gg5pzr2w2ah2vk896znj59j1y9gn3gilq";
   };
 
   buildInputs = [ libjack2 libsndfile lv2 qt4 ];
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix
index 4a126f8774f8..43003782f2fe 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.3";
+  version = "0.7.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/synthv1/${name}.tar.gz";
-    sha256 = "19zyvrvnmi7ahwg121vl2q17j9y8ln6lvpj5wxxcwif5538q75iw";
+    sha256 = "0asjhz0xj1kwysvsj9q54r8j8fy7cnr408ygfpdhg7yn24rv67hh";
   };
 
   buildInputs = [ qt4 libjack2 lv2 ];
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 284ea9117241..6f09aa481e1d 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -9,7 +9,7 @@ rec {
                             , passthru ? {}
                             , ... } @ attrs:
     stdenv.mkDerivation (attrs // {
-      name = "eclipse-" + name;
+      name = "eclipse-plugin-" + name;
 
       buildInputs = buildInputs ++ [ unzip ];
 
@@ -298,7 +298,7 @@ rec {
 
     src = fetchzip {
       url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
-      sha256 = "0p2dbf56rw733dhsxy9hdwmbzqlk01j8f2hci21bsipq5w2144x6";
+      sha256 = "0x5cdcm7p2ynz5ryw041gb150sripf9i4m1yrfqklnn581yqm6y8";
     };
 
     meta = with stdenv.lib; {
@@ -312,16 +312,16 @@ rec {
 
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
-    version = "6.9.5.201506120235";
+    version = "6.9.5.201508210528";
 
     srcFeature = fetchurl {
-      url = "http://beust.com/eclipse/features/org.testng.eclipse_6.9.5.201506120235.jar";
-      sha256 = "02imv0rw10pik55a7p00jin65shvhfpzgna02ky94yx7dlf9fyy9";
+      url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar";
+      sha256 = "0xalm7pvj0vx61isgkjkgj073b4hlqlzx6xnkrnnnyi0r212a26j";
     };
 
     srcPlugin = fetchurl {
-      url = "http://beust.com/eclipse/plugins/org.testng.eclipse_6.9.5.201506120235.jar";
-      sha256 = "0ni1ky4p5l1qzph0np1qw9pcyhrvy6zmn9c8q1b5rm5xv1fcvji4";
+      url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar";
+      sha256 = "07wmivfvfsq6cjw5zwciajdxkfa7drk108jsr44gf4i1bv9fj055";
     };
 
     meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index 8fdc198f45c4..d969552ecde4 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -1,17 +1,24 @@
 { stdenv, fetchurl, spidermonkey_24, unzip, curl, pcre, readline, openssl }:
 stdenv.mkDerivation rec {
-  name = "edbrowse-3.5.2";
-  buildInputs = [ unzip curl pcre readline openssl spidermonkey_24 ];
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${spidermonkey_24}/include/mozjs-24"
-    '';
-  installPhase = "installBin src/edbrowse";
+  name = "edbrowse-${version}";
+  version = "3.5.4.1";
+
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ curl pcre readline openssl spidermonkey_24 ];
+
+  patchPhase = ''
+    substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${spidermonkey_24}/include/mozjs-24";
+  makeFlags = "-C src prefix=$(out)";
+
   src = fetchurl {
-    url = "http://the-brannons.com/edbrowse/${name}.zip";
-    sha256 = "5f1ac927d126b8c8fd411231cffa9eba5405013e64994e55e1864b2f85d52714";
+    url = "http://edbrowse.org/${name}.zip";
+    sha256 = "0fpzaalwvgwbns7yxq4a4i6hpdljmcjfyvx19r1dlb3vdfw0vx5l";
   };
   meta = {
-    description = "Edbrowse, a Command Line Editor Browser";
+    description = "Command Line Editor Browser";
     longDescription = ''
       Edbrowse is a combination editor, browser, and mail client that is 100% text based.
       The interface is similar to /bin/ed, though there are many more features, such as editing multiple files simultaneously, and rendering html.
@@ -20,7 +27,7 @@ stdenv.mkDerivation rec {
       edbrowse can also tap into databases through odbc. It was primarily written by Karl Dahlke.
       '';
     license = stdenv.lib.licenses.gpl1Plus;
-    homepage = http://the-brannons.com/edbrowse/;
+    homepage = http://edbrowse.org/;
     maintainers = [ stdenv.lib.maintainers.schmitthenner ];
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix
index 7d987e73b913..3f1967c70535 100644
--- a/pkgs/applications/editors/emacs-modes/cask/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cask/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, emacs, python }:
 
 stdenv.mkDerivation rec {
-  name = "cask-0.7.2";
+  name = "cask-0.7.3";
 
   src = fetchgit {
     url = "https://github.com/cask/cask.git";
-    rev = "8d667e1ce3f3aa817a7b996f02058b2441f83958";
-    sha256 = "08brrdyz7zsw134zwf4dyj6bj2glflszssfq8vya3mh01s38mfri";
+    rev = "717b64a9ba7640ec366e8573da0c01f9c4d57b0c";
+    sha256 = "0j18rzgpibisfcci6kcgjs8nlkfi1dw33dxp6ab6zaiarydwgcs5";
   };
 
   buildInputs = [ emacs python ];
diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
new file mode 100644
index 000000000000..4e8324894abf
--- /dev/null
+++ b/pkgs/applications/editors/ne/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }:
+
+
+stdenv.mkDerivation rec {
+  name = "ne-${version}";
+  version = "3.0.1";
+  src = fetchFromGitHub {
+    owner = "vigna";
+    repo = "ne";
+    rev = version;
+    sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp";
+  };
+  buildInputs = [ ncurses tetex texinfo perl ghostscript ];
+  dontBuild = true;
+  installPhase = ''
+    substituteInPlace src/makefile --replace "CC=c99" "cc=gcc"
+    substituteInPlace src/makefile --replace "-lcurses" "-lncurses"
+    substituteInPlace makefile --replace "./version.pl" "perl version.pl"
+    cd doc && make && cd ..
+    cd src && make && cd ..
+    make PREFIX=$out install
+  '';
+  
+  meta = {
+    description = "the nice editor";
+    homepage = https://github.com/vigna/ne;
+    longDescription = ''
+      ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any 
+UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, 
+and most sparing in its resource usage. See the manual for some highlights of ne's features.      
+    '';
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index b89d59217ac8..1cf24e109dd2 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.7";
+  version = "1.6.8";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "162c9kdj71az0ipaw4kiqcxhig0hcbmzw936d390r8zhkns76l57";
+    sha256 = "0189d5pn6g01rynfkhxynrqgfi24v94x8fp0fs7ilrncv0dzhxmn";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix
index 743215493187..66fc4810e7d9 100644
--- a/pkgs/applications/graphics/sane/backends.nix
+++ b/pkgs/applications/graphics/sane/backends.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ba68m6bzni54axjk15i51rya7hfsdliwvqyan5msl7iaid0iir7";
   };
 
+  outputs = [ "out" "doc" "man" ];
+
   udevSupport = hotplugSupport;
 
   configureFlags = stdenv.lib.optional (libusb != null) "--enable-libusb_1_0";
diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix
new file mode 100644
index 000000000000..a8914a9014d9
--- /dev/null
+++ b/pkgs/applications/misc/artha/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }:
+
+stdenv.mkDerivation rec {
+  name = "artha-${version}";
+  version = "1.0.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/artha/1.0.3/artha-1.0.3.tar.bz2";
+    sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx";
+  };
+
+  buildInputs = [ dbus_glib gtk pkgconfig wordnet ];
+
+  meta = with stdenv.lib; {
+    description = "An offline thesaurus based on WordNet";
+    homepage = http://artha.sourceforge.net;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index b1fdc50fe15c..ed37b0d96bc7 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   name = "electrum-${version}";
-  version = "2.4";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "https://download.electrum.org/Electrum-${version}.tar.gz";
-    sha256 = "0y04m5b410y3s9vqvkbvmlvvx1nr0cyvrnl41yapz8hydw9vdkjx";
+    sha256 = "00z02rdlhasryccjsw1j7563xl76i6x40ah1lnn9asad1gp6520f";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -27,6 +27,7 @@ buildPythonPackage rec {
   preInstall = ''
     mkdir -p $out/share
     sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py
+    pyrcc4 icons.qrc -o gui/qt/icons_rc.py
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/hello/ex-1/builder.sh b/pkgs/applications/misc/hello/ex-1/builder.sh
deleted file mode 100644
index 08bba946cce2..000000000000
--- a/pkgs/applications/misc/hello/ex-1/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-PATH=$perl/bin:$PATH
-
-tar xvfz $src
-cd hello-*
-./configure --prefix=$out
-make
-make install
diff --git a/pkgs/applications/misc/hello/ex-1/default.nix b/pkgs/applications/misc/hello/ex-1/default.nix
deleted file mode 100644
index 51b2ccb58ed3..000000000000
--- a/pkgs/applications/misc/hello/ex-1/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, perl}:
-
-stdenv.mkDerivation {
-  name = "hello-2.1.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://gnu/hello/hello-2.1.1.tar.gz;
-    md5 = "70c9ccf9fac07f762c24f2df2290784d";
-  };
-  inherit perl;
-
-  meta = {
-    description = "GNU Hello, a classic computer science tool";
-    homepage = http://www.gnu.org/software/hello/;
-  };
-}
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index a076a2bb7cfe..1f78355ca3a1 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);
 
 let
   name = "ikiwiki";
-  version = "3.20150107";
+  version = "3.20150614";
 
   lib = stdenv.lib;
 in
@@ -31,8 +31,8 @@ stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
-    url = "https://github.com/joeyh/ikiwiki/archive/debian/${version}.tar.gz";
-    sha256 = "12kiqjxrh93gysdp7bhglnks2md9davl8jgzqlj0m8xs5rf1972n";
+    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
+    sha256 = "0sbs58d7faap1wp2rv7kf3gy3hid1hcpspgqs9wwms2qcki9kwa2";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 7c08bf9d2e79..c6bc87ce13d4 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -7,7 +7,7 @@ buildPythonPackage rec {
     description = "File manager with minimalistic curses interface";
     homepage = "http://ranger.nongnu.org/";
     license = stdenv.lib.licenses.gpl3;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 187ab0390143..c7a01f2ac1b9 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -17,8 +17,12 @@ stdenv.mkDerivation rec {
 
   LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build
 
+  # The config locking scheme relies on the binary being called "tilda",
+  # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice:
   postInstall = ''
-    wrapProgram "$out/bin/tilda" \
+    mkdir $out/bin/wrapped
+    mv "$out/bin/tilda" "$out/bin/wrapped/tilda"
+    makeWrapper "$out/bin/wrapped/tilda" "$out/bin/tilda" \
         --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index 9715b46ed507..007c49b2733b 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, unzip, firefox, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20150319";
+  name = "conkeror-1.0pre-20150730";
 
   src = fetchgit {
     url = git://repo.or.cz/conkeror.git;
-    rev = "6450632b3f0c315f79e7a9856658083fe8fc9c29";
-    sha256 = "18cqz1n2n6aimmgd69mdrgmkjf4207k7yz11wihka6b5z1hfiv64";
+    rev = "a1f7e879b129df5cf14ea4ce80a9c1407380ed58";
+    sha256 = "12d8949a81a670037664dd930f7efe3d54b321aad48deea68343eba9aaea8785";
   };
 
   buildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index d302e47f335b..b29cdec27e97 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 = "40.0.2";
+  version = "40.0.3";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "4cd453a4439460164e15ac767483335f0ab153ba"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "2915386e271a710daf63b5fa6e4e6450cd339a23"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "2c64d95f8f7a82931906bb8ae6fcd6f2c976aa54"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "b9ca1f6a18283eb9eebd39173c33d7d0bbc5afe2"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "0a6c228d7f46bad34b431bb49d6bdc60c2778008"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "a509951f13eaab7661676f833dd9a83125309c82"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "372dffb81f1be1966e95bba114f982497a2caee0"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "82dd88dd2e4ded3c25f7ffd6b21dd51a0b693d43"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "52dbcef7858b57652ebd18e8b24af0c656f659e2"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "aafa712986beb5d28c51f07678f9e1f80489e199"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "0f206582c5f934a490f68d5226d1829397cc45a7"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "af49662ae762693ae916fcf491d331ad86acbf66"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "c9bbf9024acffabe1651d1ca9d0c13ce574d021b"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "a946941ad0fa094c54b76f0f31501cdd24582402"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "de19ed80796ba4423347654bbab170d72aea24b5"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "d566f37f8f908d621a51278c40e971be4a277749"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "bb7c41fd32b4b97ae25c1d7b3aee187810800387"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6063f82ce73e5070c983aa69d9c34dab74bc460"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "41b8d113a8d09d8fd28f4808ea630fcf732bee26"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4c255a14338a602e9b8827f55c8c3f705a76f421"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c24df5f5dc5493d912b34e526617ed22075f3bb1"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b1be6518bc16874245e5a532d03a2bd7dc4fdc23"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "cfea274abe713d3c5df63b21489ba23766c97dad"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "10e5d0f6435a487b3331b76ac0eee51a2edb3485"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "66462c0af5e9a7f9052db2d9616a44ca08d51713"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a78840fe663d7876ea00cd6ecb0530f16146adf"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "8321046f8cbba3d3cdea7381f2ec4323b2ba7cfb"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "599c81a054ad7ef7c27f3be1da2289ed3404255b"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "89480e776bc5add4c9270f8f92e56d1a0207e629"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "7d7d40a7e74670eaaacb66d6a3706710d2d1cd4c"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "087b794e0988484dfd7d67488c3ac197e5529c42"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "3fd60bd6b42497d0968095294c94dcc11bdbbeda"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "2e22d7ff7c0a7a2f8bbf2c43f5da24c3eaf4ba8c"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "dc852f942018f08f2c3f56b3315dd039f0dd4159"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "a78fb79f0640fc018e4d7807bea41c6239bbdf2e"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "53a7c3e38d81df588db042bd8ee524aa67713f76"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "3721ac332975aa52f692bce9467f3919be16b4cb"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "602bee9867cead4ac79c05d8cb99d022de1169c6"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "f3809bd2b456b9548cf8415d4f15e08bf64f2561"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "6ed7be3d3f90ff01f3a8505ea61c69f1dc3f34af"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "3bff3a0f76e6744cb1e1ab78a5c24bd9183db1d5"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "87033acbf2d3277e699b1b54552a88bd33590f75"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "65a852e9774f9f61764d01e4025b64027f10d270"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "99e40bfcbc4146111059cbec1557fbe3a7295285"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "476b5ac7062932584ef634b9bd536495fef974d6"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51334ee2ee6bdfd7e0b02ed44d95b9d0e86a73af"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "e2973dc7e1decebb24a4a90e8a4a4307ccd7d151"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "4bb52d9197c854ceca4a9d8fed6cec016c823ea7"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "2335e0f3bbae6eefdd1aa7ba58530f0ee9bd3534"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "8fdfc2defee83edeabc5648dcf4e4630862424b2"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "34201da70923a68566856aaf5f33e33f80c3943a"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "03ddd10a75a6a779bc0ff1f06f2ac0f4189c21db"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "b6456b85055178db737c3b2dbebec14ca7c373ec"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "165c5abc403322964de6fbda189c766c1490f57d"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "defd933884c5f97c63e8f07dbd42162d7365b5a6"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e0588631c0886ca5785f713c2fd4d52e53c901f6"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "732b79384c69659d674a849dfc0a4cc0905af5c0"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "30ea22676bf24205595fe3cef17f17e5fa7224c0"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "a0dd6bc63af523f12f77da3d93f842434dd45fbe"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "02e8d43be34bdd57d999ff34e93289d721fd5e18"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "13cb0fc5c3f2faf5907c71a88d9fb6dcf295534f"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "3688cb2d85620d03d8ae90535758384e0eca0b79"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "de4bfeaf65c5db67029f7800d3818f60a15e0a2f"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "3b87f8e2cbafc70264da1afabc9d4a365acdf445"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "e0d1d40ae201852a7afb5c5c3995d1eaac461880"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "d519fa72ae3acd5c5e9590242a1569e2559e7099"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "4c35aade33675ee9e6ee0ba3d2826da06509f048"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "a7f2c8c24766d4ad12a0144007eac93b99ffbc83"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "c809f3baf308c5cd7d9edc1a53f0b7cdb876a97c"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "182c27021f7192c50be9973850a848b138e60d0a"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "8bfa83a569409ae579aaf27f6878f90c9789128b"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "a68688038d975428a232f721da7f638f08fc0157"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "be223957dfcf41db552e4e63ec879e4c21eb40f4"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "d226c4ea4f987a9a8f01a8e6365e2c93ae748988"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "482a19d31d1543d2645ba290d6ab2404f200b81d"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "3bdac94346710be5c2c160153321f5bd9118c291"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "aafc01904d22edf7e6c4db94b3154875736de3be"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "3309dc84bf4d0b4f9aafce95f5af3ee3a01acd79"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "aa0f6c2f4d8f4cbd974d39cd0ef85ce7795bb00a"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "17cabcb46375f04a32ac4e156a30b97022406a46"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "51d3c83ff1584c315a18916100a9b2481d8b5ab8"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "0e725242eada7456e15c91acd63d37018167df71"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "3f68ab7a61fd8b6731aaf3089907d9e436a2e5e1"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "5934536499a2ded279a802110d8d8f0e802cc8c9"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "c212eaaa6329f9872e8545d634551d083e0f2db1"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b6edd09144919be6932baa037f7f09ed26d5c102"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "63eeba0d15763340d802802008cce554a8bbb07d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "c593a84cfb69ef7ee5d2a8affb15189147d0c2e1"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b2b63b30ebb9a220b610c0b1696b5da55d641710"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1c6dcf9b30383a5566448ab4e92ef0a90613e505"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "fdaacae2217fe365eb54b977562ed8c889c95de9"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "9def4f5554110b6af64bc91f4ad0f03a6444dfae"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "7b9183a80a87febfd7e8cd57b93e2edabea763a8"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "a3ab726b981b8763dbddd74a61d85c4576597fe6"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "eced59fb6ddd04967917142301435ea121671f62"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "e80d94b8b8868e357c571710046af3155e558a5f"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "1c3cd61ba760650c7d44d98b8db66b4c7801efad"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "e0c4b3f510eb73d06c68b5b91c707ce5c508b05e"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "20ca59199a6a30bd64dcb943c2a1135885a535b4"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "87703e39a0ea9c402cc535fb4cc04dca5b9025d4"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "17cd8d702482cbc1c4bb377b29e0f278cdfc8e15"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "e7372fc31e6cd893fc0ea52e2fc4105c249310d3"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "947b986d5cb5454677d7b9bbcebaf437f0bcd16d"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "7f99697ebc560e2705e4aae628ad56a132af7eb6"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "b3a76512be4f2b86cad800d46d3f6c9ff9c883db"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "3e5c4860e15651ede1ffe569062e23f474b44994"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "36e66cb829024c631f91a9a05e4d4c10c5862c45"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "216d0066b5289335c12339dd109d8f11dc4fa937"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "a784ca15952a69965aa377a2dd6a0232ece0f8a4"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "f172acd6474891177446b61bd538af09cfb30351"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "161f527142c8d8551509e6132871c4901b2d64e7"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "d0428e31ef283749f1691d787ad6983ed0677a50"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "4bd535fdaf01bf8d001bc1147f0ad9e26f0bf39f"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "fc2de8c24f0271f56b3af97e8e4bf14179d6122d"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "9aacbee890a7bc3d714d85d16ab2d278dabd8e1b"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "75c23b833812a9d0b66727b3ed28a0e494bbacb1"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "cf29131fbf6d768e79ef5228cf066355a46b4466"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "df4b6ba0c457f15eee2dcade4882b720c1e39506"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "ab0cc9339d486d576e7004fd35d685421f7853f1"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "4b10dd376a6599f60ac85d41d465f136c4d4ebdc"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "3244858bd6405dc507eb4044be6b8ebaf7100e1f"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "9db094658b9e6d4849c1ede8438427400704c80c"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "9a907fec062b94a8f8dd7e981ea2ab4f36bcd944"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eafc796f1597464abe3ffd9353e7d098b528525a"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "fd19ace880cfd29a4612b2543e2eab1fbbabe4a4"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "3d8bb5f293a6f18c3f171dcfb52b737a7946aa95"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0a893fef8363fa980bc2393a2e23241f0c07956c"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "3e066a7834e998422f00e10b65e58ecf9dfc7519"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "2448c7e794e926894208abb4d25ea3b4c5db0cbb"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "a096f8152416d6af72a28fe25a849feb22ab835e"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d974227fe54d7db75fc3b2fd773cf69ff71d647b"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b318ede019b019ee108d79e4f355311518a05963"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "c9aa90d984c2112f3e0e629f95b694b6281fe1df"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "8b3c1d3ebf013cf1c7bb448131b51920e1475240"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "47318f7ea3655b6fa876d77eea22a499d458b445"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a1d42692baf6602f69fa436ed5eb6d21c60f3786"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "c97407ba107843f8f1f78ef70028b60bbc94ea87"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "68d1e7771a74e238ce54cff60e7279c672e4fbcd"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "cecb38e05ff1c5e6c0d79781efcf2973db6f68f0"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "5f576fdbbc9626fa9ef3986c2611285ea7fb34e3"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "b97dab8ea7387a69f499c6ab9827bc81b0ffd1ad"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6d816a79fc954a186f9a3e9d8a909a392e0c8cb0"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "3f3a3b51d488a4940211951d698c59c33199a0a0"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "6d07bd223fd7848c4f92170f299df7091feda8dc"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "7b4cf9716f6c4333b143b61ce0ae7f7bf8832839"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "3887efcc6f8a87bdee12aeaeb1e4ad9666e1fba0"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "5d5f9db2a454e40c20db7728140b1e7b71e0f316"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "d8a0e81544d9055f39d0b8e425499e5da7ae2cde"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "f67d1c091a83a129e0f9da21c40a21e54192dfab"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "cf404307b7a5c1346c84f12272526ccc34509794"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "72d178beda4c3141ccccb0fd75d1a96e72b8f522"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "aad4b807fcbf460eb0fa0234d36092e0ca75e286"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "72f0b6ff9321bf171e7991853d37416e79db2598"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "c25dd452bd1a76d7aff4542caf4fd02f7cdcf751"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "ab0f31e1f704d125d3deb73dae6b5513f4f66cec"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "680edf9cb98b47ef92e3a9fbaa1bb66fc927003a"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "10e1fbc3cc3f2284fd28ce06c3af22d7010fa664"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "1317fc854581a50a4291bb38ff6954fe37d25efa"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "81188a3e20db29040202b24f99b073daef759f05"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "230488965e68f9170ca7b6623a599e4ec592012d"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "ff6048c8c949ef3b4fa821bedd95c046e3a7a7e4"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "02954fbabaf0688e1588652d5be08cb3784ff2aa"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "77759d296e5c85741aad42124e51913005215b71"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "8572f88439049bff5e32f4e9929f07c23dcde569"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "07101c61d8a1a7a153c9993f29c2ae7bd46c6ae2"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "dbd64d165bc9bb01545b6d31acdd4fb874f250a9"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "0e00df0f77fd8c7adb1a7822285a8410df92dd48"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "064760c31c2b78fd155a548f18be6bd82746aa7d"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "39e185b485b6808619f4fb0853e161d31dfc07f4"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "8842689c5894ea116f637691627f8513e22e00fb"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "db96505385175ae4267ae6774c6f6375db8f7dca"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "8a9e2e5b17619857a0a2c795ffd7c04d1a767559"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "2e3e0aeff9143b74e464d532eb4c94dc72165303"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "e24a2d824ffb5fe5f1f8678b8567fb58e925f3d4"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "6dbc06e58b5bf2b3b8f109c2ff1840ecfb1fdfd3"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ae7868f33c6e4b15af3f6f6fcc18814a726d9c9f"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "4a46a545fbd4236b0eff0ade9ce57dc53458ad67"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "acec465483c0a2c445e9a3c9c5166c21308b9697"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "68adee53b26075e18d0ef4d43da4260ec274d861"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "8e2cc81fc414fb71e5a83c40b4a4197f6648af78"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "f36ae5a72738cfa70c6824a5929cb14faa60be1b"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "4b7a01e76db920d4aa1cbeb556cbe91b37070304"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "a71cc4c7f988f1b5470dec60a73643f53104a1b2"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "1c47a2b37a88d405a819c7bdbe84489a31e838dd"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "d25ec2c169ea9a953636e0cbd4049095834c808d"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "5f588ffb8e21ea15fb78dca128a33be734575e3e"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "aadbbc147c65d2436916e81bb43ca342f5c19a9d"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "9e04c39967e0a667b5a33f7436d555ac25ea4240"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "9062edea598e4ec354259268be1fa2f85b8ba6d0"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "98e6cac1de95a571ea6f88b18970c11b8056b8cb"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "4c23a1fb7e8ecdd1e20f9d398c387fbd766fa51e"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "5b4bb2a9906c7475c718ad0abd299606718c3880"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "e10d45e9c2de22d9af5db6750f5466d0fddce6d8"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "ce70351af3ce9f27051ae14e9a529cba9876aeb8"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "e9546468eb2ddf67ea93563bd1a1c69736effa6b"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "fb734bc851775335e4dbd795fb7a56ca30a2a7ae"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "36aeba40a75a80ab186bab0024607a263c92a8b5"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e6f3833728864120906a7409561c09ace56713bb"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c641603161439f8c982952db76a9a947a5e68f5f"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "97f560a79f9dffd208cc572875c9bd683ce7e0f7"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "08e490ecf22f1e6e2646ddb1bba508835593b6ae"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "e0b84df55b0ae2e216196037f62004d11074c618"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "8f2f9e0870b27f4d184ee98052a78eff64192981"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "8fbf417d8e2fe33d926bafc0fe4a4b433bd4ac93"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "db308680eda482ebe59bd7807e433a3761b69160"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "888fe735b223b2d233900c1f356de187a92eca02"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "c3a185149605ec5818de19047c3a9be4cc8800b6"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "6e6477d578bec18d7e67d35012c5d019f4055c65"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "7990f07ca2fc0f28bdd2e96d5fe227b29f6eebaf"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "11457870a82224739a5b02e7645703613b7c207b"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "9d96c67f5b22e6f8c114dd39230c666778d872b6"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "bff7b7716f2195fbb8e746b8e65498283c872710"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "7de018d1749c18a37da19db55a3070ef84e62ce4"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "44fe11de7503409417ad9c7ae0bf39c425c2dc90"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "2f9a019ff89e8b20d22d2e22cf58002a4d627228"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "f708084b81a3a98ac64e0e2ea4b6f97fe48a7209"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "77ddde8a32e0d81d5d7e136324117a4e07aaf7f0"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "dce4f745d77da895075b10f921b445e0df349edd"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "7de8827e2929114f869af44e90dbac306b0ce9e7"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "ead42059b82f9ab565a34fa3d6b3bc0f5a211a50"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "765f0120c223d07e84bc3ebf00eeef2e2907640e"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "0a317d7a0926e29e6dc8c563cf09fe667141da7d"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "52629a4afcc9f3224e3a8fdd12f2385ffd21cf00"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d2fa0d6970a88de5125d89ae8263517a9bbc2346"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "fbd01eae326465a8f4efeb08ff44d27f04e2ed66"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "08b0f4d181ce1f0db0a799a7876315c6752c76af"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "1a6d77533438619715e37b43c97f131ac7066ac0"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "fae63a4b373d2074775dfa67ba7d4320cad59e61"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "6068e7326eddf2d36afdd20dee1dd433abb0e3d0"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "010544ad413acf7210c10aa3dc99ef0cdab6b475"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "0378eb7346f686a8a25c71febfd933f3080e7e29"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "01647b2981d62e2171f9e7b6e8286c542a00583a"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "0f6194bce1a065d7b41fd8a46c52ea38874e9e56"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "04f6cb55cb4f9171adf14c7a11ec0271d6c2cf3e"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "1da33a7e75efca19810ab7e739f2b81e0d48c379"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "44d8f989b04b16eff2bcf4945d3fa4387279dfc7"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "60306283826c048acb1ad0232e9c1461f49f2a95"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "16de3bde630a31c9330fd87ed7d994443371d84e"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "728780b2668bb107db51f3804a53923d1a7c8298"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "b31affd14286e7462e6c3bca472d88025c2b917b"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "52d009168db00b167df1890dee39580ccca36ab6"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "d65def2945ea4222965fa16e653cd0db8eec9454"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "f62e88efed3d68b1ad88dfe9e8111d213b2c713b"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "708ffd36d036b4c652ac1f20bf0cba2140035bc9"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "310076f077abdd7834f341091a9541a27ce1f6ce"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "5b2e56cf8173b5c4ab0949d9f5d099dbca8f27cb"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "de33f286bf9c6461335dc7cc9b997c6f52de34f6"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "b53848124a0d3d1d71a4e802d99a4344edd91e03"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f3bdd90591fbaa6a15b1ae671e8633af3a2765ea"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "c8594b0932650c5850a84a35953b7116c432d0a9"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "546818b38dc2e21afa2a51a29c2148bfe39ce33b"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "a70e63927324099122edc032bb699e058c1ef36c"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "75d6dc5dc3adc964be970dddc128e13baaac23dd"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "2eba733d65e7582a23d84392288d10336e978009"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "97285fae817794cc05e9a121c33aafeff77442cb"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "063536c1cbc29c430a8e01674f3bb62ed94e18d9"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "a4be53b79cd1027f517562a0723233643b6e2020"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "4fcaf3a6347beaac041f9095609a92c03700e911"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "80d5db7c9a65de398663b3dc659723b12cdbe502"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "920bd570abce26d713f11666852fcf5d37d00331"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "5de961d08a5bba30245b714271ab4ed5d24a3bc4"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "fb30c3ab5b224a38416eb783ee30c3aa8b4a743b"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "31113c1b61217820f9a9e3dcace821aef612edd7"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "381bce247ea65fee04ee94d56e70cd30cc6959bd"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "90515b7c36553cdf6b88b44146766c52d1a7acd5"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "be0542fc76fedf82b46031dbeb9f4173be2a5313"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "4389ed68236bdc4697f3c8e5c53fe986ccb5f277"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "0bb311890b604d1300ffa887984b4217cfb3b925"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "8415b519f19a3c52a5d8418046a7a67d118a38e1"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "e492caab12e6dace9dc763209a8b0803e8216d2f"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "663d406a587449f33561173d6e6d275964b9172d"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "0f649b13c2dad302b0cf449915f5c1a5ab7e198c"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "490aeed8cd9878d0f22ea99df674d1dbe134a6f3"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "2fbe0baed7379d717174be8dee4b879e6e4afd81"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "64144069a001bce53651aa5b8ec835c8c61bce1b"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "66563588c41fed8e542c89756dc235773c6d201b"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "c7e4a6544d4062958d48be26df3738b15871edcd"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "5a0c5b2dd2dfe83ea9551fd63c249bc6b41c8afc"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "5f8bbbd2b77447660022464d19b3bb316eeb6b53"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "8211373a9ab45f43f2a895049f49c2b9b7af3670"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "48b72a568ea55462d0d80194292ada525d24ee10"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "27fbe84930417244c900ae864589fd063358e741"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "f185c79195b7018edc97bd698d2f2f4f0f619968"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "bcb4ceb162ae954a6c79ac6e83655b981eb0c168"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "037516a147c18d03a74243ea680ec2da7b893b2f"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "1a2efb6b3253da2e525b25b1e5cf794da203a112"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "0200e608a4339158bafdafe32f39581d11ca4fea"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "b5dd68b8d170b577f49508db110a7e3ef9aa1504"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "5d9a22b515130e8c351fbbc71c5ee9c2586a98ca"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "2b49dc4f3e43c4812239798b9096f4e89c5dc101"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "530dfc4740f6c9c45163d51a49d4f6da8a1442c2"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "927c9ca797e463336a8a7c66fef59fa585a0e985"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "71984f44931f8c6e21a0e5a78d33301e9efd0c56"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "14df4792bebc70fb27aba0e8fa9fa570b3c66cd2"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "8301bc4d6919b849e1e0529d79fd56dfd7941e96"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "5f7f352c4c6a316bfd8aa825771178be5e15def0"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "2da181729cd1b9816d9530bfe2da47324595ceae"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "4665e54e425d3b783c2ef045c7d4908862a604db"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "48c57c3952cd918b4547f3aa17e52f856cb441d6"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "769b7e80547be03bc81153c56da69b0660672a5b"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c5123a9df2463883c38d748c360476ec16afafbd"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "50899fd2ddeeaa0011aa68f80ea23af808a2b13d"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "8d2fa9624fe78538ac3be7afef67b5f077ea9087"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "1ce05cc5d619ad8056720ee0a3aa1c142d323577"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "fc1e15e364b4b35ee097cb8a8e58f193cfab07fe"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "750189f10439b7d0592b5b1e5478571778a7b80c"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "562b5113560d43ab0332f12eb5b77f700adc3cac"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "7eea2b63095baaaf4077d21aec79a0262014231f"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "a474b711304003f7872f4d89482e460d6a5c6809"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b44b52752754082dafa7cc2fe3ab820c15ad9dee"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "5b4b8acd59a82feed1015e96efef60693bebc670"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "be13540ad54f006884e5b15c80e60c24739a3afd"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "289f94519a382e07e9ea85c09c50ee0c1e4c78f8"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ee789e0347ae16caeb803db227f917c2dec7402f"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "fdef92aba85eb308f77d5d218eab13ce1869720d"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "dac1e72db319e193b014d53ec2a937939bfda4ee"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "8bdee17c004721832b978028c8249151522d1a53"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "876ea6b07a58dcab72cc431bd4a956f6631616a4"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "4de224d9b431e802274878b1ded2831a7976772d"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "a620baccf62ead31da80d384ea65db816240180f"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "979efbef49bbe7bdd21bb8b6cddf1c79d21e6d7c"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "cce4b5be59a7072aee27b27496cfd2b36995592e"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "64fce36b5536da41b0d6e2144b1d8458fd29c1ec"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "cdf1ccb39f324ada803ebc606ef86f96b813151b"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "a9933f868908c2dd361df41836c8af32e5849f48"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "5462d38f1ea28c5a0abf7523f039f5ae0b4e860a"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "a7e555402c5d7460696b86a2001333f66951a4b1"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "ded2864cea9cdb70f25eaea61d6be6d4d5aaf822"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "fe596ad2b09ada772a38e7504f56776ee382851e"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "c920476a3e726708b447a7c3f9b38223fb5c705c"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "16b4033cd9a05717ba5b32e57935a2a9b2e86e1e"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "dfbf24d40bd5c098aa4c00be18db9adeb278b8a1"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "18e143882f23f6bd2ea7b99849d840c5649b67da"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "c748cbc2444151a2df6dc497b26bb6107cf603a0"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "36abc5c42eaf284249612e2bcf5940aeedadc6b7"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "73e1b14a3f00d73f85aced9b83cc281da6fff8eb"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "621451f0be0f7d3edab0f4fdfaa2199d7e18941b"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "89a750bd28b600375823f92fac3c1ac28e26f24a"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "0cab27456eb5b5124a848c1fcda70e3d8f2fd9d9"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "80c1b1e5cc6385f1e8b6922024726c36bc3360fb"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "4c23cebce4f2548f8692d5d36ab4295bc05a4597"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "e06d1ae0f6dc90766de010102864da5cccca14df"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "0916aaa3a68831ad887708d13770e29edd129ea9"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "a875fa64a788e3fe4b115fc01ad47b631d8aba27"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "d9054dcf7d37ee6e88e462926d5f769bc1392342"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "da23b4a2c9e4434ff927c6af81a3c823e546c24e"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "ee12407db146542b1094342fd618678a8f6d20a3"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "e4c433f31561006c5ba891ca701a03713d30e115"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "07d95dbe0e967732a90b8c6dd1366010791a5286"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "18b0a04c1e38476d85457b0a79942dbe2a0b6b04"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "c4e1f30a92da9ded560209d9a4b8784ec19f9fa8"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "22bfdd2d772f6080dc569b86f27e736c38e99374"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "1d72f825659eec22f52cacdcf4f5890957e8a38e"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "cd1cea8be94c3c4318e0bf9c283acade45f846ff"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "8ddfad29ebeccdddd3e5cdff3d8167a671e6821c"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "b4b36e9624ba93ddea2cca52d974acb67ba3407b"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 326f39515fc4..ff206c50f34a 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -16,14 +16,14 @@
 
 assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
-let version = "40.0.2"; in
+let version = "40.0.3"; 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 = "b5d79fa3684284bfeb7277e99c756b8688e8121d";
+    sha1 = "6ddda46bd6540ab3ae932fbb5ffec8e9a85cab13";
   };
 
   buildInputs =
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       alsaLib nspr nss libnotify xlibs.pixman yasm mesa
       xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
       xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
-      hunspell libevent libstartup_notification libvpx cairo
+      hunspell libevent libstartup_notification libvpx /* cairo */
       gstreamer gst_plugins_base icu libpng jemalloc
       libpulseaudio # only headers are needed
     ]
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
       "--enable-system-hunspell"
       "--enable-system-pixman"
       "--enable-system-sqlite"
-      "--enable-system-cairo"
+      #"--enable-system-cairo"
       "--enable-gstreamer"
       "--enable-startup-notification"
       "--enable-content-sandbox"            # available since 26.0, but not much info available
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 0ded56b8aba5..01c643408757 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.491";
+  version = "11.2.202.508";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "150zlnkq8jhhphfmyzdrpgi1y2sniqgx0a5ij994in3gvari9gpl";
+        sha256 = "1i0301vnz94pxcwm9wk1jjyv7gwywy6p7z26ikd5cg259myxbg75";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "0lwff46gjazjv04fpck0nhv47b4z1x79n09q5444npm1w5zjfgxy";
+        sha256 = "1483bi34ymchv1cqg57whxhlrhhvwhcw33zjgwzmy7bacxbkj9ia";
       }
     else throw "Flash Player is not supported on this platform";
 
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index f9bd941b2f66..c894a49c20e3 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp
 , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, polarssl, libsoup, udev
 , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip
+, mediastreamer-openh264, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
-  name = "linphone-3.8.1";
+  name = "linphone-3.8.5";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/3.8.x/sources/${name}.tar.gz";
-    sha256 = "19xwar8z5hyp1bap1s437ipv90gspmjwcq5zznds55d7r6gbqicd";
+    sha256 = "10brlbwkk61nhd5v2sim1vfv11xm138l1cqqh3imhs2sigmzzlax";
   };
 
   buildInputs = [
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec {
     polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
   ];
 
-  nativeBuildInputs = [ intltool pkgconfig ];
+  nativeBuildInputs = [ intltool pkgconfig makeWrapper ];
 
   configureFlags = [
     "--enable-ldap"
@@ -27,6 +28,12 @@ stdenv.mkDerivation rec {
     "--enable-external-mediastreamer"
   ];
 
+  postInstall = ''
+    for i in $(cd $out/bin && ls); do
+      wrapProgram $out/bin/$i --set MEDIASTREAMER_PLUGINS_DIR ${mediastreamer-openh264}/lib/mediastreamer/plugins
+    done
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://www.linphone.org/;
     description = "Open Source video SIP softphone";
diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch b/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch
deleted file mode 100644
index 8978e6e66525..000000000000
--- a/pkgs/applications/networking/instant-messengers/linphone/fix-deprecated.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/gtk/main.c b/gtk/main.c
-index 7079bc8..f076127 100644
---- a/gtk/main.c
-+++ b/gtk/main.c
-@@ -1643,7 +1643,7 @@ int main(int argc, char *argv[]){
- 	GdkPixbuf *pbuf;
- 	const char *app_name="Linphone";
- 
--	g_thread_init(NULL);
-+	g_type_init();
- 	gdk_threads_init();
- 	
- 	progpath = strdup(argv[0]);
-diff --git a/gtk/setupwizard.c b/gtk/setupwizard.c
-index 1c54fca..45c9091 100644
---- a/gtk/setupwizard.c
-+++ b/gtk/setupwizard.c
-@@ -270,7 +270,7 @@ static void account_username_changed(GtkEntry *entry, GtkWidget *w) {
- 	linphone_account_creator_set_username(creator, gtk_entry_get_text(username));
- 
- 	if (g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{3,}$", gtk_entry_get_text(username), 0, 0)) {
--		g_thread_create(check_username_availability, (void*)w, FALSE, NULL);
-+		g_thread_new (NULL, check_username_availability, (void*)w);
- 	}
- 	else {
- 		if (gtk_entry_get_text_length(username) < LOGIN_MIN_SIZE) {
-@@ -534,7 +534,7 @@ GtkWidget * linphone_gtk_create_assistant(void){
- 	ok = create_pixbuf(linphone_gtk_get_ui_config("ok","ok.png"));
- 	notok = create_pixbuf(linphone_gtk_get_ui_config("notok","notok.png"));
- 
--	g_thread_init (NULL);
-+	g_type_init ();
- 	gdk_threads_init ();
- 
- 	GtkWidget *p1=create_intro();
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
index b387ed350af2..8b19f338d3e6 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pidgin, intltool, libxml2 }:
+{ stdenv, fetchurl, pidgin, intltool, libxml2, nss, nspr }:
 
 let version = "1.18.1"; in
 
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
 
   postInstall = "find $out -ls; ln -s \$out/lib/purple-2 \$out/share/pidgin-sipe";
 
-  buildInputs = [pidgin intltool libxml2];
+  buildInputs = [ pidgin intltool libxml2 nss nspr ];
+
 }
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 57e9cbe7e8a1..f42426b3cafd 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,12 +4,12 @@ with goPackages;
 
 buildGoPackage rec {
   name = "syncthing-${version}";
-  version = "0.11.20";
+  version = "0.11.22";
   goPackagePath = "github.com/syncthing/syncthing";
   src = fetchgit {
     url = "git://github.com/syncthing/syncthing.git";
     rev = "refs/tags/v${version}";
-    sha256 = "72092f2bfaaeb8c7c9264200f7d08c5e78f670f80a018dd70477c23c0fd88619";
+    sha256 = "0zdk5ppsq35s10chf8m3rw3sk9d77ms7x1vj3inw4lrm1h13w9wk";
   };
 
   subPackages = [ "cmd/syncthing" ];
diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix
index 16a45cca6443..5cafb19350c2 100644
--- a/pkgs/applications/science/logic/verit/default.nix
+++ b/pkgs/applications/science/logic/verit/default.nix
@@ -1,24 +1,21 @@
-{ stdenv, fetchurl, gmp, flex, bison }:
+{ stdenv, fetchurl, autoreconfHook, gmp, flex, bison }:
 
 stdenv.mkDerivation rec {
   name = "veriT-${version}";
-  version = "201410";
+  version = "201506";
 
   src = fetchurl {
     url = "http://www.verit-solver.org/distrib/${name}.tar.gz";
-    sha256 = "0b31rl3wjn3b09jpka93lx83d26m8a5pixa216vq8pmjach8q5a3";
+    sha256 = "1cc9gcspw3namkdfypkians2j5dn224dsw6xx95qicad6033bsgk";
   };
 
-  buildInputs = [ gmp flex bison ];
+  nativeBuildInputs = [ autoreconfHook flex bison ];
+  buildInputs = [ gmp ];
 
-  enableParallelBuilding = false;
+  makeFlags = [ "LEX=${flex}/bin/flex" ];
 
-  makeFlags = [
-    "EXTERN=" # use system copy of gmp
-  ];
-
-  installPhase = ''
-    install -D -m0755 veriT $out/bin/veriT
+  preInstall = ''
+    mkdir -p $out/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix
new file mode 100644
index 000000000000..15035a345d4e
--- /dev/null
+++ b/pkgs/applications/version-management/cvs-fast-export/default.nix
@@ -0,0 +1,49 @@
+{stdenv, fetchurl, makeWrapper, flex, bison,
+ asciidoc, docbook_xml_dtd_45, docbook_xml_xslt,
+ libxml2, libxslt,
+ python27, rcs, cvs, git,
+ coreutils, rsync}:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "cvs-fast-export-${meta.version}";
+  meta = {
+    version = "1.32";
+    description = "Export an RCS or CVS history as a fast-import stream";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ dfoxfranke ];
+    homepage = "http://www.catb.org/esr/cvs-fast-export/";
+    platforms = platforms.all;
+  };
+
+  src = fetchurl {
+    url = "http://www.catb.org/~esr/cvs-fast-export/cvs-fast-export-1.32.tar.gz";
+    sha256 = "5bfb9a5650517d337a96a598795b50bc40ce12172854a6581267e7be3dbcfb97";
+  };
+
+  buildInputs = [
+    flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt
+    python27 rcs cvs git makeWrapper
+  ];
+
+  postPatch = "patchShebangs .";
+
+  preBuild = ''
+    makeFlagsArray=(
+      XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      prefix="$out"
+    )
+  '';
+
+  doCheck = true;
+
+  postInstall =
+    let
+      binpath = makeSearchPath "bin" [ out rcs cvs git coreutils rsync ];
+    in ''
+      for prog in cvs-fast-export cvsconvert cvssync; do
+        wrapProgram $out/bin/$prog \
+          --prefix PATH : ${binpath}
+      done
+    ''
+  ;
+}
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
new file mode 100644
index 000000000000..5c2dde955721
--- /dev/null
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -0,0 +1,66 @@
+{stdenv, fetchurl, makeWrapper, python27, python27Packages, git,
+ docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto,
+ cython ? null,
+ bazaar ? null, cvs ? null, darcs ? null, fossil ? null,
+ mercurial ? null, monotone ? null, rcs ? null, src ? null,
+ subversion ? null, cvs_fast_export ? null }:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "reposurgeon-${meta.version}";
+  meta = {
+    description = "A tool for editing version-control repository history";
+    version = "3.28";
+    license = licenses.bsd3;
+    homepage = "http://www.catb.org/esr/reposurgeon/";
+    maintainers = with maintainers; [ dfoxfranke ];
+    platforms = platforms.all;
+  };
+
+  src = fetchurl {
+    url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.28.tar.gz";
+    sha256 = "3225b44109b8630310a0ea6fe63a3485d27aa46deaf80e8d07820e01a6f62626";
+  };
+
+  # See https://gitlab.com/esr/reposurgeon/issues/17
+  patches = [ ./fix-preserve-type.patch ];  
+
+  buildInputs =
+    [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++
+    optional (cython != null) cython
+  ;
+
+  preBuild = ''
+    makeFlagsArray=(
+      XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml"
+      prefix="$out"
+      pyinclude="-I${python27}/include/python2.7"
+      pylib="-L${python27}/lib -lpython2.7"
+    )
+  '';
+
+  buildFlags = "all" + (if cython != null then " cyreposurgeon" else "");
+
+  installTargets =
+    "install" + (if cython != null then " install-cyreposurgeon" else "")
+  ;
+
+  postInstall =
+    let
+      binpath = makeSearchPath "bin" (
+        filter (x: x != null)
+        [ out git bazaar cvs darcs fossil mercurial
+          monotone rcs src subversion cvs_fast_export ]
+      );
+      pythonpath = makeSearchPath (python27.sitePackages) (
+        filter (x: x != null)
+        [ python27Packages.readline or null python27Packages.hglib or null ]
+      );
+    in ''
+      for prog in reposurgeon repodiffer repotool; do
+        wrapProgram $out/bin/$prog \
+          --prefix PATH : "${binpath}" \
+          --prefix PYTHONPATH : "${pythonpath}"
+      done
+    ''
+  ;    
+}
diff --git a/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch
new file mode 100644
index 000000000000..ef3568b7b927
--- /dev/null
+++ b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch
@@ -0,0 +1,12 @@
+diff -Nru reposurgeon-3.28/reposurgeon reposurgeon-3.28-new/reposurgeon
+--- reposurgeon-3.28/reposurgeon	2015-07-05 15:17:13.000000000 -0400
++++ reposurgeon-3.28-new/reposurgeon	2015-08-25 18:23:11.347591137 -0400
+@@ -193,7 +193,7 @@
+         importer=b"git fast-import --quiet",
+         checkout=b"git checkout",
+         lister=b"git ls-files",
+-        preserve=(b'.git/config', b'.git/hooks'),
++        preserve=set((b'.git/config', b'.git/hooks')),
+         authormap=b".git/cvs-authors",
+         ignorename=b".gitignore",
+         dfltignores=b"",	# Has none
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 3180a9e632a1..7482a92e82bb 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,14 +1,12 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  versionMajor = "15.5";
-  versionMinor = "17";
-  version = "${versionMajor}.${versionMinor}";
+  version = "15.8.0";
   name = "smtube-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/smtube/SMTube/${versionMajor}/${name}.tar.bz2";
-    sha256 = "0jbik41nb1b7381ybzblmmsl8b7ljl6a2zpn1dcg0cccjw5mnbyg";
+    url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
+    sha256 = "0hxh3axlhd16ffnkynm4lcfpkwkfv19y70cqgpqrdj2gl8f917bp";
   };
 
   makeFlags = [
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index c3b141cba818..6ad59a087e9f 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,21 +1,28 @@
 { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper,
 btrfsProgs, iptables, bash, e2fsprogs, xz}:
 
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md
+
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.7.1";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz";
+    sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz";
   };
 
   buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ];
 
   dontStrip = true;
 
+  preConfigure = ''
+    mv vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/{jump_amd64.go,jump_linux.go}
+    sed -i 's/,amd64//' vendor/src/github.com/opencontainers/runc/libcontainer/seccomp/jump_linux.go
+  '';
+
   buildPhase = ''
     patchShebangs .
     export AUTO_GOPATH=1
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a5d403457de0..465819949108 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman
 , attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy
-, libseccomp, libaio, libcap_ng, gnutls
+, libseccomp, libaio, libcap_ng, gnutls, nettle
 , makeWrapper
 , pulseSupport ? true, libpulseaudio
 , sdlSupport ? true, SDL
@@ -11,7 +11,7 @@
 
 with stdenv.lib;
 let
-  n = "qemu-2.2.1";
+  n = "qemu-2.4.0";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -22,13 +22,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/${n}.tar.bz2";
-    sha256 = "181m2ddsg3adw8y5dmimsi8x678imn9f6i5p20zbhi7pdr61a5s6";
+    sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j";
   };
 
   buildInputs =
     [ python zlib pkgconfig glib ncurses perl pixman attr libcap
       vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp
-      libcap_ng gnutls
+      libcap_ng gnutls nettle
     ]
     ++ optionals pulseSupport [ libpulseaudio ]
     ++ optionals sdlSupport [ SDL ]
diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch
index 81d29feea3de..833f030bed35 100644
--- a/pkgs/applications/virtualization/qemu/no-etc-install.patch
+++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch
@@ -1,14 +1,11 @@
-diff --git a/Makefile b/Makefile
-index d6b9dc1..ce7c493 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -384,8 +384,7 @@ install-confdir:
- install-sysconfig: install-datadir install-confdir
- 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
+@@ -418,7 +418,7 @@
  
--install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
+ 
+ install: all $(if $(BUILD_DOCS),install-doc) \
 -install-datadir install-localstatedir
-+install: all $(if $(BUILD_DOCS),install-doc) install-datadir
++install-datadir
  ifneq ($(TOOLS),)
  	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
  endif
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 0b3300e2026e..71aa7a710f9e 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     homepage = http://rkt.io;
     license = licenses.asl20;
     maintainers = with maintainers; [ ragge ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index b57b687e20f7..9060c073eee3 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,4 +1,4 @@
-{ writeText, writeScriptBin, stdenv, ruby } : { env, runScript } :
+{ runCommand, writeText, writeScriptBin, stdenv, ruby } : { env, runScript ? "bash" } :
 
 let
   name = env.pname;
@@ -9,21 +9,37 @@ let
     ${builtins.readFile ./chroot-user.rb}
   '';
 
-  init = writeText "init" ''
-           # Make /tmp directory
-           mkdir -m 1777 /tmp
+  init = run: writeText "${name}-init" ''
+    # Make /tmp directory
+    mkdir -m 1777 /tmp
 
-           # Expose sockets in /tmp
-           for i in /host-tmp/.*-unix; do
-             ln -s "$i" "/tmp/$(basename "$i")"
-           done
+    # Expose sockets in /tmp
+    for i in /host-tmp/.*-unix; do
+      ln -s "$i" "/tmp/$(basename "$i")"
+    done
 
-           [ -d "$1" ] && [ -r "$1" ] && cd "$1"
-           shift
-           exec "${runScript}" "$@"
-         '';
+    [ -d "$1" ] && [ -r "$1" ] && cd "$1"
+    shift
+    exec ${run} "$@"
+  '';
 
-in writeScriptBin name ''
+in runCommand name {
+  passthru.env =
+    runCommand "${name}-shell-env" {
+      shellHook = ''
+        exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"
+      '';
+    } ''
+      echo >&2 ""
+      echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***"
+      echo >&2 ""
+      exit 1
+    '';
+} ''
+  mkdir -p $out/bin
+  cat <<EOF >$out/bin/${name}
   #! ${stdenv.shell}
-  exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init} "$(pwd)" "$@"
+  exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init runScript} "\$(pwd)" "\$@"
+  EOF
+  chmod +x $out/bin/${name}
 ''
diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index 3e5ad1655be6..4156fb69069f 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pecita-${version}";
-  version = "5.0";
+  version = "5.1";
 
   src = fetchurl {
     url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "0agml1886jvb0j6jar8hjx4hfbz3n0msszyp625b96ilv09qrcyz";
+    sha256 = "0v2k6vvzl1f809h3lfld6zy5m56w1dn27xmdy3hjniv6j9xbhbs4";
   };
 
   phases = ["installPhase"];
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
deleted file mode 100644
index 36d2cc48c9f0..000000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "docbook-xsl-ns-1.78.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/docbook/${name}.tar.bz2";
-    sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
-  };
-
-  buildPhase = "true";
-
-  installPhase =
-    ''
-      dst=$out/share/xml/docbook-xsl-ns
-      mkdir -p $dst
-      rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
-      mv * $dst/
-
-      # Backwards compatibility. Will remove eventually.
-      mkdir -p $out/xml/xsl
-      ln -s $dst $out/xml/xsl/docbook
-    '';
-
-  meta = {
-    homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
-    description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
-    maintainers = [ lib.maintainers.eelco ];
-    platforms = lib.platforms.all;
-  };
-}
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
deleted file mode 100644
index 9ac8e74d93a3..000000000000
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/builder.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-source $stdenv/setup
-
-mkdir -p $out
-cd $out
-unpackFile $src
-mkdir xml
-mkdir xml/xsl
-mv docbook-xsl-* xml/xsl/docbook
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 981aa59369de..863f60444025 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -1,10 +1,47 @@
-{stdenv, fetchurl}:
+{ lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "docbook-xsl-1.78.1";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = mirror://sourceforge/docbook/docbook-xsl-1.78.1.tar.bz2;
+let
+
+  common = { pname, sha256 }: stdenv.mkDerivation rec {
+    name = "${pname}-1.78.1";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/docbook/${name}.tar.bz2";
+      inherit sha256;
+    };
+
+    buildPhase = "true";
+
+    installPhase =
+      ''
+        dst=$out/share/xml/${pname}
+        mkdir -p $dst
+        rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
+        mv * $dst/
+
+        # Backwards compatibility. Will remove eventually.
+        mkdir -p $out/xml/xsl
+        ln -s $dst $out/xml/xsl/docbook
+      '';
+
+    meta = {
+      homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
+      description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats";
+      maintainers = [ lib.maintainers.eelco ];
+      platforms = lib.platforms.all;
+    };
+  };
+
+in {
+
+  docbook_xsl = common {
+    pname = "docbook-xsl";
     sha256 = "0rxl013ncmz1n6ymk2idvx3hix9pdabk8xn01cpcv32wmfb753y9";
   };
+
+  docbook_xsl_ns = common {
+    pname = "docbook-xsl-ns";
+    sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng";
+  };
+
 }
diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
index 294793d6af75..c8d33c24156c 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core
-, dbus, intltool, libwnck3, hicolor_icon_theme }:
+, dbus, intltool, libwnck3 }:
 
 stdenv.mkDerivation rec {
   name = "accerciser-3.14.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
     python3Packages.pygobject3 python3Packages.ipythonLight
-    at_spi2_core dbus intltool libwnck3 hicolor_icon_theme
+    at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
   ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
index 5eb922994ee4..99ea481307e7 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, glib
 , evolution_data_server, evolution, sqlite
-, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils
+, makeWrapper, itstool, desktop_file_utils
 , clutter_gtk, libuuid, webkitgtk, zeitgeist
 , gnome3, librsvg, gdk_pixbuf, libxml2 }:
 
@@ -20,9 +20,8 @@ stdenv.mkDerivation rec {
                   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 ];
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
+                  evolution_data_server evolution sqlite ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
index a77fe574709f..d77740d35075 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
+, pkgconfig, gtk3, glib, 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 }:
@@ -21,12 +21,11 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gnome3.gtkhtml ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg db icu
+                  gdk_pixbuf gnome3.defaultIconTheme 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 ];
 
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
index 122449eb4f5f..88ced2b2b065 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
+, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   name = "file-roller-${version}";
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   # 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 ];
+                  gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
+                  makeWrapper ];
 
   preFixup = ''
     wrapProgram "$out/bin/file-roller" \
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
index 9263fd424767..c046dd7dc9bf 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, enchant, isocodes
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libsoup, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
@@ -14,9 +14,8 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg libsoup
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
                   gnome3.libpeas gnome3.gtksourceview libxml2
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
                   gnome3.gsettings_desktop_schemas makeWrapper file ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
index 24d7688e4de0..3ead4de8bc48 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, python
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , makeWrapper, itstool, libxml2, docbook_xsl
 , gnome3, librsvg, gdk_pixbuf, libxslt }:
 
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
 
   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 ];
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
index cc3640fd09f1..10eaa34a8a2b 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
@@ -2,7 +2,7 @@
 , 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
+, desktop_file_utils, mtools, cdrkit, libcdio
 , libusb, libarchive, acl
 }:
 
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
     makeWrapper pkgconfig intltool itstool libvirt-glib glib
     gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
     libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.adwaita-icon-theme libusb libarchive
-    librsvg hicolor_icon_theme desktop_file_utils acl
+    gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
+    librsvg desktop_file_utils acl
   ];
 
   preFixup = ''
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
index 469581deef48..2308dd90434f 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, libgweather, libnotify
-, pkgconfig, gtk3, glib, hicolor_icon_theme, gsound
+, pkgconfig, gtk3, glib, gsound
 , makeWrapper, itstool, libcanberra_gtk3, libtool
 , gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }:
 
@@ -15,10 +15,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gnome_desktop gnome3.geocode_glib geoclue2
                   libgweather libnotify libtool gsound
-                  hicolor_icon_theme wrapGAppsHook ];
+                  wrapGAppsHook ];
 
   enableParallelBuilding = true;
 
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
index 98059d3ed131..fe6be2e8d4ec 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , makeWrapper, itstool, libxslt, webkitgtk
 , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
 , gobjectIntrospection, json_glib, inkscape, poppler_utils
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
                   docbook_xsl desktop_file_utils inkscape poppler_utils
                   gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg evince
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg evince
                   libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
                   gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
                   gnome3.gnome_desktop gnome3.libzapojit json_glib
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
index 23c77395a828..dbef0526b806 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libxml2, systemd, hicolor_icon_theme }:
+, intltool, itstool, libxml2, systemd }:
 
 stdenv.mkDerivation rec {
   name = "gnome-logs-${gnome3.version}.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd hicolor_icon_theme
+    systemd gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
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
index 0193f00da4f5..3a6de4bcf6f4 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, gdk_pixbuf, tracker
 , python3, libxml2, python3Packages, libnotify, wrapGAppsHook
-, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
+, pkgconfig, gtk3, glib, cairo
 , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
 
 stdenv.mkDerivation rec {
@@ -14,12 +14,11 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg python3
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3
                   gnome3.grilo gnome3.grilo-plugins 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.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook
                   gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  hicolor_icon_theme gnome3.adwaita-icon-theme wrapGAppsHook
                   gnome3.gsettings_desktop_schemas makeWrapper tracker ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
index 2b262c263ac4..4c152777f2cb 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libgtop, intltool, itstool, libxml2, hicolor_icon_theme
-, nmap, inetutils }:
+, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
 
 stdenv.mkDerivation rec {
   name = "gnome-nettool-3.8.1";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   propagatedUserEnvPkgs = [ nmap inetutils ];
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
index 83a732a01d50..a89cde7a111a 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, exempi, libxml2
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , makeWrapper, itstool, gegl, babl, lcms2
 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook
 , gnome3, librsvg, gdk_pixbuf, libexif }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   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
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
                   gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
                   gnome3.gnome_online_accounts gnome3.gnome_desktop
                   lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
index fff9ea5c08b8..5fff782a2e8c 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
-, libgweather, intltool, itstool, hicolor_icon_theme }:
+, libgweather, intltool, itstool }:
 
 stdenv.mkDerivation rec {
   name = "gnome-weather-${gnome3.version}.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
-    libgweather hicolor_icon_theme
+    libgweather gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
index 3e7b72373136..3a28507fac17 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, vala
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , makeWrapper, itstool, gnupg, libsoup
 , gnome3, librsvg, gdk_pixbuf, gpgme
 , libsecret, avahi, p11_kit, openssh }:
@@ -22,9 +22,9 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
                   gnome3.gsettings_desktop_schemas makeWrapper gnupg
-                  gdk_pixbuf gnome3.adwaita-icon-theme librsvg gpgme
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
                   libsecret avahi libsoup p11_kit vala gnome3.gcr
-                  hicolor_icon_theme gnome3.adwaita-icon-theme openssh ];
+                  openssh ];
 
   preFixup = ''
     wrapProgram "$out/bin/seahorse" \
diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
index eb93458ece58..54d2c065d94e 100644
--- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
 
   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 ];
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   preFixup = ''
     wrapProgram "$out/bin/baobab" \
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
index 10e52fe92657..4c42c6c026d3 100644
--- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
+, file, librsvg, 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, libpulseaudio, telepathy_mission_control
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
                   gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf
                   libnotify clutter libsoup gnutls libgee p11_kit
                   libcanberra_gtk3 telepathy_farstream farstream
-                  gnome3.adwaita-icon-theme hicolor_icon_theme 
-                  gnome3.gsettings_desktop_schemas file libtool librsvg ];
+                  gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
+                  file libtool librsvg ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
                          "-I${dbus_libs}/include/dbus-1.0"
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
index 72663122a542..5ec07d01b2e0 100644
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
@@ -2,7 +2,7 @@
 , 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 }:
+, gdk_pixbuf, librsvg, gnome_common }:
 
 stdenv.mkDerivation rec {
   name = "epiphany-${gnome3.version}.0";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   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
+                  gdk_pixbuf gnome3.defaultIconTheme 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";
diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
index a4a26bca1922..abd5074685ac 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
@@ -3,11 +3,11 @@
 , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gcr-3.14.0";
+  name = "gcr-${gnome3.version}.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gcr/3.14/${name}.tar.xz";
-    sha256 = "2a2231147a01e2061f57fa9ca77557ff97bc6ceab028cee5528079f4b2fca63d";
+    url = "mirror://gnome/sources/gcr/${gnome3.version}/${name}.tar.xz";
+    sha256 = "0xfhi0w358lvca1jjx24x2gm67mif33dsnmi9cv5i0f83ks8vzpc";
   };
 
   buildInputs = [
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
 
   #doCheck = true;
 
+  enableParallelBuilding = true;
+
   preFixup = ''
     wrapProgram "$out/bin/gcr-viewer" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
index d4ef3e13eea9..d3d6f4e471c4 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
     substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
   '';
 
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes"
+  configureFlags = [ "--sysconfdir=/etc"
+                     "--localstatedir=/var"
+                     "--with-systemd=yes"
                      "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
 
   buildInputs = [ pkgconfig glib itstool libxml2 intltool
@@ -30,7 +32,10 @@ stdenv.mkDerivation rec {
   '';
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ./no-dbus-launch.patch ];
+  patches = [ ./xserver_path.patch ./sessions_dir.patch
+              ./disable_x_access_control.patch ./no-dbus-launch.patch ];
+
+  installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/GDM;
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
index 5ec87f1f8794..a13ca33fc81a 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, bash, gtk3, glib, makeWrapper
 , itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }:
 
 stdenv.mkDerivation rec {
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
 
   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
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
   preFixup = ''
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
index ea5a42433897..2e89210413f3 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, evolution_data_server, db
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
+, pkgconfig, gtk3, glib, libsecret
 , libchamplain, clutter_gtk, geocode_glib
 , bash, makeWrapper, itstool, folks, libnotify, libxml2
 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
@@ -26,9 +26,8 @@ stdenv.mkDerivation rec {
                   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
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   libchamplain clutter_gtk geocode_glib
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
                   vala automake115x autoconf db ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 0f95f322d13c..1dfc76a2dd54 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
 , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
+, gdk_pixbuf, librsvg, libxkbfile, libnotify
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
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
index 9917fd4d15c6..9e3906dbed13 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libxml2
 , gnome3, librsvg, gdk_pixbuf, file }:
 
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
   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 ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
                   gnome3.gsettings_desktop_schemas makeWrapper ];
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
index b5261c214ad1..ea29cda29612 100644
--- 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
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
+, bash, gtk3, glib, makeWrapper, cracklib, libnotify
 , itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
 , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
 
@@ -20,9 +20,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
                   libxslt libtool libsecret libpwquality cracklib
                   libnotify libdvdread libcanberra_gtk3 docbook_xsl
-                  gdk_pixbuf gnome3.adwaita-icon-theme
+                  gdk_pixbuf gnome3.defaultIconTheme
                   librsvg udisks2 gnome3.gnome_settings_daemon
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
                   gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
 
   preFixup = ''
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
index 1523cf14d2e2..39d5e71a5a3e 100644
--- 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
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool
 , gnome3, librsvg, gdk_pixbuf }:
 
@@ -18,8 +18,7 @@ stdenv.mkDerivation rec {
   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
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas makeWrapper ];
 
   preFixup = ''
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
index a8e877039b20..ac285819e8f4 100644
--- 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
@@ -1,7 +1,7 @@
 { 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, hicolor_icon_theme
+, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   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 hicolor_icon_theme ];
+                  docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
 
   preFixup = ''
     for f in "$out/libexec/"*; do
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
index 559d084add19..c36e1b87d668 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, bash, gtk3, glib, makeWrapper
 , itstool, gnome3, librsvg, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   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 ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
                   gnome3.gsettings_desktop_schemas makeWrapper ];
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
index be1b4c0d2cde..bce31242dac0 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg, hicolor_icon_theme }:
+, libxslt, intltool, makeWrapper, systemd, xorg }:
 
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon xorg.xtrans hicolor_icon_theme
+      gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
       gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
 
   preFixup = ''
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
index 1b17d1f1f53f..d4e5d807e483 100644
--- 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
@@ -1,7 +1,5 @@
-{ stdenv, intltool, fetchurl, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool
-, gnome3, file }:
+{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, gnome3, file }:
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-${gnome3.version}.1";
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
index 44af987dfe4f..716f92a072d4 100644
--- 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
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, bash, gtk3, glib, makeWrapper
 , itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
 
 stdenv.mkDerivation rec {
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   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 ];
+  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
 
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
                   gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
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
index 94c7af904ddd..353c8fcf4dbe 100644
--- 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
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
+, bash, gtk3, glib, makeWrapper
 , itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
 
 stdenv.mkDerivation rec {
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
 
   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
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   gnome3.gsettings_desktop_schemas ];
 
   preFixup = ''
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
index ff12622d28f0..7bd689511d53 100644
--- 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
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
-, gdk_pixbuf, hicolor_icon_theme }:
+, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
   name = "gnome-themes-standard-${gnome3.version}.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
   
   buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
-                  hicolor_icon_theme ];
+                  gnome3.defaultIconTheme ];
 
   meta = with stdenv.lib; {
     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
index 3d2011c01c68..381f7d7c4168 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
+, pkgconfig, gtk3, glib, libxml2, gnused
 , bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
 , gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
 
@@ -27,8 +27,7 @@ in stdenv.mkDerivation rec {
                      "--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
+                  makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg
                   nautilus libnotify libcanberra_gtk3 ];
 
   postInstall = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
index 1787734939d1..cf3f06fef58a 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3
-, glib, gtk3, gobjectIntrospection, python, pygobject3, hicolor_icon_theme
+, glib, gtk3, gobjectIntrospection, python, pygobject3
 }:
 
 let
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   version = "${majorVersion}.1";
 
   buildInputs =  [
-   intltool pkgconfig
-   glib gtk3 gobjectIntrospection python pygobject3 hicolor_icon_theme
+   intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3
+   gnome3.defaultIconTheme
   ];
 
   src = fetchurl {
diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
index 8f7c5675cc2a..8e5a1e21f52b 100644
--- a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
@@ -1,7 +1,7 @@
 { 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 }:
+, gdk_pixbuf, librsvg, gtk3 }:
 
 stdenv.mkDerivation rec {
   name = "sushi-3.12.0";
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   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 ];
+                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
+                  librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
+                  gnome3.evince icu makeWrapper ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
index d99a24bbfa2d..41f220ec38b8 100644
--- a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, gst_all_1
 , clutter_gtk, clutter-gst, pygobject3, shared_mime_info
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, libxml2, dbus_glib
 , gnome3, librsvg, gdk_pixbuf, file }:
 
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
                   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
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
                   gnome3.gsettings_desktop_schemas makeWrapper file ];
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
index 4265d70a4f9f..88e6da2ad2d0 100644
--- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, libxml2, upower
-, pkgconfig, gtk3, glib, hicolor_icon_theme
+, pkgconfig, gtk3, glib
 , bash, makeWrapper, itstool, vala, sqlite, libxslt
 , gnome3, librsvg, gdk_pixbuf, file, libnotify
 , evolution_data_server, gst_all_1, poppler
@@ -27,12 +27,11 @@ stdenv.mkDerivation rec {
   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
+                  gdk_pixbuf gnome3.defaultIconTheme 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 ];
+                  exempi networkmanager libpng libexif libgsf libuuid ];
 
   preConfigure = ''
     substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
index c40820959182..dcfd7b08b08e 100644
--- a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
@@ -1,6 +1,5 @@
 { stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, hicolor_icon_theme, gnome3
-, libnotify, file, telepathy_glib, dbus_glib }:
+, gnome3, libnotify, file, telepathy_glib, dbus_glib }:
 
 stdenv.mkDerivation rec {
   name = "vino-${versionMajor}.${versionMinor}";
@@ -15,8 +14,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
-                  hicolor_icon_theme gnome3.adwaita-icon-theme
-                  dbus_glib telepathy_glib file makeWrapper ];
+                  gnome3.defaultIconTheme dbus_glib telepathy_glib file
+                  makeWrapper ];
 
   preFixup = ''
     wrapProgram "$out/libexec/vino-server" \
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
index 7f4057072315..e48dcafb3cf8 100644
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
+, file, librsvg, gnome3, gdk_pixbuf, sqlite
 , bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
 , wrapGAppsHook }:
 
@@ -17,8 +17,7 @@ stdenv.mkDerivation rec {
 
   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
+                  librsvg gdk_pixbuf gnome3.defaultIconTheme
                   gnome3.gsettings_desktop_schemas wrapGAppsHook
                   gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
 
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
index bc3521013832..d4dfb7f0a8c1 100644
--- a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool, hicolor_icon_theme }:
+, webkitgtk, intltool }:
 
 stdenv.mkDerivation rec {
   name = "devhelp-${gnome3.version}.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool hicolor_icon_theme
+    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
index 26af4d7286a3..70e7184b3387 100644
--- a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+, librsvg, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "five-or-more-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
index bf15f9f2bbbe..292a54bf1938 100644
--- a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libcanberra_gtk3, librsvg, libxml2
-, hicolor_icon_theme }:
+, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "four-in-a-row-${gnome3.version}.2";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
-    libxml2 hicolor_icon_theme
+    libxml2 gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
index 7161eb5cdaf3..e80c6691e202 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, librsvg, libxml2, hicolor_icon_theme }:
+, intltool, itstool, librsvg, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-chess-${gnome3.version}.2";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
index 6afcc63e97f3..cab2f194d495 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libxml2, intltool, itstool, hicolor_icon_theme }:
+, librsvg, libxml2, intltool, itstool }:
 
 stdenv.mkDerivation rec {
   name = "gnome-klotski-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
index 5b5bdae87c0f..73cb0cf6cebe 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+, librsvg, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-mahjongg-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
index e9af6c0fe4d8..92aa5bd72196 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2, hicolor_icon_theme }:
+, librsvg, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-mines-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
index 8fde848fe1f7..673edff645dc 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
 , librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
-, libxml2, hicolor_icon_theme }:
+, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-nibbles-${gnome3.version}.1";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    librsvg libcanberra_gtk3 hicolor_icon_theme clutter_gtk
+    librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
index a4f945184253..306a9e40852a 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
-, hicolor_icon_theme }:
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-robots-${gnome3.version}.1";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
-    libxml2 hicolor_icon_theme
+    libxml2 gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
index 31b74cd285ea..2a2f97d1e49d 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2
-, hicolor_icon_theme }:
+, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "gnome-taquin-${gnome3.version}.1";
@@ -12,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
-    intltool itstool libxml2 hicolor_icon_theme
+    intltool itstool libxml2 gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
index 37654f8fa338..2b577799307c 100644
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool, hicolor_icon_theme }:
+, libxml2, intltool, itstool }:
 
 stdenv.mkDerivation rec {
   name = "gnome-tetravex-${gnome3.version}.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 hicolor_icon_theme
+    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
index d409ac1b3c32..bd6be7d43c58 100644
--- a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool, hicolor_icon_theme }:
+, libxml2, intltool, itstool }:
 
 stdenv.mkDerivation rec {
   name = "hitori-${gnome3.version}.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    hicolor_icon_theme
+    gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
index 1cf656fe7dcb..11655edded00 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
 , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
 , libnotify, libcanberra, libsecret, gmime
-, libpthreadstubs, hicolor_icon_theme, sqlite
+, libpthreadstubs, sqlite
 , gnome3, librsvg, gnome_doc_utils, webkitgtk }:
 
 let
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
                   vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
-                  libpthreadstubs gnome3.gsettings_desktop_schemas hicolor_icon_theme gnome3.gcr
-                  gdk_pixbuf librsvg gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme ];
+                  libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
+                  gdk_pixbuf librsvg gnome3.defaultIconTheme ];
 
   preConfigure = ''
     substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
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
index c078297c803b..6600345060f9 100644
--- 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
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, python, pygobject3, atk
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsoup
+, pkgconfig, gtk3, glib, libsoup
 , bash, makeWrapper, itstool, libxml2, python3Packages
 , gnome3, librsvg, gdk_pixbuf, file, libnotify }:
 
@@ -19,8 +19,7 @@ stdenv.mkDerivation rec {
 
   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
+                  gdk_pixbuf gnome3.defaultIconTheme librsvg
                   python pygobject3 libnotify gnome3.gnome_shell
                   libsoup gnome3.gnome_settings_daemon gnome3.nautilus
                   gnome3.gnome_desktop ];
diff --git a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
index 650d978277bd..0440af440fec 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
   dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, hicolor_icon_theme, telepathy_glib
+  glib, gobjectIntrospection, telepathy_glib
 }:
 
 stdenv.mkDerivation rec {
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
     makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-    gnome3.gnome_common gnome3.gnome_shell hicolor_icon_theme gtk3
-    telepathy_glib
+    gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib
+    gnome3.defaultIconTheme
   ];
 
   preBuild = ''
diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 00a0e7b9c2be..3b1ebca17965 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -1,23 +1,37 @@
-{ stdenv, fetchurl, coq, ocaml, ocamlPackages }:
+{ stdenv, fetchurl, coq, ocamlPackages
+, tools ? stdenv.cc
+}:
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "1qrb1cplx3v5wxn1c46kx67v1j52yznvjm2hkrsdybphhki2pyia";
+    sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n";
   };
 
-  buildInputs = [ coq ocaml ocamlPackages.menhir ];
+  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]);
 
   enableParallelBuilding = true;
 
   configurePhase = ''
     substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc'
-    ./configure -prefix $out -toolprefix ${stdenv.cc}/bin/ '' +
+    ./configure -prefix $out -toolprefix ${tools}/bin/ '' +
     (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux");
 
+  installTargets = "documentation install";
+
+  postInstall = ''
+    mkdir -p $lib/share/doc/compcert
+    mv doc/html $lib/share/doc/compcert/
+    mkdir -p $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
+    mv backend cfrontend common cparser driver flocq ia32 lib \
+      $lib/lib/coq/${coq.coq-version}/user-contrib/compcert/
+  '';
+
+  outputs = [ "out" "lib" ];
+
   meta = with stdenv.lib; {
     description = "Formally verified C compiler";
     homepage    = "http://compcert.inria.fr";
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 65d52c1a3e51..fe0d0b37371e 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -17,14 +17,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150809";
+  version = "7.11.20150828";
   name = "ghc-${version}";
-  rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977";
+  rev = "38c98e4f61a48084995a5347d76ddd024ce1a09c";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l";
+    sha256 = "0wnxrfzjpjcmsmd2i0zg30jg7zpw1rrfwz8r56g314l7xcns6yp1";
   };
 
   postUnpack = ''
diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 3f0b9e866b05..6334759496f0 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -27,14 +27,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150718";
+  version = "7.11.20150826";
   name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details.
-  rev = "4cb79c85a4976c509a65a8638899391a60cd0962";
+  rev = "5f7f64b7fc879b5ecfd6987ec5565bd90f7c0179";
 
   src = fetchgit {
     url = "https://github.com/goldfirere/ghc.git";
     inherit rev;
-    sha256 = "1pyz459hs189bw2jaz7k2j2r53nc1vfa4q3zd3zz1zm0h14lsmlv";
+    sha256 = "183l4v6aw52r3ydwl8bxg1lh3cwfakb35rpy6mjg23dqmqsynmcn";
   };
 
   postUnpack = ''
diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index 8abafe0d117c..4f9e8b25b755 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -105,8 +105,14 @@ stdenv.mkDerivation rec {
     ./all.bash
   '';
 
+  preFixup = ''
+    rm -r $out/share/go/pkg/bootstrap
+  '';
+
   setupHook = ./setup-hook.sh;
 
+  disallowedReferences = [ go_1_4 ];
+
   meta = with stdenv.lib; {
     branch = "1.5";
     homepage = http://golang.org/;
diff --git a/pkgs/development/compilers/go/remove-tools-1.5.patch b/pkgs/development/compilers/go/remove-tools-1.5.patch
index 00f4fac7476a..5aad4b4abc3f 100644
--- a/pkgs/development/compilers/go/remove-tools-1.5.patch
+++ b/pkgs/development/compilers/go/remove-tools-1.5.patch
@@ -1,22 +1,10 @@
 diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go
-index 61e3d8d..f8475f4 100644
+index 61e3d8d..b8422ad 100644
 --- a/src/cmd/go/pkg.go
 +++ b/src/cmd/go/pkg.go
-@@ -665,7 +665,7 @@ var goTools = map[string]targetDir{
- 	"cmd/asm":                              toTool,
- 	"cmd/compile":                          toTool,
- 	"cmd/cgo":                              toTool,
--	"cmd/cover":                            toTool,
-+	"nixos.org/x/tools/cmd/cover":          toTool,
- 	"cmd/dist":                             toTool,
- 	"cmd/doc":                              toTool,
- 	"cmd/fix":                              toTool,
-@@ -676,9 +676,9 @@ var goTools = map[string]targetDir{
- 	"cmd/pack":                             toTool,
- 	"cmd/pprof":                            toTool,
+@@ -678,7 +678,7 @@ var goTools = map[string]targetDir{
  	"cmd/trace":                            toTool,
--	"cmd/vet":                              toTool,
-+	"nixos.org/x/tools/cmd/vet":            toTool,
+ 	"cmd/vet":                              toTool,
  	"cmd/yacc":                             toTool,
 -	"golang.org/x/tools/cmd/godoc":         toBin,
 +	"nixos.org/x/tools/cmd/godoc":          toBin,
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index fafefd325dfd..f0d3be6487c0 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -1,6 +1,9 @@
 { go, govers, lib }:
 
-{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}
+{ name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? ""
+
+# We want parallel builds by default
+, enableParallelBuilding ? true
 
 # Disabled flag
 , disabled ? false
@@ -120,15 +123,15 @@ go.stdenv.mkDerivation (
     if [ -n "$subPackages" ] ; then
         for p in $subPackages ; do
             go test -p $NIX_BUILD_CORES -v $goPackagePath/$p &
+            PIDS+=("$!")
         done
-        PIDS+=("$!")
     else
         pushd go/src
         while read d; do
-            go test -p $NIX_BUILD_CORES -v $d
+            go test -p $NIX_BUILD_CORES -v $d &
+            PIDS+=("$!")
         done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq)
         popd
-        PIDS+=("$!")
     fi
 
     # Exit on error from the parallel process
@@ -156,13 +159,16 @@ go.stdenv.mkDerivation (
 
     dir="$NIX_BUILD_TOP/go/bin"
     [ -e "$dir" ] && cp -r $dir $out
+
+    runHook postInstall
+  '';
+
+  preFixup = preFixup + ''
     while read file; do
       cat $file ${removeExpr removeReferences} > $file.tmp
       mv $file.tmp $file
       chmod +x $file
     done < <(find $out/bin -type f 2>/dev/null)
-
-    runHook postInstall
   '';
 
   disallowedReferences = lib.optional (!allowGoReference) go
@@ -170,6 +176,8 @@ go.stdenv.mkDerivation (
 
   passthru = passthru // lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
 
+  enableParallelBuilding = enableParallelBuilding;
+
   meta = {
     # Add default meta information
     platforms = lib.platforms.all;
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cc7ef9cfdf79..5e135a999733 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -153,15 +153,12 @@ self: super: {
   hspec-discover = dontHaddock super.hspec-discover;
   http-client-conduit = dontHaddock super.http-client-conduit;
   http-client-multipart = dontHaddock super.http-client-multipart;
-  hxt = dontHaddock super.hxt;                                  # https://github.com/UweSchmidt/hxt/issues/38
   markdown-unlit = dontHaddock super.markdown-unlit;
   network-conduit = dontHaddock super.network-conduit;
   shakespeare-js = dontHaddock super.shakespeare-js;
   shakespeare-text = dontHaddock super.shakespeare-text;
-  types-compat = dontHaddock super.types-compat;                # https://github.com/philopon/apiary/issues/15
   wai-test = dontHaddock super.wai-test;
   zlib-conduit = dontHaddock super.zlib-conduit;
-  record = dontHaddock super.record;                            # https://github.com/nikita-volkov/record/issues/22
 
   # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot.
   darcs = (overrideCabal super.darcs (drv: {
@@ -195,8 +192,9 @@ self: super: {
     else super.hfsevents;
 
   # FSEvents API is very buggy and tests are unreliable. See
-  # http://openradar.appspot.com/10207999 and similar issues
-  fsnotify = if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify;
+  # http://openradar.appspot.com/10207999 and similar issues.
+  # https://github.com/haskell-fswatch/hfsnotify/issues/62
+  fsnotify = dontCheck super.fsnotify; # if pkgs.stdenv.isDarwin then dontCheck super.fsnotify else super.fsnotify;
 
   # the system-fileio tests use canonicalizePath, which fails in the sandbox
   system-fileio = if pkgs.stdenv.isDarwin then dontCheck super.system-fileio else super.system-fileio;
@@ -239,15 +237,6 @@ self: super: {
   # tests don't compile for some odd reason
   jwt = dontCheck super.jwt;
 
-  # 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/NixOS/cabal2nix/issues/136
   glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
   gtk3 = super.gtk3.override { inherit (pkgs) gtk3; };
@@ -325,6 +314,7 @@ self: super: {
   concurrent-dns-cache = dontCheck super.concurrent-dns-cache;
   dbus = dontCheck super.dbus;                          # http://hydra.cryp.to/build/498404/log/raw
   digitalocean-kzs = dontCheck super.digitalocean-kzs;  # https://github.com/KazumaSATO/digitalocean-kzs/issues/1
+  github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
   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"; });
@@ -601,9 +591,9 @@ self: super: {
   # https://github.com/vincenthz/hs-asn1/issues/12
   asn1-encoding = dontCheck super.asn1-encoding;
 
-  # wxc supports wxGTX >= 2.9, but our current default version points to 2.8.
-  wxc = super.wxc.override { wxGTK = pkgs.wxGTK29; };
-  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK29; };
+  # wxc supports wxGTX >= 3.0, but our current default version points to 2.8.
+  wxc = super.wxc.override { wxGTK = pkgs.wxGTK30; };
+  wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
 
   # Depends on QuickCheck 1.x.
   HaVSA = super.HaVSA.override { QuickCheck = self.QuickCheck_1_2_0_1; };
@@ -830,9 +820,6 @@ self: super: {
   # https://github.com/ekmett/comonad/issues/25
   comonad = dontCheck super.comonad;
 
-  # https://github.com/ekmett/semigroupoids/issues/35
-  semigroupoids = disableCabalFlag super.semigroupoids "doctests";
-
   # https://github.com/jaspervdj/websockets/issues/104
   websockets = dontCheck super.websockets;
 
@@ -981,4 +968,53 @@ self: super: {
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;
 
+  # https://github.com/thoughtpolice/hs-ed25519/issues/9
+  ed25519 = markBroken super.ed25519;
+  hackage-repo-tool = dontDistribute super.hackage-repo-tool;
+  hackage-security = dontDistribute super.hackage-security;
+  hackage-security-HTTP = dontDistribute super.hackage-security-HTTP;
+
+  # The cabal files for these libraries do not list the required system dependencies.
+  SDL-image = overrideCabal super.SDL-image (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
+  });
+  SDL-ttf = overrideCabal super.SDL-ttf (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_ttf ];
+  });
+  SDL-mixer = overrideCabal super.SDL-mixer (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_mixer ];
+  });
+  SDL-gfx = overrideCabal super.SDL-gfx (drv: {
+    librarySystemDepends = [ pkgs.SDL pkgs.SDL_gfx ];
+  });
+  SDL-mpeg = overrideCabal super.SDL-mpeg (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [
+      "--extra-lib-dirs=${pkgs.smpeg}/lib"
+      "--extra-include-dirs=${pkgs.smpeg}/include/smpeg"
+    ];
+  });
+
+  # https://github.com/chrisdone/freenect/pull/11
+  freenect = overrideCabal super.freenect (drv: {
+    libraryPkgconfigDepends = [ pkgs.freenect ];
+    prePatch = '' echo "  Pkgconfig-Depends: libfreenect" >> freenect.cabal '';
+  });
+
+  # https://github.com/ivanperez-keera/hcwiid/pull/4
+  hcwiid = overrideCabal super.hcwiid (drv: {
+    configureFlags = (drv.configureFlags or []) ++ [
+      "--extra-lib-dirs=${pkgs.bluez}/lib"
+      "--extra-lib-dirs=${pkgs.cwiid}/lib"
+      "--extra-include-dirs=${pkgs.cwiid}/include"
+      "--extra-include-dirs=${pkgs.bluez}/include"
+    ];
+    prePatch = '' sed -i -e "/Extra-Lib-Dirs/d" -e "/Include-Dirs/d" "hcwiid.cabal" '';
+  });
+
+  # https://github.com/basvandijk/concurrent-extra/issues/12
+  concurrent-extra = dontCheck super.concurrent-extra;
+
+  # https://github.com/brendanhay/amazonka/issues/203
+  amazonka-core = dontCheck super.amazonka-core;
+
 }
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 af34629e3196..55432ccdac50 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -38,7 +38,7 @@ self: super: {
   binary = self.binary_0_7_6_1;
 
   # deepseq is not a core library for this compiler.
-  deepseq = self.deepseq_1_4_1_1;
+  deepseq = self.deepseq_1_4_1_2;
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
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 d8d1e3f499ab..28092f8d886f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -221,17 +221,10 @@ self: super: {
   vector_0_10_9_2 = markBroken super.vector_0_10_9_2;
   hoopl_3_10_2_0 = markBroken super.hoopl_3_10_2_0;
 
-  # http://hub.darcs.net/shelarcy/regex-tdfa-text/issue/1 -- upstream seems to be asleep
-  regex-tdfa-text = appendPatch super.regex-tdfa-text ./patches/regex-tdfa-text.patch;
-
   # https://github.com/HugoDaniel/RFC3339/issues/14
   timerep = dontCheck super.timerep;
 
   # Upstream has no issue tracker.
-  harp = markBrokenVersion "0.4" super.harp;
-  happstack-authenticate = dontDistribute super.happstack-authenticate;
-
-  # Upstream has no issue tracker.
   llvm-base-types = markBroken super.llvm-base-types;
   llvm-analysis = dontDistribute super.llvm-analysis;
   llvm-data-interop = dontDistribute super.llvm-data-interop;
@@ -259,8 +252,8 @@ self: super: {
   HLearn-distributions = dontDistribute super.HLearn-distributions;
   HLearn-classification = dontDistribute super.HLearn-classification;
 
-  # Won't work with LLVM 3.5.
-  llvm-general = markBrokenVersion "3.4.5.3" super.llvm-general;
+  # Doesn't work with LLVM 3.5.
+  llvm-general = markBroken super.llvm-general;
 
   # Inexplicable haddock failure
   # https://github.com/gregwebs/aeson-applicative/issues/2
@@ -275,4 +268,7 @@ self: super: {
   # The tests in vty-ui do not build, but vty-ui itself builds.
   vty-ui = enableCabalFlag super.vty-ui "no-tests";
 
+  # https://github.com/DanielG/cabal-helper/issues/10
+  cabal-helper = dontCheck super.cabal-helper;
+
 }
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 1ec76e6fa192..c848a50cd366 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -35,7 +35,7 @@ self: super: {
   unix = null;
 
   # deepseq is not a core library for this compiler.
-  deepseq = self.deepseq_1_4_1_1;
+  deepseq = self.deepseq_1_4_1_2;
 
   # transformers is not a core library for this compiler.
   transformers = self.transformers_0_4_3_0;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 7e1975ba55c6..33b0bf30d009 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -463,7 +463,7 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) freealut;};
+     }) {inherit (pkgs) freealut;};
 
   "AMI" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, network
@@ -717,7 +717,7 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
-     }) { inherit (pkgs) emacs;};
+     }) {inherit (pkgs) emacs;};
 
   "Agda-executable" = callPackage
     ({ mkDerivation, Agda, base }:
@@ -1244,7 +1244,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB binding";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) db;};
+     }) {inherit (pkgs) db;};
 
   "BerkeleyDBXML" = callPackage
     ({ mkDerivation, base, BerkeleyDB, bytestring, db, dbxml, xercesc
@@ -1260,8 +1260,8 @@ self: {
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) db;  dbxml = null;  inherit (pkgs) xercesc;
-          xqilla = null;};
+     }) {inherit (pkgs) db; dbxml = null; inherit (pkgs) xercesc; 
+         xqilla = null;};
 
   "BerlekampAlgorithm" = callPackage
     ({ mkDerivation, base, besout }:
@@ -1664,7 +1664,6 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -1709,7 +1708,6 @@ 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
@@ -2189,11 +2187,11 @@ self: {
        description = "OpenCV based machine vision library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { opencv_calib3d = null;  opencv_contrib = null;
-          opencv_core = null;  opencv_features2d = null;
-          opencv_flann = null;  opencv_gpu = null;  opencv_highgui = null;
-          opencv_imgproc = null;  opencv_legacy = null;  opencv_ml = null;
-          opencv_objdetect = null;  opencv_video = null;};
+     }) {opencv_calib3d = null; opencv_contrib = null; 
+         opencv_core = null; opencv_features2d = null; opencv_flann = null; 
+         opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; 
+         opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; 
+         opencv_video = null;};
 
   "Cabal_1_18_1_6" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
@@ -2402,13 +2400,12 @@ self: {
      }:
      mkDerivation {
        pname = "Chart";
-       version = "1.5.1";
-       sha256 = "2f954bc60615fa0da39087e5f88e0726684b99ad9698c270cf28876545e6a14a";
+       version = "1.5.3";
+       sha256 = "85ea6abc853f497209268cc9ab06b13722a1fcfa95b59fc62cd517533ac3c55d";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
@@ -2450,7 +2447,6 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -2688,7 +2684,7 @@ self: {
        description = "An FFI interface to the DevIL library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "Combinatorrent" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, cereal
@@ -3341,8 +3337,8 @@ self: {
      }:
      mkDerivation {
        pname = "DSA";
-       version = "1";
-       sha256 = "94bb45c840e9f1579f37e14667f7223403ce02eb1b06def68e47d376643b464b";
+       version = "1.0.0";
+       sha256 = "1ab314a3912cbe7e45d966bf1bb6650f950bb36bd2711770197d225db5852173";
        libraryHaskellDepends = [
          base binary bytestring crypto-api crypto-pubkey-types ghc-prim
          integer-gmp SHA tagged
@@ -3352,6 +3348,7 @@ self: {
          HUnit integer-gmp QuickCheck SHA tagged test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       jailbreak = true;
        description = "Implementation of DSA, based on the description of FIPS 186-4";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3759,7 +3756,7 @@ self: {
        description = "Partial binding to the Microsoft DirectSound API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dsound = null;};
+     }) {dsound = null;};
 
   "DisTract" = callPackage
     ({ mkDerivation, base, Cabal, chunks, containers, directory
@@ -4036,7 +4033,7 @@ self: {
        description = "Cryptographic operations";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "Dust-tools" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, containers, csv
@@ -4168,8 +4165,8 @@ self: {
      }:
      mkDerivation {
        pname = "Earley";
-       version = "0.9.0";
-       sha256 = "5ec955f00c872cc585bc2dd82fec137f53b095fde73a498e2a0ca7e0eb8140aa";
+       version = "0.10.0";
+       sha256 = "6e018d7465cc3c2f9b34a3dd53502e5bffdb62aaf1e70da71065d175f7cf3e09";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
@@ -4185,8 +4182,8 @@ self: {
      }:
      mkDerivation {
        pname = "Ebnf2ps";
-       version = "1.0.14";
-       sha256 = "6366607845856b720a6d1fc21e23a7be10128d689c608473f67c2c3bf8a26737";
+       version = "1.0.15";
+       sha256 = "0ecce7d721d6c8993fa6ba6cfb16f1101d85e00bbaf0b6941d36a00badea2b4b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -4305,7 +4302,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "The Elm language module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Emping" = callPackage
@@ -4458,7 +4454,7 @@ self: {
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) pcre;};
+     }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
     ({ mkDerivation, base, containers, ghc, mtl, operational, random
@@ -4534,7 +4530,7 @@ self: {
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libpcap;};
+     }) {inherit (pkgs) libpcap;};
 
   "EuroIT" = callPackage
     ({ mkDerivation, base }:
@@ -4662,7 +4658,7 @@ self: {
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fmodex64 = null;};
+     }) {fmodex64 = null;};
 
   "FPretty" = callPackage
     ({ mkDerivation, base, containers }:
@@ -4687,7 +4683,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ftgl;};
+     }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, ftgl, StateVar-transformer
@@ -4703,7 +4699,7 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ftgl;};
+     }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, directory, ftphs
@@ -5274,7 +5270,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
     ({ mkDerivation, base, libX11, libXrandr, mtl, OGL }:
@@ -5288,8 +5284,7 @@ self: {
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libX11;
-          inherit (pkgs.xlibs) libXrandr;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXrandr;};
 
   "GLFW-b" = callPackage
     ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework
@@ -5350,7 +5345,7 @@ self: {
        librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa;};
 
   "GLMatrix" = callPackage
     ({ mkDerivation, base, OpenGLRaw }:
@@ -5376,7 +5371,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT" = callPackage
     ({ mkDerivation, array, base, containers, freeglut, mesa, OpenGL
@@ -5384,8 +5379,8 @@ self: {
      }:
      mkDerivation {
        pname = "GLUT";
-       version = "2.7.0.1";
-       sha256 = "fb1ed80beed6dbf1b373839224d11932c20d1c1b571bef81101483099c459c4d";
+       version = "2.7.0.2";
+       sha256 = "f48d9b1f5a00df06490ad669b1615b6c966ca3f09dd7a193f2bc22730c70c363";
        libraryHaskellDepends = [
          array base containers OpenGL OpenGLRaw StateVar transformers
        ];
@@ -5393,7 +5388,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) freeglut;  inherit (pkgs) mesa;};
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUtil" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, cpphs
@@ -5409,6 +5404,7 @@ self: {
          linear OpenGL OpenGLRaw transformers vector
        ];
        libraryToolDepends = [ cpphs ];
+       jailbreak = true;
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5584,6 +5580,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenI" = callPackage
@@ -5824,7 +5821,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Simple 3D vector library";
        license = "GPL";
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {inherit (self.llvmPackages) llvm;};
 
   "GlomeView" = callPackage
     ({ mkDerivation, base, deepseq, GlomeTrace, GlomeVec, monad-par
@@ -6406,7 +6403,7 @@ self: {
        homepage = "https://github.com/hdbc/hdbc-odbc";
        description = "ODBC driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) unixODBC;};
+     }) {inherit (pkgs) unixODBC;};
 
   "HDBC-postgresql" = callPackage
     ({ mkDerivation, base, bytestring, convertible, HDBC, mtl, old-time
@@ -6427,7 +6424,7 @@ self: {
        homepage = "http://github.com/hdbc/hdbc-postgresql";
        description = "PostgreSQL driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "HDBC-postgresql-hstore" = callPackage
     ({ mkDerivation, attoparsec, base, containers, HDBC, text }:
@@ -6469,7 +6466,7 @@ self: {
        homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "HDRUtils" = callPackage
     ({ mkDerivation, array, base, colour, containers, mtl, pfstools
@@ -6486,7 +6483,7 @@ self: {
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) pfstools;};
+     }) {inherit (pkgs) pfstools;};
 
   "HERA" = callPackage
     ({ mkDerivation, base, mpfr }:
@@ -6498,7 +6495,21 @@ self: {
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) mpfr;};
+     }) {inherit (pkgs) mpfr;};
+
+  "HFrequencyQueue" = callPackage
+    ({ mkDerivation, base, c-storable-deriving }:
+     mkDerivation {
+       pname = "HFrequencyQueue";
+       version = "0.2.0.0";
+       sha256 = "b03c5de4cbb14d379f3555698a03a076fb2d10c748c2a7054b83c74f95e30626";
+       libraryHaskellDepends = [ base c-storable-deriving ];
+       jailbreak = true;
+       homepage = "https://github.com/Bellaz/HfrequencyList";
+       description = "A Queue with a random (weighted) pick function";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
 
   "HFuse" = callPackage
     ({ mkDerivation, base, bytestring, fuse, unix }:
@@ -6516,7 +6527,7 @@ self: {
        homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fuse;};
+     }) {inherit (pkgs) fuse;};
 
   "HGL" = callPackage
     ({ mkDerivation, array, base, X11 }:
@@ -6611,7 +6622,7 @@ self: {
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { HGamer3DCAudio015 = null;};
+     }) {HGamer3DCAudio015 = null;};
 
   "HGamer3D-CEGUI-Binding" = callPackage
     ({ mkDerivation, base, CEGUIBase, CEGUIOgreRenderer, hg3dcegui050
@@ -6629,8 +6640,8 @@ self: {
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { CEGUIBase = null;  CEGUIOgreRenderer = null;
-          hg3dcegui050 = null;};
+     }) {CEGUIBase = null; CEGUIOgreRenderer = null; 
+         hg3dcegui050 = null;};
 
   "HGamer3D-Common" = callPackage
     ({ mkDerivation, base, clock, containers, directory, filepath
@@ -6677,7 +6688,7 @@ self: {
        description = "Enet Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) enet;  hg3denet050 = null;};
+     }) {inherit (pkgs) enet; hg3denet050 = null;};
 
   "HGamer3D-GUI" = callPackage
     ({ mkDerivation, base, HGamer3D-CEGUI-Binding, HGamer3D-Data
@@ -6770,7 +6781,7 @@ self: {
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { HGamer3DOIS015 = null;};
+     }) {HGamer3DOIS015 = null;};
 
   "HGamer3D-Ogre-Binding" = callPackage
     ({ mkDerivation, base, hg3dogre050, HGamer3D-Data, mtl, OgreMain
@@ -6790,9 +6801,9 @@ self: {
        description = "Ogre Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OgreMain = null;  OgrePaging = null;  OgreProperty = null;
-          OgreRTShaderSystem = null;  OgreTerrain = null;
-          hg3dogre050 = null;};
+     }) {OgreMain = null; OgrePaging = null; OgreProperty = null; 
+         OgreRTShaderSystem = null; OgreTerrain = null; 
+         hg3dogre050 = null;};
 
   "HGamer3D-SDL2-Binding" = callPackage
     ({ mkDerivation, base, bytestring, hg3dsdl2050, HGamer3D-Data
@@ -6810,8 +6821,8 @@ self: {
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL2;  hg3dsdl2050 = null;
-          inherit (pkgs.xlibs) libX11;};
+     }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; 
+         inherit (pkgs.xlibs) libX11;};
 
   "HGamer3D-SFML-Binding" = callPackage
     ({ mkDerivation, base, hg3dsfml050, HGamer3D-Data, sfml-audio
@@ -6829,8 +6840,8 @@ self: {
        description = "SFML Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { hg3dsfml050 = null;  sfml-audio = null;  sfml-network = null;
-          sfml-system = null;  sfml-window = null;};
+     }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; 
+         sfml-system = null; sfml-window = null;};
 
   "HGamer3D-WinEvent" = callPackage
     ({ mkDerivation, base, HGamer3D-Data, HGamer3D-SDL2-Binding, text
@@ -6943,7 +6954,7 @@ self: {
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { jvm = null;};
+     }) {jvm = null;};
 
   "HJavaScript" = callPackage
     ({ mkDerivation, base, pretty }:
@@ -7125,15 +7136,14 @@ self: {
      }:
      mkDerivation {
        pname = "HMap";
-       version = "1.2.6";
-       sha256 = "8424dcbcb903c49d369230e2c10421daf3a2e35f3ffb5ec4058f769213769b8a";
+       version = "1.2.7";
+       sha256 = "806cbac1e1571c814af76ccf4058c5d9577b99018fd0c7ee5de993b343c60577";
        libraryHaskellDepends = [
          base data-default hashable mtl unordered-containers
        ];
        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
@@ -7170,7 +7180,7 @@ self: {
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ode;};
+     }) {inherit (pkgs) ode;};
 
   "HOpenCV" = callPackage
     ({ mkDerivation, allocated-processor, base, opencv, vector-space }:
@@ -7186,7 +7196,7 @@ self: {
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.gpl2;
-     }) { inherit (pkgs) opencv;};
+     }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers, mtl
@@ -7194,15 +7204,14 @@ self: {
      }:
      mkDerivation {
        pname = "HPDF";
-       version = "1.4.6";
-       sha256 = "c97e3a1cc0e67f0036526897eade5b4e70371cc55214f7222c4261878aab6197";
+       version = "1.4.7";
+       sha256 = "13476b1e0d4d2a2f88255d0928fd11d884f2a3f9f5288f31cef73610f37a6b72";
        libraryHaskellDepends = [
          array base binary bytestring containers mtl random vector zlib
        ];
        homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPath" = callPackage
@@ -7261,7 +7270,7 @@ self: {
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { plplotd-gnome2 = null;};
+     }) {plplotd-gnome2 = null;};
 
   "HPong" = callPackage
     ({ mkDerivation, base, data-accessor, data-accessor-template, GLFW
@@ -7573,8 +7582,8 @@ self: {
      }:
      mkDerivation {
        pname = "HTF";
-       version = "0.13.0.0";
-       sha256 = "a4b066e8589ee0f2574af6d592d6906c85cc2cf75846dff2f83f6adc3c302c53";
+       version = "0.13.1.0";
+       sha256 = "1cb469ee21766fb7ad56fb42469709fac06214f7a33c39880134dfc2ea0de847";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -7682,6 +7691,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HUnit_1_3_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, filepath }:
+     mkDerivation {
+       pname = "HUnit";
+       version = "1.3.0.0";
+       sha256 = "e130db953a2310d2c256a3923af0250be6ea19317f7d369b56d48f84cf96a55c";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq filepath ];
+       homepage = "http://hunit.sourceforge.net/";
+       description = "A unit testing framework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "HUnit-Diff" = callPackage
     ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }:
      mkDerivation {
@@ -8756,7 +8778,7 @@ self: {
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { hyperestraier = null;  qdbm = null;};
+     }) {hyperestraier = null; qdbm = null;};
 
   "HsJudy" = callPackage
     ({ mkDerivation, base, bytestring, containers, Judy }:
@@ -8770,7 +8792,7 @@ self: {
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Judy = null;};
+     }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, network, old-locale
@@ -8790,7 +8812,7 @@ self: {
        homepage = "https://github.com/phonohawk/HsOpenSSL";
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
@@ -8815,7 +8837,6 @@ self: {
        ];
        description = "Haskell integration with Parrot virtual machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsPerl5" = callPackage
@@ -9087,7 +9108,7 @@ self: {
        libraryHaskellDepends = [ array base X11 ];
        librarySystemDepends = [ imlib2 ];
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) imlib2;};
+     }) {inherit (pkgs) imlib2;};
 
   "ImperativeHaskell" = callPackage
     ({ mkDerivation, base, mtl, template-haskell }:
@@ -9407,8 +9428,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.2.6";
-       sha256 = "f99e82c84d8eeff23ba57332ed4b89530bc1a739c3a8f4b670b07ac33bfc9a46";
+       version = "3.2.6.1";
+       sha256 = "8ca8a8ba99c3edc0d565dd2f5974888c79823e38f8e5a7a8ebf1fd32aa35d213";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -9437,9 +9458,12 @@ self: {
        pname = "JuicyPixels-repa";
        version = "0.7";
        sha256 = "a556109f053d1dfd1eebd23080d5f285816a03f73e37fdc1f32e0a8df888c93a";
+       revision = "1";
+       editedCabalFile = "b0dcd6dae60b506057721d2732aebbece6ce380b5d7df4b2ba64592e6e3a88a8";
        libraryHaskellDepends = [
          base bytestring JuicyPixels repa vector
        ];
+       jailbreak = true;
        description = "Convenience functions to obtain array representations of images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9612,7 +9636,7 @@ self: {
        description = "A compiler from Curry to Haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { kics = null;};
+     }) {kics = null;};
 
   "KiCS-debugger" = callPackage
     ({ mkDerivation, base, containers, curry-base, directory, filepath
@@ -9693,7 +9717,7 @@ self: {
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) kyotocabinet;};
+     }) {inherit (pkgs) kyotocabinet;};
 
   "L-seed" = callPackage
     ({ mkDerivation, base, cairo, containers, gtk, mtl, old-time
@@ -9730,7 +9754,7 @@ self: {
        homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
-     }) { lber = null;  inherit (pkgs) openldap;};
+     }) {lber = null; inherit (pkgs) openldap;};
 
   "LRU" = callPackage
     ({ mkDerivation, base, containers, QuickCheck }:
@@ -9939,7 +9963,6 @@ self: {
        ];
        description = "A library for lattices";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LazyVault" = callPackage
@@ -9970,7 +9993,6 @@ self: {
        homepage = "http://quasimal.com/projects/level_0.html";
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LibClang" = callPackage
@@ -10097,7 +10119,6 @@ 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
@@ -10189,7 +10210,7 @@ self: {
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openmpi;};
+     }) {inherit (pkgs) openmpi;};
 
   "LogicGrowsOnTrees-network" = callPackage
     ({ mkDerivation, base, cereal, cmdtheline, composition, containers
@@ -10529,7 +10550,6 @@ self: {
        libraryHaskellDepends = [ base containers stringtable-atom ];
        description = "A meta-object system for Haskell based on Perl 6";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Metrics" = callPackage
@@ -10565,6 +10585,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "MicrosoftTranslator" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, datetime, exceptions
+     , http-client, lens, text, transformers, url, wreq, xml
+     }:
+     mkDerivation {
+       pname = "MicrosoftTranslator";
+       version = "0.1.0.1";
+       sha256 = "0855cf30d5a70c5cc908c8c84e17e2c325cbc669fe678d074ae88253d23d3120";
+       libraryHaskellDepends = [
+         aeson base bytestring datetime exceptions http-client lens text
+         transformers url wreq xml
+       ];
+       jailbreak = true;
+       description = "Interface for Microsoft Translator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "MiniAgda" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy
      , haskell-src-exts, mtl, pretty
@@ -11129,7 +11166,7 @@ self: {
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bluetooth = null;};
+     }) {bluetooth = null;};
 
   "NXTDSL" = callPackage
     ({ mkDerivation, attoparsec, base, hashable, mtl, resourcet, stm
@@ -11264,7 +11301,7 @@ self: {
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) net_snmp;};
+     }) {inherit (pkgs) net_snmp;};
 
   "Network-NineP" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, convertible
@@ -11297,7 +11334,7 @@ self: {
        description = "A binary I/O library";
        license = "unknown";
        broken = true;
-     }) { integer = null;};
+     }) {integer = null;};
 
   "NineP" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
@@ -11673,9 +11710,9 @@ self: {
        ];
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { comctl32 = null;  comdlg32 = null;  gdi32 = null;
-          kernel32 = null;  ole32 = null;  shell32 = null;  user32 = null;
-          winmm = null;  winspool = null;};
+     }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
+         kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
+         winmm = null; winspool = null;};
 
   "ObjectName" = callPackage
     ({ mkDerivation, base, transformers }:
@@ -11804,8 +11841,8 @@ self: {
      }:
      mkDerivation {
        pname = "OpenAL";
-       version = "1.7.0.0";
-       sha256 = "5c427a07c1b26eaaa372dcc526a2c9d593b80021be5e81af75dea6d13f3a3984";
+       version = "1.7.0.1";
+       sha256 = "671987cb52152317e6bed01b20e09c031a20066ff3f76aa450965ec162971750";
        libraryHaskellDepends = [
          base ObjectName OpenGL StateVar transformers
        ];
@@ -11813,7 +11850,7 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openal;};
+     }) {inherit (pkgs) openal;};
 
   "OpenCL" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, mtl, OpenCL, QuickCheck }:
@@ -11830,7 +11867,7 @@ self: {
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OpenCL = null;};
+     }) {OpenCL = null;};
 
   "OpenCLRaw" = callPackage
     ({ mkDerivation, base, bytestring, mtl }:
@@ -11865,8 +11902,8 @@ self: {
      }:
      mkDerivation {
        pname = "OpenGL";
-       version = "2.12.0.1";
-       sha256 = "8b7cfc07cb4cc4a6c45910eeb9fdfe114be1f64090fa0705c3e550794c588ed5";
+       version = "2.13.0.0";
+       sha256 = "0f3b4d4dbe8630f405dcbddda3989cfe3811bf547b6e1cf6f8bcd45655ab9182";
        libraryHaskellDepends = [
          base bytestring GLURaw ObjectName OpenGLRaw StateVar text
          transformers
@@ -11894,14 +11931,14 @@ self: {
     ({ mkDerivation, base, mesa, transformers }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "2.5.1.0";
-       sha256 = "33a4100bd89c762658263dc6e5725dd214761d16d5d73907ad42a4d72b11d8cd";
+       version = "2.5.2.1";
+       sha256 = "08c3302e4b543ebed9a8dd92bb2a16550ca7b224b7ddcc3df59135d32aacb845";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ mesa ];
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) mesa;};
+     }) {inherit (pkgs) mesa;};
 
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
@@ -12346,7 +12383,7 @@ self: {
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libxml2;};
+     }) {inherit (pkgs) libxml2;};
 
   "Peano" = callPackage
     ({ mkDerivation, base }:
@@ -12387,7 +12424,7 @@ self: {
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cmph = null;};
+     }) {cmph = null;};
 
   "PermuteEffects" = callPackage
     ({ mkDerivation, base, ReplicateEffects }:
@@ -12578,7 +12615,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
     ({ mkDerivation, base, mtl }:
@@ -13045,7 +13082,7 @@ self: {
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { canlib = null;  ftd2xx = null;};
+     }) {canlib = null; ftd2xx = null;};
 
   "RNAFold" = callPackage
     ({ mkDerivation, ADPfusion, base, BiobaseTurner, BiobaseVienna
@@ -13199,7 +13236,6 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Random123" = callPackage
@@ -13578,7 +13614,7 @@ self: {
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) SDL;};
+     }) {inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
     ({ mkDerivation, base, SDL }:
@@ -13589,7 +13625,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL-image" = callPackage
@@ -13601,7 +13636,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_image";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL-mixer" = callPackage
@@ -13610,10 +13644,11 @@ self: {
        pname = "SDL-mixer";
        version = "0.6.1.1";
        sha256 = "5ff4e4b795aa04a8979610c88d2be948b4b1c69b83d0a3d2ea359d0ed110a355";
+       revision = "1";
+       editedCabalFile = "53f7f1e750f01e8095a95548c76a8ac1fef8298aa197dbc08bf82e939a4bbe64";
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL-mpeg" = callPackage
@@ -13626,8 +13661,7 @@ self: {
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) smpeg;};
+     }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
     ({ mkDerivation, base, SDL }:
@@ -13638,7 +13672,6 @@ self: {
        libraryHaskellDepends = [ base SDL ];
        description = "Binding to libSDL_ttf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL2-ttf" = callPackage
@@ -13648,12 +13681,12 @@ self: {
        version = "0.1.0";
        sha256 = "06a20c0c8652c3c2ed53db5e638c44cb7b3f2199bc490324dfb72001e344cf0e";
        libraryHaskellDepends = [ base SDL2 ];
-       librarySystemDepends = [ SDL2 SDL2_ttf ];
+       librarySystemDepends = [ SDL2_ttf ];
        jailbreak = true;
        description = "Binding to libSDL-ttf";
        license = stdenv.lib.licenses.mit;
        broken = true;
-     }) { SDL2 = null;  inherit (pkgs) SDL2_ttf;};
+     }) {SDL2 = null; inherit (pkgs) SDL2_ttf;};
 
   "SFML" = callPackage
     ({ mkDerivation, base, csfml-audio, csfml-graphics, csfml-network
@@ -13671,9 +13704,8 @@ self: {
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { csfml-audio = null;  csfml-graphics = null;
-          csfml-network = null;  csfml-system = null;
-          csfml-window = null;};
+     }) {csfml-audio = null; csfml-graphics = null; 
+         csfml-network = null; csfml-system = null; csfml-window = null;};
 
   "SFML-control" = callPackage
     ({ mkDerivation, base, mtl, SFML, template-haskell }:
@@ -13959,7 +13991,7 @@ self: {
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) glib;  inherit (pkgs) mono;};
+     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
     ({ mkDerivation, base, bytestring, data-default, directory, either
@@ -14387,7 +14419,7 @@ self: {
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zip;};
+     }) {inherit (pkgs) zip;};
 
   "SoOSiM" = callPackage
     ({ mkDerivation, base, concurrent-supply, containers
@@ -14554,26 +14586,27 @@ self: {
 
   "Spock" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , case-insensitive, containers, directory, focus, hashable, hspec
-     , hspec-wai, http-types, hvect, list-t, monad-control, mtl
-     , old-locale, path-pieces, random, reroute, resource-pool
-     , resourcet, stm, stm-containers, text, time, transformers
-     , transformers-base, unordered-containers, vault, wai, wai-extra
-     , warp
+     , case-insensitive, containers, crypto-random, directory, focus
+     , hashable, hspec, hspec-wai, http-types, hvect, list-t
+     , monad-control, mtl, old-locale, path-pieces, random, reroute
+     , resource-pool, resourcet, stm, stm-containers, text, time
+     , transformers, transformers-base, unordered-containers, vault, wai
+     , wai-extra, warp
      }:
      mkDerivation {
        pname = "Spock";
-       version = "0.8.1.0";
-       sha256 = "d9e62dba8c757b9877010c4ecbc2e79de519cf14a54c919fc99eda3a1c2e70d6";
+       version = "0.9.0.1";
+       sha256 = "0d6c97a3ca3ab56e01e4a21f6b2f3ce5a210ea9c6f64c2c1c2d2775295dee56c";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
-         directory focus hashable http-types hvect list-t monad-control mtl
-         old-locale path-pieces random reroute resource-pool resourcet stm
-         stm-containers text time transformers transformers-base
-         unordered-containers vault wai wai-extra warp
+         crypto-random directory focus hashable http-types hvect list-t
+         monad-control mtl old-locale path-pieces random reroute
+         resource-pool resourcet stm stm-containers text time transformers
+         transformers-base unordered-containers vault wai wai-extra warp
        ];
        testHaskellDepends = [
-         base bytestring hspec hspec-wai http-types reroute stm text wai
+         base bytestring hspec hspec-wai http-types reroute stm text
+         unordered-containers wai wai-extra
        ];
        homepage = "http://www.spock.li";
        description = "Another Haskell web framework for rapid development";
@@ -14600,8 +14633,8 @@ self: {
      }:
      mkDerivation {
        pname = "Spock-digestive";
-       version = "0.1.0.1";
-       sha256 = "d453585fb08777a67e80ae25f1c6e390097e2f4827e0510f6c550ee2cb36e68c";
+       version = "0.2.0.0";
+       sha256 = "e5571d88d7b9dcafc7f5c364c8499a1d8d698d1698f2615b5f26698c85080260";
        libraryHaskellDepends = [
          base digestive-functors http-types mtl Spock text
          unordered-containers wai
@@ -15125,11 +15158,12 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "4133d9f69e7df366ac374ccb42bd9801ae66c0cd29f9f20ab849d1d8f8e79664";
+       revision = "1";
+       editedCabalFile = "ea885fd1fbb40a306229b73181330b31510c155257499b442dd94fa8b54bf3fc";
        libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
        ];
-       jailbreak = true;
        homepage = "https://github.com/testexplode/testexplode";
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.gpl3;
@@ -15145,7 +15179,7 @@ self: {
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ogg = null;  theora = null;};
+     }) {ogg = null; theora = null;};
 
   "Thingie" = callPackage
     ({ mkDerivation, base, cairo, gtk, mtl }:
@@ -15516,7 +15550,6 @@ self: {
        homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypingTester" = callPackage
@@ -15716,7 +15749,7 @@ self: {
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) curl;};
+     }) {inherit (pkgs) curl;};
 
   "Validation" = callPackage
     ({ mkDerivation, base, bifunctors, semigroupoids, semigroups }:
@@ -16116,15 +16149,15 @@ self: {
        homepage = "https://github.com/haskell/win32";
        description = "A binding to part of the Win32 library";
        license = stdenv.lib.licenses.bsd3;
-     }) { advapi32 = null;  gdi32 = null;  shell32 = null;
-          shfolder = null;  user32 = null;  winmm = null;};
+     }) {advapi32 = null; gdi32 = null; shell32 = null; 
+         shfolder = null; user32 = null; winmm = null;};
 
   "Win32-dhcp-server" = callPackage
     ({ mkDerivation, base, text, Win32, Win32-errors }:
      mkDerivation {
        pname = "Win32-dhcp-server";
-       version = "0.3.1";
-       sha256 = "3236a2353c0d8c4647c55d6ce41ba92a14e5bd4a9817c782c9e1b127049a7d56";
+       version = "0.3.2";
+       sha256 = "3f6fd5dcd65f0883f40a5e3ee9467df0039abf7fc4f5cf0a119c56696d120664";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
        homepage = "http://github.com/mikesteele81/win32-dhcp-server";
        description = "Win32 DHCP Server Management API";
@@ -16157,7 +16190,7 @@ self: {
        description = "Provides missing Win32 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { imm32 = null;  msimg32 = null;};
+     }) {imm32 = null; msimg32 = null;};
 
   "Win32-junction-point" = callPackage
     ({ mkDerivation, base, text, Win32, Win32-errors }:
@@ -16214,7 +16247,7 @@ self: {
        description = "Windows service applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Advapi32 = null;};
+     }) {Advapi32 = null;};
 
   "Win32-services-wrapper" = callPackage
     ({ mkDerivation, base, directory, filepath, Win32, Win32-errors
@@ -16339,9 +16372,9 @@ self: {
        homepage = "https://github.com/haskell-pkg-janitors/X11";
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXext;
-          inherit (pkgs.xlibs) libXinerama;  inherit (pkgs.xlibs) libXrandr;
-          inherit (pkgs.xlibs) libXrender;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; 
+         inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; 
+         inherit (pkgs.xlibs) libXrender;};
 
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
@@ -16357,7 +16390,7 @@ self: {
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libX11;};
+     }) {inherit (pkgs.xlibs) libX11;};
 
   "X11-rm" = callPackage
     ({ mkDerivation, base, X11 }:
@@ -16383,7 +16416,7 @@ self: {
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Xdamage = null;};
+     }) {Xdamage = null;};
 
   "X11-xfixes" = callPackage
     ({ mkDerivation, base, X11, Xfixes }:
@@ -16397,7 +16430,7 @@ self: {
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Xfixes = null;};
+     }) {Xfixes = null;};
 
   "X11-xft" = callPackage
     ({ mkDerivation, base, libXft, utf8-string, X11 }:
@@ -16409,7 +16442,7 @@ self: {
        libraryPkgconfigDepends = [ libXft ];
        description = "Bindings to the Xft, X Free Type interface library, and some Xrender parts";
        license = "LGPL";
-     }) { inherit (pkgs.xlibs) libXft;};
+     }) {inherit (pkgs.xlibs) libXft;};
 
   "X11-xshape" = callPackage
     ({ mkDerivation, base, X11 }:
@@ -16446,7 +16479,7 @@ self: {
        description = "Bindings for the DirectX XInput library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) xinput;};
+     }) {inherit (pkgs.xlibs) xinput;};
 
   "XMMS" = callPackage
     ({ mkDerivation, base, containers, xmmsclient, xmmsclient-glib }:
@@ -16460,7 +16493,7 @@ self: {
        description = "XMMS2 client library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xmmsclient = null;  xmmsclient-glib = null;};
+     }) {xmmsclient = null; xmmsclient-glib = null;};
 
   "XMPP" = callPackage
     ({ mkDerivation, base, haskell98, hsdns, mtl, network, parsec
@@ -16514,7 +16547,7 @@ self: {
        libraryPkgconfigDepends = [ libXau ];
        description = "A binding to the X11 authentication library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libXau;};
+     }) {inherit (pkgs.xlibs) libXau;};
 
   "Xec" = callPackage
     ({ mkDerivation, base, binary, bytestring, cairo, containers
@@ -16745,7 +16778,7 @@ self: {
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) readline;};
+     }) {inherit (pkgs) readline;};
 
   "ZEBEDDE" = callPackage
     ({ mkDerivation, base, vect }:
@@ -16915,7 +16948,7 @@ self: {
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) abc;};
+     }) {inherit (pkgs) abc;};
 
   "abcnotation" = callPackage
     ({ mkDerivation, base, parsec, prettify, process, semigroups }:
@@ -17344,8 +17377,8 @@ self: {
      }:
      mkDerivation {
        pname = "acid-state";
-       version = "0.12.4";
-       sha256 = "4d2db186740e8d33fab5c6fd7ef2364e0f6bc39bdf58be845fb0a57893b86255";
+       version = "0.13.0";
+       sha256 = "127adb9833be5b1cb6eb25f21d48dd976a0e39a4b5919095b6d03af314b85637";
        libraryHaskellDepends = [
          array base bytestring cereal containers directory
          extensible-exceptions filepath mtl network safecopy stm
@@ -17356,6 +17389,28 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "acid-state-dist" = callPackage
+    ({ mkDerivation, acid-state, base, bytestring, cereal
+     , concurrent-extra, containers, directory, filepath, mtl, random
+     , safe, safecopy, semigroups, stm, transformers, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "acid-state-dist";
+       version = "0.1.0.1";
+       sha256 = "868d3c28720d6757609ee8247634a04d49884cf0a049b1fca8fe542ddcc69eab";
+       libraryHaskellDepends = [
+         acid-state base bytestring cereal concurrent-extra containers
+         filepath mtl safe safecopy semigroups stm transformers
+         zeromq4-haskell
+       ];
+       testHaskellDepends = [
+         acid-state base directory mtl random safecopy
+       ];
+       description = "A replication backend for acid-state";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "acid-state-tls" = callPackage
     ({ mkDerivation, acid-state, base, directory, HsOpenSSL, network
      , safecopy
@@ -18391,8 +18446,8 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-schema";
-       version = "0.3.0.7";
-       sha256 = "af50aa3ff6974d021aeeb90e7f43d0b4082a3a81972843e1a0ee5bb8068c04e5";
+       version = "0.4.0.0";
+       sha256 = "2b8f58f3539644527c4ab3ff5c07742c9aa2250281b7b3cba8e2c39b88f148a8";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers ghc-prim mtl QuickCheck
          regex-base regex-compat regex-pcre scientific syb template-haskell
@@ -18404,7 +18459,7 @@ self: {
          template-haskell temporary test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
-       homepage = "https://github.com/timjb/aeson-schema";
+       homepage = "https://github.com/Fuuzetsu/aeson-schema";
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -18505,6 +18560,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-value-parser" = callPackage
+    ({ mkDerivation, aeson, base-prelude, mtl-prelude, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-value-parser";
+       version = "0.9.0";
+       sha256 = "f53c0bd8a4fedb71ed74a2019b2d601ca3d315ae0db332e4f49d88f2ea68de8f";
+       libraryHaskellDepends = [
+         aeson base-prelude mtl-prelude scientific text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/sannsyn/aeson-value-parser";
+       description = "An API for parsing \"aeson\" JSON tree into Haskell types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "affine-invariant-ensemble-mcmc" = callPackage
     ({ mkDerivation, base, containers, mwc-random, primitive, split
      , vector
@@ -18828,7 +18900,6 @@ 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
@@ -18888,7 +18959,7 @@ self: {
        homepage = "http://github.com/phaazon/al";
        description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openal;};
+     }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
     ({ mkDerivation, base, stm, time, unbounded-delays }:
@@ -19229,7 +19300,7 @@ self: {
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-core" = callPackage
     ({ mkDerivation, alsaLib, base, extensible-exceptions }:
@@ -19242,7 +19313,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-gui" = callPackage
     ({ mkDerivation, alsa-core, alsa-seq, base, midi, midi-alsa, wx
@@ -19283,7 +19354,7 @@ self: {
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
     ({ mkDerivation, alsa-core, alsaLib, base, c2hs, unix }:
@@ -19297,7 +19368,7 @@ self: {
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
     ({ mkDerivation, alsa-core, alsaLib, array, base
@@ -19317,7 +19388,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
     ({ mkDerivation, alsa, base }:
@@ -19352,7 +19423,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
     ({ mkDerivation, alsa, base }:
@@ -19422,7 +19493,7 @@ self: {
        description = "A Haskell binding for ALURE";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { alure = null;};
+     }) {alure = null;};
 
   "amazon-emailer" = callPackage
     ({ mkDerivation, base, bytestring, configurator, http-conduit
@@ -19492,20 +19563,20 @@ self: {
 
   "amazonka" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
-     , conduit-extra, directory, exceptions, free, http-client
-     , http-conduit, ini, lens, mmorph, monad-control, mtl, resourcet
-     , retry, tasty, tasty-hunit, text, time, transformers
-     , transformers-base, transformers-compat
+     , conduit-extra, directory, exceptions, http-client, http-conduit
+     , ini, lens, mmorph, monad-control, mtl, resourcet, retry, tasty
+     , tasty-hunit, text, time, transformers, transformers-base
+     , transformers-compat
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.0.1";
-       sha256 = "36583da0607497b69668bc9100373031d24cc64eb467e06676b409358d4c061a";
+       version = "1.2.0.1";
+       sha256 = "4e7b7cda6b6904cfd35f92596bfe5a8e00511bbd64d7b55926ad8660f6eba950";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
-         exceptions free http-client http-conduit ini lens mmorph
-         monad-control mtl resourcet retry text time transformers
-         transformers-base transformers-compat
+         exceptions http-client http-conduit ini lens mmorph monad-control
+         mtl resourcet retry text time transformers transformers-base
+         transformers-compat
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/brendanhay/amazonka";
@@ -19519,8 +19590,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.0.1";
-       sha256 = "a74e6157a99285f556edb546ea1876507b197b1392bebcdf5f7d0ac4e418d702";
+       version = "1.2.0.1";
+       sha256 = "c48e7db56a1fc852a505b3821a4ed273b6a68e2f68ee224eb6cdfbe27c42926a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19531,7 +19602,7 @@ self: {
        description = "Amazon Auto Scaling SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudformation" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19539,8 +19610,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.0.1";
-       sha256 = "b09f594282e3e5fc13b0de3cd4f562ba9c9bfec96973d5aeba334f32a5f88fe6";
+       version = "1.2.0.1";
+       sha256 = "813fcdb6a35888e1a0d29252f7530f192509662445b051ab17e6e4d614e98160";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19551,7 +19622,7 @@ self: {
        description = "Amazon CloudFormation SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudfront" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19559,8 +19630,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.0.1";
-       sha256 = "82e0d72534717397395a2109af59725b86bb9361610b1143e7bac58b7ff1c948";
+       version = "1.2.0.1";
+       sha256 = "aeff7660a2d12b1382d14efa134b37ae35e4dc3745fb83f33e4fd4ac37b4c275";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19571,7 +19642,7 @@ self: {
        description = "Amazon CloudFront SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudhsm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19579,8 +19650,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.0.1";
-       sha256 = "88be89b5bacd848704f28ecf0544e6d9dfffa05f67e3f9317d64b17ec2caaac9";
+       version = "1.2.0.1";
+       sha256 = "64a58850be2d1df8145ca7382f7060faf873417c34b52258846ea6b4842b1389";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19591,7 +19662,7 @@ self: {
        description = "Amazon CloudHSM SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudsearch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19599,8 +19670,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.0.1";
-       sha256 = "9476d436b0ea895edc0aa3b0ee36458cfeea35faaee8e5b9fcc653ee5c47f027";
+       version = "1.2.0.1";
+       sha256 = "d56e2690a44f331d408603234712bcbc2ef40f0375a7c1db22513c3350b3ccb5";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19611,7 +19682,7 @@ self: {
        description = "Amazon CloudSearch SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudsearch-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19619,8 +19690,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.0.1";
-       sha256 = "b2dd61ab239b00e884be45b305f5587ec66dbe031c4d65f93d00f297eb4400c5";
+       version = "1.2.0.1";
+       sha256 = "f3ac35a7e9f2f9372ffabbb5b7450b4291a07609f517af8b75a4acd5d5c3610d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19631,7 +19702,7 @@ self: {
        description = "Amazon CloudSearch Domain SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudtrail" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19639,8 +19710,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.0.1";
-       sha256 = "c4aedc71e6d8d18befcd90573c664a859d6a5952711512b57eba596726ddcff9";
+       version = "1.2.0.1";
+       sha256 = "525e3a1f674b20e3851c67cc3d519f86b9795b046f131b91d63e7f194246542b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19651,7 +19722,7 @@ self: {
        description = "Amazon CloudTrail SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudwatch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19659,8 +19730,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.0.1";
-       sha256 = "5562fb8ffbd5485091b7f0a8a1b6d4ab533371804341dd352c6de97fe8297233";
+       version = "1.2.0.1";
+       sha256 = "dfabf18379ec4f5431e4038d745686a58fb83a0559029cbbb77b40f9ebc6fd43";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19671,7 +19742,7 @@ self: {
        description = "Amazon CloudWatch SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cloudwatch-logs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19679,8 +19750,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.0.1";
-       sha256 = "c8d16042fb42fe562a754467d3f3be13ab1dc7c862d5dd6467864fd9cdc5b551";
+       version = "1.2.0.1";
+       sha256 = "3b794ef9cb79daf5018a7cc850a348eb08407067f4b72c6accbd03b3be6997ca";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19691,7 +19762,7 @@ self: {
        description = "Amazon CloudWatch Logs SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-codecommit" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19699,8 +19770,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.0.1";
-       sha256 = "a930435da46193d2a8a648fbe0d741f009b3c524127a60989740cb46e692013e";
+       version = "1.2.0.1";
+       sha256 = "b4dcc54a0cd2faec903a037b713d1cce6ac6d4c3716b353b4108d23d4ecc0b03";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19711,7 +19782,7 @@ self: {
        description = "Amazon CodeCommit SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-codedeploy" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19719,8 +19790,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.0.1";
-       sha256 = "77be78235ebefc1f1f08a7db8b800bcd06a7dafe37c5f69413543f08926628c1";
+       version = "1.2.0.1";
+       sha256 = "9b3dcfb3f92c0f2b7a68d62857e04a6eea0f57a6e72311fa5594da8574b8f557";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19731,7 +19802,7 @@ self: {
        description = "Amazon CodeDeploy SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-codepipeline" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19739,8 +19810,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.0.1";
-       sha256 = "6f573007d05e22f6afda550b8d0f61bde15ddfbe8e700779207fd78c7546b819";
+       version = "1.2.0.1";
+       sha256 = "c97df58c12793dc079d0706d9a09ea7c470219cc80e6e583441718d7017ee138";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19751,7 +19822,7 @@ self: {
        description = "Amazon CodePipeline SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cognito-identity" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19759,8 +19830,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.0.1";
-       sha256 = "87fe6bdcdb3f6056180c48e5b9c1d57ff64aa953e5763e93d8b28cd2d5ffe2f7";
+       version = "1.2.0.1";
+       sha256 = "fbf21d9ca8e71d0b3305791db0f6a18256898b5c294057f515aef3991a0971cb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19771,7 +19842,7 @@ self: {
        description = "Amazon Cognito Identity SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-cognito-sync" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19779,8 +19850,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.0.1";
-       sha256 = "7dc187fc5269bba71ac05e0bdae22c08d9fd0e1988263e0828fe7f9cec4e614d";
+       version = "1.2.0.1";
+       sha256 = "2008e997fa402ab3d58f22f260df18583695b612cbf1b0d3ab158321a1576e03";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19791,7 +19862,7 @@ self: {
        description = "Amazon Cognito Sync SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-config" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19799,8 +19870,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.0.1";
-       sha256 = "317ed1ec7dc99e06068fb600f21be98b05dd61a73dd0d140ed644774fb81d33a";
+       version = "1.2.0.1";
+       sha256 = "c4e60da7e09302b81e1c53b15c36e99b46d09dd37b4334e360d78879b556ef36";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19811,7 +19882,7 @@ self: {
        description = "Amazon Config SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
@@ -19824,8 +19895,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.0.1";
-       sha256 = "e432d7b5510685dd37688a632e3a17a8968cb3b1e08537257c054fa8f9eda946";
+       version = "1.2.0.1";
+       sha256 = "737645a63519f535154133cf590a66e2248d436c6223539857f43069a6645d1a";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite exceptions hashable http-client
@@ -19849,8 +19920,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.0.1";
-       sha256 = "d8b88c9a51eab9110650ea9e40f09950e8df2c20264cbc629b8a29c50b252dc2";
+       version = "1.2.0.1";
+       sha256 = "20178d505d690116528f8d1bf5c5650c7dca9350b583ad4bbc2b7ca5b74bc1e0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19861,7 +19932,7 @@ self: {
        description = "Amazon Data Pipeline SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-devicefarm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19869,8 +19940,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.0.1";
-       sha256 = "9b23b6c2853b073635c8e6e76026ffa2cccd705bd7d958fa6dd2c4785a887297";
+       version = "1.2.0.1";
+       sha256 = "bebf18952a56cc249175a1bf69ab1400126b3c97c45ce8b7895acbae894c3449";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19881,7 +19952,7 @@ self: {
        description = "Amazon Device Farm SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-directconnect" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19889,8 +19960,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.0.1";
-       sha256 = "8fc02b3ade3970117e13b2b133235c006a21914e91269cb42d63d712501d013a";
+       version = "1.2.0.1";
+       sha256 = "39bd3999d29363b87fc64edac6151251a5a5075c7fe1ab48bb89114fa40cfa74";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19901,7 +19972,7 @@ self: {
        description = "Amazon Direct Connect SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19909,8 +19980,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.0.1";
-       sha256 = "523f0fb329f502115aed6b1aafc7efd96ac8233d56de05379465fe3c3b7ddbf1";
+       version = "1.2.0.1";
+       sha256 = "fac88b8ac1121ec6ab9bb1c1b419262e2720c95d3c5d5e1d5ff9b0356f59af56";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19921,7 +19992,7 @@ self: {
        description = "Amazon Directory Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-dynamodb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19929,8 +20000,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.0.1";
-       sha256 = "85194e782b7a44ff914af01cdc8d5c3e8285031f0b23a07ef37020c0798c9bfb";
+       version = "1.2.0.1";
+       sha256 = "23d44253d82d2406b528abf5f1c2ed97c72cadb9afca1a578793220648ce442c";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19941,7 +20012,7 @@ self: {
        description = "Amazon DynamoDB SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-dynamodb-streams" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19949,8 +20020,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.0.1";
-       sha256 = "edfcfc6e4281012cbec96f2b96416cf8c3e0e2313388d677e78f4ff8e51d94f7";
+       version = "1.2.0.1";
+       sha256 = "b3413412dce8dc96e449642535f623223298243d7290d778082fd6ed97511a33";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19961,7 +20032,7 @@ self: {
        description = "Amazon DynamoDB Streams SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ec2" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19969,8 +20040,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.0.1";
-       sha256 = "fd0ec9d15a97195472be403b9d8c03cdcd2f70daf4beec326c360083479d37ec";
+       version = "1.2.0.1";
+       sha256 = "de1421ab986e9d6833fd70a0e0d3c21895813361ecc680c95816fbcaf7c6439a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -19981,7 +20052,7 @@ self: {
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ecs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -19989,8 +20060,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.0.1";
-       sha256 = "77e78bf43efd1c3fb77b0d2a6cbab5140ffe13c7e8fcc22cbe7e509d73f978e8";
+       version = "1.2.0.1";
+       sha256 = "19c608e5218c900da768adc9f893a91a7fc6e9070e8c5d9e444baf1ae98c7544";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20001,7 +20072,7 @@ self: {
        description = "Amazon EC2 Container Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-efs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20009,8 +20080,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.0.1";
-       sha256 = "9ff36087cc77bf044b515e6a8fc11f4067ab76372e02b3cb7b8dadfb3ad697a2";
+       version = "1.2.0.1";
+       sha256 = "d0f70ed2e5242cb05b7895199a06144cd4550fab64fb825eba8a1c10d9351bab";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20021,7 +20092,7 @@ self: {
        description = "Amazon Elastic File System SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-elasticache" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20029,8 +20100,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.0.1";
-       sha256 = "638d40a60b59e020cad3dac813563be07b5f698fd9b602784f3ac344c013ca15";
+       version = "1.2.0.1";
+       sha256 = "9c4113c0dd2430432ac0233149571a7affc9dec675aaddbe7ff9e513171a1bf7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20041,7 +20112,7 @@ self: {
        description = "Amazon ElastiCache SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-elasticbeanstalk" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20049,8 +20120,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.0.1";
-       sha256 = "43dc5564b2183011340d9751b7c4a1cf8197b215b9b857c78d68c70a35c050cb";
+       version = "1.2.0.1";
+       sha256 = "b4e135c2e904f78cab94ccab8d1d38b3b7992461bc1f41ede5ee708fcb162dc2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20061,7 +20132,7 @@ self: {
        description = "Amazon Elastic Beanstalk SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-elastictranscoder" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20069,8 +20140,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.0.1";
-       sha256 = "5bac9e2c04f4c775ee7018a2073f5141fa5f062467f4eeba91e9a64e03525298";
+       version = "1.2.0.1";
+       sha256 = "b2eaf67b39f5d19fe5ea7a6d0c79b44951cf25c41eb3af36ead6cd82cb430dd2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20081,7 +20152,7 @@ self: {
        description = "Amazon Elastic Transcoder SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-elb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20089,8 +20160,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.0.1";
-       sha256 = "4c9a033830f09147953ffc7c58c39856e1a7c62d600267029bdfce7acf786b52";
+       version = "1.2.0.1";
+       sha256 = "2574b79c0b09ef82dcc7b07c9dfcb55719dd7b63ac87fb938ae7a7c45efba986";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20101,7 +20172,7 @@ self: {
        description = "Amazon Elastic Load Balancing SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-emr" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20109,8 +20180,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.0.1";
-       sha256 = "e1f289ca504d4220d1a28f055ba01cbf2e87ce42ce3ff6525a6dc1f4adaa6b96";
+       version = "1.2.0.1";
+       sha256 = "43c3e80f742abbd5d2770fa5cf05138b5be2890492a295b1ccaefeb8d50662ed";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20121,7 +20192,7 @@ self: {
        description = "Amazon Elastic MapReduce SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-glacier" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20129,8 +20200,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.0.1";
-       sha256 = "4a6d67f4ac6b34316281810d10b46b46e34fd6869bbf463ef6fa6c8257da28ad";
+       version = "1.2.0.1";
+       sha256 = "48e2c9b10a4624b6f308bd232aafe9fabe7429911ad4a7a8222277d9c58310be";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20141,7 +20212,7 @@ self: {
        description = "Amazon Glacier SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-iam" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20149,8 +20220,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.0.1";
-       sha256 = "63d8091722baa876de7a04e92387f4b3015e7194fed25a0e0da9f6ec7ecdb441";
+       version = "1.2.0.1";
+       sha256 = "8302e53d2e799b56629a2344a3b1d40b39b173defee1112ddb6e4e0102496d7f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20161,7 +20232,7 @@ self: {
        description = "Amazon Identity and Access Management SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-importexport" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20169,8 +20240,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.0.1";
-       sha256 = "281e37c37bdc5d175723ba8b428c63be3a1a543d2e66ace7f8f288e7419e82fc";
+       version = "1.2.0.1";
+       sha256 = "cfb98a32f18d2b1448277f5a4c5128bd9d94ecba012d458dff65a834c86648d6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20181,7 +20252,7 @@ self: {
        description = "Amazon Import/Export SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-kinesis" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20189,8 +20260,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.0.1";
-       sha256 = "f942f5a7c13d1dccd98ec52529d24e7cc26bf87d729271c00ea752255e22cd40";
+       version = "1.2.0.1";
+       sha256 = "831225d3400badf60a8b390e4dd692d38b8097bcb72f1247b54876c83bb532c9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20201,7 +20272,7 @@ self: {
        description = "Amazon Kinesis SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-kms" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20209,8 +20280,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.0.1";
-       sha256 = "9fc90213cb962c1fe6d49b188bb4e3c4b08db7a9820d25bdda2600b4fc0e9681";
+       version = "1.2.0.1";
+       sha256 = "b69938c0c9f6bbc5d1774643f528e64ba28a6ac2bb16f1e15845061a97de85d4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20221,7 +20292,7 @@ self: {
        description = "Amazon Key Management Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-lambda" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20229,8 +20300,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.0.1";
-       sha256 = "09b29ce0649e01ce74717f0ba9379dbf98993b217652bb310e7136c288c1b8f9";
+       version = "1.2.0.1";
+       sha256 = "e3e0e8fd76c7dbd1ced77e9d46a4e8b57820b87b00327ccc01417ddf4c53aa0d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20241,7 +20312,7 @@ self: {
        description = "Amazon Lambda SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ml" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20249,8 +20320,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.0.1";
-       sha256 = "6a670ff312be363929409768d3172a28bf7cd549764038f1aa71fd31e2930436";
+       version = "1.2.0.1";
+       sha256 = "c29484802e0138ebbeb6666842ca1cd44b81e2e870ff4c1435d91d58d569bc37";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20261,7 +20332,7 @@ self: {
        description = "Amazon Machine Learning SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-opsworks" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20269,8 +20340,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.0.1";
-       sha256 = "998f65d4b6dc4a43959f7c1f2380af5e5f4fa588bc181a793eb4f3eadee5078d";
+       version = "1.2.0.1";
+       sha256 = "bad7706393fcfcc041ac4ae1bb39ef7320d282d2b4d9c6c8f0881379b4f91a6a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20281,7 +20352,7 @@ self: {
        description = "Amazon OpsWorks SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-rds" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20289,8 +20360,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.0.1";
-       sha256 = "f10aa66616746f3ef5728fe50f6ce9506b13a0d9e0dab95edd4aeeb2b6a3eca0";
+       version = "1.2.0.1";
+       sha256 = "55ae3a2e6893fc11ca156fb9d11258d1c1ad76f928ca1143cfb0b7b3d9f1806e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20301,7 +20372,7 @@ self: {
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-redshift" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20309,8 +20380,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.0.1";
-       sha256 = "2a10e70b53d5fc8e723660a595d521e6e4b7f0acd16430cf9a63e2199ab86e9c";
+       version = "1.2.0.1";
+       sha256 = "0ce218a13c314c73ea9b3f5c7e8ef31f3cf92a06f820425c48d83d175f1e77b2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20321,7 +20392,7 @@ self: {
        description = "Amazon Redshift SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-route53" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20329,8 +20400,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.0.1";
-       sha256 = "e559cce14249db7d13282bc376b9a5c42719d795da20cfc420c3b95afcfa26a9";
+       version = "1.2.0.1";
+       sha256 = "8a700fc08eb4585b6d9a30c81f18bfab56ae2ae4b5474f98889959f2bda33ad0";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20341,7 +20412,7 @@ self: {
        description = "Amazon Route 53 SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-route53-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20349,8 +20420,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.0.1";
-       sha256 = "fa4e85bbe0ccf8875cd08b601b69db8fba038046c66e9b65219fecd6b3105fc3";
+       version = "1.2.0.1";
+       sha256 = "d486ae77163fc9d8dbb3b38afcce6ce79fba93b5194643ad98cb8dbbe31f745a";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20361,7 +20432,7 @@ self: {
        description = "Amazon Route 53 Domains SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-s3" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20369,8 +20440,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.0.1";
-       sha256 = "2ba4b833b1ccb7d3ca4ac46ae88cf522951972b428987e78328e14766f77f5c4";
+       version = "1.2.0.1";
+       sha256 = "dd5b54f342d1a5f45ea62242f9acecb2be98ed15801b251316c9bef8ac7b948b";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20381,7 +20452,7 @@ self: {
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20389,8 +20460,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.0.1";
-       sha256 = "dad868bcae8795c9e8e0719ae18bb99514d7a8bd4ee373e194531a0120e4061c";
+       version = "1.2.0.1";
+       sha256 = "4eebd5b37c309ee850395c2823f10636cb90c8449a1f365a11a5cf58080b4469";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20401,7 +20472,7 @@ self: {
        description = "Amazon SimpleDB SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ses" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20409,8 +20480,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.0.1";
-       sha256 = "d6ded081d5dded1b58b46d49255773e633bceb7d7526960e06dc40f0ea60bfce";
+       version = "1.2.0.1";
+       sha256 = "f547f472a3dee0944a7a26a7b421df10242d80762ca59392391a1326a39a427f";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20421,7 +20492,7 @@ self: {
        description = "Amazon Simple Email Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-sns" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20429,8 +20500,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.0.1";
-       sha256 = "eccab0209ca98f037e1e21abff164c4f6f29836e57b06bf307a97eab465bbbd7";
+       version = "1.2.0.1";
+       sha256 = "e69b15d4fe2904cd813e22a149e4dcce5c9514a34c45379bb07589fc3a606994";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20441,7 +20512,7 @@ self: {
        description = "Amazon Simple Notification Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-sqs" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20449,8 +20520,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.0.1";
-       sha256 = "abf01ab527d589cc0f30d0ded41b88fb522cb003130063c1f56a8e92e1315161";
+       version = "1.2.0.1";
+       sha256 = "e599b394468bdeb2813b8e091b5aefc5787bb10bd2bfb24d5be4ba70a5ed0134";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20461,7 +20532,7 @@ self: {
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-ssm" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20469,8 +20540,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.0.1";
-       sha256 = "2aa03de9ff893045894c9873ef466100d2449e0ea5f7af3549559807a8209193";
+       version = "1.2.0.1";
+       sha256 = "d9d47fd9820fa05fbfdd62090d9319ee6fd96f321422a995e186ab3e13d789f1";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20481,7 +20552,7 @@ self: {
        description = "Amazon Simple Systems Management Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-storagegateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20489,8 +20560,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.0.1";
-       sha256 = "676e938699d2ec73abab356c0a0a358067710ce3bf7bb210970afe90f01fd26e";
+       version = "1.2.0.1";
+       sha256 = "d73bf3187bb9fd7b50ddcc74566841d1fb4e77328bbe0dddb19a324553e9c49b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20501,7 +20572,7 @@ self: {
        description = "Amazon Storage Gateway SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-sts" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20509,8 +20580,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.0.1";
-       sha256 = "ee7f9e97fc8da24440781513995fbc5afded54a4ecc465a3d46511c22f2bd9a6";
+       version = "1.2.0.1";
+       sha256 = "66502b43aea7c2f70ef4559913c58fb0ae581435d0656f1ab9f9c417bcb54a2e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20521,7 +20592,7 @@ self: {
        description = "Amazon Security Token Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-support" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20529,8 +20600,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.0.1";
-       sha256 = "4510faae1b970b48cd35519504edaa9f6f43c49ad97003c1893f34346d4483f6";
+       version = "1.2.0.1";
+       sha256 = "f1996613bfcfa00eac465c90ef97f18c6fe51231def2d43de1bf90fd0992e52e";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20541,7 +20612,7 @@ self: {
        description = "Amazon Support SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-swf" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20549,8 +20620,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.0.1";
-       sha256 = "84b940ed61beb7744807eb613fe8a9897f51ef609efed8f568f5d2b02e534c48";
+       version = "1.2.0.1";
+       sha256 = "d68898d0a5205e3897b36c29830564f1aecbeff759ff5c379bdf12c1c60f1c01";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20561,7 +20632,7 @@ self: {
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "amazonka-workspaces" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
@@ -20569,8 +20640,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.0.1";
-       sha256 = "1d110c2d674a53be3266d1c480d7adba18bd12706fb78bb81b9e26acc56cb53c";
+       version = "1.2.0.1";
+       sha256 = "4125f1aa08ad2f9013bba8f8d0c83b41f0eeb76203fd1b7da41a306f81211448";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring lens tasty tasty-hunit
@@ -20581,7 +20652,7 @@ self: {
        description = "Amazon WorkSpaces SDK";
        license = "unknown";
        broken = true;
-     }) { amazonka-test = null;};
+     }) {amazonka-test = null;};
 
   "ampersand" = callPackage
     ({ mkDerivation, base, bytestring, containers, csv, directory
@@ -20846,8 +20917,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "annotated-wl-pprint";
-       version = "0.6.0";
-       sha256 = "3d29f11396fb0675fff25254a9f4354aa763a659fa10a48829d15fed087792e7";
+       version = "0.7.0";
+       sha256 = "0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer, with annotation support";
@@ -20885,8 +20956,8 @@ self: {
     ({ mkDerivation, base, unix }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.6.2.1";
-       sha256 = "965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6";
+       version = "0.6.2.2";
+       sha256 = "da082cfcbd7f65b808adea6c9915ad58643b8a22c7bcd21d3dbaf091828dd4bf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
@@ -21066,7 +21137,7 @@ self: {
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { antlr3c = null;};
+     }) {antlr3c = null;};
 
   "anydbm" = callPackage
     ({ mkDerivation, base, containers, MissingH, mtl }:
@@ -21103,7 +21174,7 @@ self: {
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libaosd = null;};
+     }) {libaosd = null;};
 
   "ap-reflect" = callPackage
     ({ mkDerivation, base }:
@@ -21136,7 +21207,7 @@ self: {
        homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "apelsin" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
@@ -21162,19 +21233,19 @@ self: {
 
   "api-builder" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
-     , containers, hspec, HTTP, http-client, http-client-tls
-     , http-conduit, http-types, text, transformers
+     , containers, hspec, HTTP, http-client, http-client-tls, http-types
+     , text, transformers
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.10.0.0";
-       sha256 = "3bf1e59d1f1b60c646898e99465cfddd3ee97fd75d2f1620222cdb9a1fb8eb5f";
+       version = "0.11.0.0";
+       sha256 = "d8df94d14ffa9f0e60c88cf75eb221281c89251af67ac0a2068b3f774a0916c7";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text transformers
        ];
        testHaskellDepends = [
-         aeson base bytestring Cabal containers hspec http-conduit text
+         aeson base bytestring Cabal containers hspec http-client text
          transformers
        ];
        jailbreak = true;
@@ -21249,17 +21320,15 @@ self: {
      }:
      mkDerivation {
        pname = "apiary";
-       version = "1.4.3";
-       sha256 = "4cb377f5f081c80a5d11ffe09daad890528ed3f5e67b59265f9acc61677bcefc";
-       revision = "1";
-       editedCabalFile = "024867d05ec04c0b83c41e948b80c56686cc170beed600daffa8d8c725e50a32";
+       version = "1.4.5";
+       sha256 = "6c6f898924b6209f33ef81bc0e2c7ceb166fc04825a8ffb4d6c5732f41429313";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-read case-insensitive data-default-class exceptions
          hashable http-date http-types mime-types monad-control mtl process
          stringsearch template-haskell text time transformers
          transformers-base types-compat unix-compat unordered-containers
-         vault wai web-routing
+         vault wai wai-extra web-routing
        ];
        testHaskellDepends = [
          base bytestring http-types HUnit mtl tasty tasty-hunit
@@ -21703,6 +21772,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apportionment" = callPackage
+    ({ mkDerivation, base, containers, utility-ht }:
+     mkDerivation {
+       pname = "apportionment";
+       version = "0.0.0.2";
+       sha256 = "352d9564ffdb01d3312a1087f8badc544b3478185cbc27d4ca29fc1f18c9f82b";
+       libraryHaskellDepends = [ base containers utility-ht ];
+       homepage = "http://hub.darcs.net/thielema/apportionment";
+       description = "Round a set of numbers while maintaining its sum";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "approx-rand-test" = callPackage
     ({ mkDerivation, base, Chart, Chart-diagrams, colour, conduit
      , containers, data-default, data-default-class, filepath, HUnit
@@ -21829,7 +21910,7 @@ self: {
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { arbb_dev = null;};
+     }) {arbb_dev = null;};
 
   "arbtt" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bytestring
@@ -21858,7 +21939,7 @@ self: {
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
-     }) { inherit (pkgs.xlibs) libXScrnSaver;};
+     }) {inherit (pkgs.xlibs) libXScrnSaver;};
 
   "archive" = callPackage
     ({ mkDerivation, base, bytestring, debian, debian-mirror, directory
@@ -21881,7 +21962,7 @@ self: {
        description = "A library and programs for creating hardlinked incremental archives or backups";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { debian-mirror = null;  help = null;};
+     }) {debian-mirror = null; help = null;};
 
   "archiver" = callPackage
     ({ mkDerivation, base, bytestring, containers, curl, HTTP, network
@@ -22101,24 +22182,25 @@ self: {
 
   "arithmetic" = callPackage
     ({ mkDerivation, base, opentheory, opentheory-bits
-     , opentheory-divides, opentheory-primitive, QuickCheck, random
+     , opentheory-divides, opentheory-prime, opentheory-primitive
+     , QuickCheck, random
      }:
      mkDerivation {
        pname = "arithmetic";
-       version = "1.0";
-       sha256 = "1af6acf13de40f36d95b8d34e3ba47be559f32dd0f00f1f161b2aa0536b6d5a0";
+       version = "1.1";
+       sha256 = "37b1ddc85799ae996df95d401a74254ea4fe78b22ab2fe51652debd4e36f1a10";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base opentheory opentheory-bits opentheory-divides
+         base opentheory opentheory-bits opentheory-divides opentheory-prime
          opentheory-primitive QuickCheck random
        ];
        executableHaskellDepends = [
-         base opentheory opentheory-bits opentheory-divides
+         base opentheory opentheory-bits opentheory-divides opentheory-prime
          opentheory-primitive QuickCheck random
        ];
        testHaskellDepends = [
-         base opentheory opentheory-bits opentheory-divides
+         base opentheory opentheory-bits opentheory-divides opentheory-prime
          opentheory-primitive QuickCheck random
        ];
        description = "Natural number arithmetic";
@@ -22611,7 +22693,7 @@ self: {
        description = "Haskell Assembler";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghc-binary = null;};
+     }) {ghc-binary = null;};
 
   "assert" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
@@ -22668,7 +22750,7 @@ self: {
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) assimp;};
+     }) {inherit (pkgs) assimp;};
 
   "astar" = callPackage
     ({ mkDerivation, base, containers, PSQueue }:
@@ -23389,7 +23471,7 @@ self: {
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) augeas;};
+     }) {inherit (pkgs) augeas;};
 
   "augur" = callPackage
     ({ mkDerivation, base, bytestring, classify, containers, directory
@@ -23645,8 +23727,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.9";
-       sha256 = "75a6040f0713f683ec4271c257514ed6a9a9f62315fb5471156f6f2016c18f7d";
+       version = "0.0.12";
+       sha256 = "fa8c71676e1400b94d38b5af8a8f0aa0335db1b867f1d22cc857b835aa61b90a";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring clock containers
          cryptohash filepath inflections MonadRandom mtl network network-uri
@@ -23685,9 +23767,10 @@ self: {
     ({ mkDerivation, base, dependent-sum, mtl, process, shake }:
      mkDerivation {
        pname = "avr-shake";
-       version = "0.0.1.1";
-       sha256 = "f606330fbadb7f18fd6dd04585f2290ff601b76613853aff3b0c9ca95b4c722b";
+       version = "0.0.1.2";
+       sha256 = "60102786473f189ea0f97d97b91d9de5a2867dde466b96386c28afbe22e056cc";
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
+       jailbreak = true;
        homepage = "https://github.com/mokus0/avr-shake";
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
@@ -23733,7 +23816,7 @@ self: {
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { awesomium = null;};
+     }) {awesomium = null;};
 
   "aws" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
@@ -24694,7 +24777,6 @@ self: {
        jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barecheck" = callPackage
@@ -24834,10 +24916,9 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
-       version = "4.8.0.0";
-       sha256 = "f4038cc4d2f47dc9c296e868e27a3087ced1cd865c65929e41be6e4ea19ab74f";
+       version = "4.8.1.0";
+       sha256 = "bd524ee4d4b9fb433a4f10eedf8605de3baccc9c2c533d1ab57ee6941ade4014";
        libraryHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/hvr/base-noprelude";
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
@@ -25438,7 +25519,7 @@ self: {
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) db;};
+     }) {inherit (pkgs) db;};
 
   "berp" = callPackage
     ({ mkDerivation, array, base, containers, directory
@@ -25789,8 +25870,8 @@ self: {
        description = "Leksah plugin base";
        license = "LGPL";
        broken = true;
-     }) { leksah-dummy = null;  leksah-main = null;
-          leksah-plugin-pane = null;};
+     }) {leksah-dummy = null; leksah-main = null; 
+         leksah-plugin-pane = null;};
 
   "billeksah-pane" = callPackage
     ({ mkDerivation, base, billeksah-services, containers, directory
@@ -26120,7 +26201,7 @@ self: {
        description = "Format to store data using the binary transform";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { binary-transform = null;};
+     }) {binary-transform = null;};
 
   "binary-streams" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal
@@ -26284,7 +26365,7 @@ self: {
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { esound = null;};
+     }) {esound = null;};
 
   "bindings-GLFW" = callPackage
     ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor
@@ -26305,11 +26386,11 @@ self: {
        ];
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXcursor;
-          inherit (pkgs.xlibs) libXext;  inherit (pkgs.xlibs) libXfixes;
-          inherit (pkgs.xlibs) libXi;  inherit (pkgs.xlibs) libXinerama;
-          inherit (pkgs.xlibs) libXrandr;  inherit (pkgs.xlibs) libXxf86vm;
-          inherit (pkgs) mesa;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXcursor; 
+         inherit (pkgs.xlibs) libXext; inherit (pkgs.xlibs) libXfixes; 
+         inherit (pkgs.xlibs) libXi; inherit (pkgs.xlibs) libXinerama; 
+         inherit (pkgs.xlibs) libXrandr; inherit (pkgs.xlibs) libXxf86vm; 
+         inherit (pkgs) mesa;};
 
   "bindings-K8055" = callPackage
     ({ mkDerivation, base, K8055D }:
@@ -26323,7 +26404,7 @@ self: {
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { K8055D = null;};
+     }) {K8055D = null;};
 
   "bindings-apr" = callPackage
     ({ mkDerivation, apr-1, base, bindings-DSL }:
@@ -26338,7 +26419,7 @@ self: {
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { apr-1 = null;};
+     }) {apr-1 = null;};
 
   "bindings-apr-util" = callPackage
     ({ mkDerivation, apr-util-1, base, bindings-apr, bindings-DSL }:
@@ -26353,7 +26434,7 @@ self: {
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { apr-util-1 = null;};
+     }) {apr-util-1 = null;};
 
   "bindings-audiofile" = callPackage
     ({ mkDerivation, audiofile, base, bindings-DSL }:
@@ -26366,7 +26447,7 @@ self: {
        homepage = "http://cielonegro.org/Bindings-AudioFile.html";
        description = "Low level bindings to audiofile";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) audiofile;};
+     }) {inherit (pkgs) audiofile;};
 
   "bindings-bfd" = callPackage
     ({ mkDerivation, alex, array, base, bfd, containers, happy, opcodes
@@ -26384,7 +26465,7 @@ self: {
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bfd = null;  opcodes = null;};
+     }) {bfd = null; opcodes = null;};
 
   "bindings-cctools" = callPackage
     ({ mkDerivation, bindings-DSL, dttools }:
@@ -26398,7 +26479,7 @@ self: {
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dttools = null;};
+     }) {dttools = null;};
 
   "bindings-codec2" = callPackage
     ({ mkDerivation, base, binary, bindings-DSL, bytestring, codec2
@@ -26419,7 +26500,7 @@ self: {
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { codec2 = null;};
+     }) {codec2 = null;};
 
   "bindings-common" = callPackage
     ({ mkDerivation, base }:
@@ -26446,7 +26527,7 @@ self: {
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dc1394 = null;};
+     }) {dc1394 = null;};
 
   "bindings-directfb" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-posix, directfb }:
@@ -26458,7 +26539,7 @@ self: {
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) directfb;};
+     }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
     ({ mkDerivation, array, base, bindings-DSL, eskit }:
@@ -26474,7 +26555,7 @@ self: {
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { eskit = null;};
+     }) {eskit = null;};
 
   "bindings-fann" = callPackage
     ({ mkDerivation, base, bindings-DSL, fann }:
@@ -26487,7 +26568,7 @@ self: {
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fann = null;};
+     }) {fann = null;};
 
   "bindings-fluidsynth" = callPackage
     ({ mkDerivation, base, bindings-DSL, fluidsynth }:
@@ -26500,7 +26581,7 @@ self: {
        homepage = "http://github.com/bgamari/bindings-fluidsynth";
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fluidsynth;};
+     }) {inherit (pkgs) fluidsynth;};
 
   "bindings-friso" = callPackage
     ({ mkDerivation, base, bindings-DSL, friso }:
@@ -26513,7 +26594,7 @@ self: {
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { friso = null;};
+     }) {friso = null;};
 
   "bindings-glib" = callPackage
     ({ mkDerivation, base, bindings-DSL, glib }:
@@ -26525,7 +26606,7 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings to GLib";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) glib;};
+     }) {inherit (pkgs) glib;};
 
   "bindings-gobject" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib, glib }:
@@ -26537,7 +26618,7 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Low level bindings supporting GObject and derived libraries";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) glib;};
+     }) {inherit (pkgs) glib;};
 
   "bindings-gpgme" = callPackage
     ({ mkDerivation, base, bindings-DSL, gpgme }:
@@ -26550,7 +26631,7 @@ self: {
        homepage = "http://bitbucket.org/mauricio/bindings-gpgme";
        description = "Project bindings-* raw interface to gpgme";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) gpgme;};
+     }) {inherit (pkgs) gpgme;};
 
   "bindings-gsl" = callPackage
     ({ mkDerivation, base, bindings-DSL, gsl }:
@@ -26562,7 +26643,7 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) gsl;};
+     }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib, gts }:
@@ -26575,7 +26656,7 @@ self: {
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gts;};
+     }) {inherit (pkgs) gts;};
 
   "bindings-hamlib" = callPackage
     ({ mkDerivation, base, bindings-DSL, hamlib }:
@@ -26593,7 +26674,7 @@ self: {
        homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) hamlib;};
+     }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -26618,7 +26699,7 @@ self: {
        homepage = "https://github.com/basvandijk/bindings-levmar";
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) {inherit (pkgs) blas; lapack = null;};
 
   "bindings-libcddb" = callPackage
     ({ mkDerivation, base, bindings-DSL, libcddb }:
@@ -26631,7 +26712,7 @@ self: {
        homepage = "http://bitbucket.org/mauricio/bindings-libcddb";
        description = "Low level binding to libcddb";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libcddb;};
+     }) {inherit (pkgs) libcddb;};
 
   "bindings-libffi" = callPackage
     ({ mkDerivation, base, bindings-DSL, libffi }:
@@ -26643,7 +26724,7 @@ self: {
        libraryPkgconfigDepends = [ libffi ];
        description = "Low level bindings to libffi";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libffi;};
+     }) {inherit (pkgs) libffi;};
 
   "bindings-libftdi" = callPackage
     ({ mkDerivation, base, bindings-DSL, libftdi, libusb }:
@@ -26656,7 +26737,7 @@ self: {
        description = "Low level bindings to libftdi";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libftdi;  inherit (pkgs) libusb;};
+     }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;};
 
   "bindings-librrd" = callPackage
     ({ mkDerivation, base, bindings-DSL, librrd }:
@@ -26670,7 +26751,7 @@ self: {
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { librrd = null;};
+     }) {librrd = null;};
 
   "bindings-libstemmer" = callPackage
     ({ mkDerivation, base, bindings-DSL, resourcet, stemmer
@@ -26687,7 +26768,7 @@ self: {
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { stemmer = null;};
+     }) {stemmer = null;};
 
   "bindings-libusb" = callPackage
     ({ mkDerivation, base, bindings-DSL, libusb }:
@@ -26700,7 +26781,7 @@ self: {
        homepage = "https://github.com/basvandijk/bindings-libusb";
        description = "Low level bindings to libusb";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libusb;};
+     }) {inherit (pkgs) libusb;};
 
   "bindings-libv4l2" = callPackage
     ({ mkDerivation, base, bindings-DSL, v4l2 }:
@@ -26714,7 +26795,7 @@ self: {
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { v4l2 = null;};
+     }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
     ({ mkDerivation, base, bindings-DSL, libzip }:
@@ -26727,7 +26808,7 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libzip;};
+     }) {inherit (pkgs) libzip;};
 
   "bindings-linux-videodev2" = callPackage
     ({ mkDerivation, base, bindings-DSL, ioctl }:
@@ -26754,7 +26835,7 @@ self: {
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lxc;};
+     }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
     ({ mkDerivation, bindings-posix }:
@@ -26797,7 +26878,7 @@ self: {
        homepage = "http://floss.scru.org/bindings-nettle";
        description = "bindings to nettle crypto library";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) nettle;};
+     }) {inherit (pkgs) nettle;};
 
   "bindings-parport" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -26820,7 +26901,7 @@ self: {
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) portaudio;};
+     }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -26844,7 +26925,7 @@ self: {
        homepage = "https://github.com/rwbarton/bindings-potrace";
        description = "Low-level bindings to the potrace bitmap tracing library";
        license = stdenv.lib.licenses.gpl2;
-     }) { inherit (pkgs) potrace;};
+     }) {inherit (pkgs) potrace;};
 
   "bindings-ppdev" = callPackage
     ({ mkDerivation, base, bindings-DSL, ioctl }:
@@ -26889,7 +26970,7 @@ self: {
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) saneBackends;};
+     }) {inherit (pkgs) saneBackends;};
 
   "bindings-sc3" = callPackage
     ({ mkDerivation, base, bindings-DSL, scsynth }:
@@ -26903,7 +26984,7 @@ self: {
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { scsynth = null;};
+     }) {scsynth = null;};
 
   "bindings-sipc" = callPackage
     ({ mkDerivation, base, sipc }:
@@ -26920,7 +27001,7 @@ self: {
        description = "Low level bindings to SIPC";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { sipc = null;};
+     }) {sipc = null;};
 
   "bindings-sophia" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -26943,7 +27024,7 @@ self: {
        libraryPkgconfigDepends = [ sqlite ];
        description = "Low level bindings to sqlite3";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "bindings-svm" = callPackage
     ({ mkDerivation, base, bindings-DSL }:
@@ -26972,13 +27053,13 @@ self: {
     ({ mkDerivation, base, gmp, yices }:
      mkDerivation {
        pname = "bindings-yices";
-       version = "0.2";
-       sha256 = "c9a9ac5080030ee4a0c360af469745a2d96fb223946d9f64c4a9c83c4d87ce8f";
+       version = "0.3.0.2";
+       sha256 = "247eb63716c11cdda9275e2e726153cf19dd1a4bbd457170a2384cc55d4d18b5";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gmp yices ];
        description = "Bindings to the Yices theorem prover";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) gmp;  inherit (pkgs) yices;};
+     }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "binembed" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
@@ -27505,7 +27586,7 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
-     }) { gcc_s = null;};
+     }) {gcc_s = null;};
 
   "bitset" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, gmp, integer-gmp
@@ -27522,7 +27603,7 @@ self: {
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gmp;};
+     }) {inherit (pkgs) gmp;};
 
   "bitspeak" = callPackage
     ({ mkDerivation, base, bindings-DSL, bindings-glib
@@ -27542,7 +27623,7 @@ self: {
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtk;  inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs.gnome) gtk; inherit (pkgs.gnome) pango;};
 
   "bitstream" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck
@@ -27645,24 +27726,25 @@ self: {
      }) {};
 
   "bitx-bitcoin" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit
-     , http-types, microlens, microlens-th, network, scientific, split
-     , text, time
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec
+     , http-conduit, http-types, microlens, microlens-th, network, safe
+     , scientific, split, text, time
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.4.0.0";
-       sha256 = "6c04902ab1ce6600373ba1f477878a17c6cfe00c3417596a3c96f22dbbfe492f";
+       version = "0.5.0.0";
+       sha256 = "e52f9757e72a5f3fa2992a4f68ffb7874131357b9327ce6908200e8e89d7f9a9";
        libraryHaskellDepends = [
          aeson base bytestring http-conduit http-types microlens
          microlens-th network scientific split text time
        ];
        testHaskellDepends = [
-         aeson base bytestring hspec microlens time
+         aeson base bytestring directory doctest hspec microlens safe text
+         time
        ];
        homepage = "https://github.com/tebello-thejane/bitx-haskell";
        description = "A Haskell library for working with the BitX bitcoin exchange";
-       license = stdenv.lib.licenses.publicDomain;
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "bk-tree" = callPackage
@@ -27854,7 +27936,7 @@ self: {
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;};
+     }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
     ({ mkDerivation, base, biocore, bytestring, parallel, tagsoup }:
@@ -27885,10 +27967,9 @@ self: {
     ({ mkDerivation, base, blaze-html, text }:
      mkDerivation {
        pname = "blaze-bootstrap";
-       version = "0.1.0.0";
-       sha256 = "3cdf5395b78914b273b989956ab53b83c8e36dbe6dd24c3305e2ba8e9ee42fe0";
+       version = "0.1.0.1";
+       sha256 = "53b54c0b55ae7a436ec7e5d4e29d50fceb1ccd459ef715236358a3c661d05163";
        libraryHaskellDepends = [ base blaze-html text ];
-       jailbreak = true;
        homepage = "http://github.com/agrafix/blaze-bootstrap";
        description = "Blaze helper functions for bootstrap pages";
        license = stdenv.lib.licenses.mit;
@@ -28242,6 +28323,7 @@ self: {
          quickcheck-properties semigroups text time unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -28606,6 +28688,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "both" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "both";
+       version = "0.1.0.0";
+       sha256 = "f30b3c55ade901bd6d15d4e359d7a58e5a44b44e4891d0c766731fd6879314fe";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/barrucadu/both";
+       description = "Like Maybe, but with a different Monoid instance";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "botpp" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -28828,20 +28922,22 @@ self: {
 
   "brick" = callPackage
     ({ mkDerivation, base, containers, contravariant, data-default
-     , Diff, lens, template-haskell, text, text-zipper, transformers
-     , vector, vty
+     , deepseq, Diff, lens, template-haskell, text, text-zipper
+     , transformers, vector, vty
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.1";
-       sha256 = "b81c5276709795fd9fe14f2b456b36ee0f4ee399abaa2f738948492baf2fb230";
+       version = "0.2";
+       sha256 = "2bc36fd17d7dd465b370fc0b3ca49afd9cf78bc851bebd5341175a826dba9c97";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers contravariant data-default Diff lens
+         base containers contravariant data-default deepseq Diff lens
          template-haskell text text-zipper transformers vector vty
        ];
-       executableHaskellDepends = [ base data-default lens text vty ];
+       executableHaskellDepends = [
+         base data-default lens text vector vty
+       ];
        homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
@@ -28906,7 +29002,7 @@ self: {
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { broker = null;};
+     }) {broker = null;};
 
   "bsd-sysctl" = callPackage
     ({ mkDerivation, base }:
@@ -29220,7 +29316,7 @@ self: {
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) bullet;};
+     }) {inherit (pkgs) bullet;};
 
   "bumper" = callPackage
     ({ mkDerivation, base, Cabal, containers, fclabels, process
@@ -29384,7 +29480,6 @@ self: {
        homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytable" = callPackage
@@ -29795,7 +29890,7 @@ self: {
        librarySystemDepends = [ bzip2 ];
        description = "Compression and decompression in the bzip2 format";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) bzip2;};
+     }) {inherit (pkgs) bzip2;};
 
   "bzlib-conduit" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, conduit
@@ -29818,7 +29913,7 @@ self: {
        homepage = "https://github.com/snoyberg/bzlib-conduit";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) bzip2;};
+     }) {inherit (pkgs) bzip2;};
 
   "c-dsl" = callPackage
     ({ mkDerivation, base, language-c }:
@@ -29984,13 +30079,15 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "0.9.5";
-       sha256 = "f053206ce48080c7166ede1053da9332ed73ffc8192f38e87dcfaa588e049a50";
+       version = "1.0.1";
+       sha256 = "07ece2976aaf2a496043039120889d1904efbb8c439581b099c70cc56d9d1720";
+       revision = "1";
+       editedCabalFile = "0bea75835dec3439d69a0c176bcc9aa5c82866e7293dcb60e49c7168800bd8eb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal cabal-lenses cmdargs either lens strict transformers
-         unordered-containers
+         base Cabal cabal-lenses cmdargs directory either filepath lens
+         strict transformers unordered-containers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -30008,8 +30105,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.7.7";
-       sha256 = "9f5ac25b0efcb8d9d41096c4e32c9c0ebae81cdef2be4e5d999348a9dd75c321";
+       version = "0.7.8";
+       sha256 = "0a13469b3077b242cc758f5b3b645d7fe4fca950d82c4b564ea616e7bd92e251";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30070,8 +30167,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.30.2";
-       sha256 = "bca7aae4e601e8bd72cee931cd8081331a7298f07db2260fbb3a5a0103ee4eed";
+       version = "4.31.4";
+       sha256 = "f700f3fef9d6ec3e95468cfe65c7b77b4ec560668ec876aeed01d833804c18bd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30085,12 +30182,13 @@ self: {
          base Cabal debian lens mtl pretty Unixutils
        ];
        testHaskellDepends = [
-         base Cabal containers debian Diff filepath hsemail HUnit lens
-         pretty process text
+         base Cabal containers debian Diff directory filepath hsemail HUnit
+         lens pretty process text
        ];
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -30217,8 +30315,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.5.1.0";
-       sha256 = "563773491cc8245c3d265c2e7847f95198aad74adcbc16a91622e7e4abef4e45";
+       version = "0.5.3.0";
+       sha256 = "6ab4dc0b9b523241f6f3ed6d6af2d5d1085fc3e384d88b6667a87df843800f66";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30226,10 +30324,14 @@ self: {
          transformers
        ];
        executableHaskellDepends = [
-         base bytestring Cabal directory filepath process template-haskell
-         temporary transformers utf8-string
+         base bytestring Cabal directory filepath ghc-prim process
+         template-haskell temporary transformers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal data-default directory extra filepath
+         ghc-prim mtl process template-haskell temporary transformers unix
+         utf8-string
        ];
-       testHaskellDepends = [ base extra process unix ];
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -30320,7 +30422,7 @@ self: {
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
     ({ mkDerivation, array, base, Cabal, containers, directory
@@ -30367,12 +30469,17 @@ self: {
      }) {};
 
   "cabal-lenses" = callPackage
-    ({ mkDerivation, base, Cabal, lens, unordered-containers }:
+    ({ mkDerivation, base, Cabal, either, lens, strict, system-fileio
+     , system-filepath, text, transformers, unordered-containers
+     }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.4.5";
-       sha256 = "b668afea6a4d1e26384c4e7ce19cb14a54ce717c9e045661585f15a82ab109ec";
-       libraryHaskellDepends = [ base Cabal lens unordered-containers ];
+       version = "0.4.6";
+       sha256 = "1fdb9c5e82cd1b82c0aff5392375baa339261684e8260c77308334433ea52dac";
+       libraryHaskellDepends = [
+         base Cabal either lens strict system-fileio system-filepath text
+         transformers unordered-containers
+       ];
        jailbreak = true;
        description = "Lenses and traversals for the Cabal library";
        license = stdenv.lib.licenses.bsd3;
@@ -30496,8 +30603,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-rpm";
-       version = "0.9.6";
-       sha256 = "e501a7b3a203be2e069e26337e6bbdd0993ffe6d9e75a626089b2637393d2f1e";
+       version = "0.9.7";
+       sha256 = "b927e84b5a23edffa8053c3c5e5a5191c434dbcbbe7e4551f8dc840d3b17bc74";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -30772,6 +30879,7 @@ self: {
        homepage = "http://github.com/NixOS/cabal2nix";
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "cabal2spec" = callPackage
@@ -30923,7 +31031,7 @@ self: {
        homepage = "http://github.com/pecorarista/hscabocha";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cabocha = null;};
+     }) {cabocha = null;};
 
   "cached-io" = callPackage
     ({ mkDerivation, base, stm, time }:
@@ -31015,7 +31123,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Cairo library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) cairo;};
+     }) {inherit (pkgs) cairo;};
 
   "cairo-appbase" = callPackage
     ({ mkDerivation, base, cairo, glib, gtk }:
@@ -31112,7 +31220,7 @@ self: {
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cal3d = null;};
+     }) {cal3d = null;};
 
   "cal3d-examples" = callPackage
     ({ mkDerivation, base, cal3d, cal3d-opengl, OpenGL, SDL }:
@@ -31542,7 +31650,7 @@ self: {
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi = null;};
+     }) {casadi = null;};
 
   "casadi-bindings-control" = callPackage
     ({ mkDerivation, base, casadi-bindings-core
@@ -31560,7 +31668,7 @@ self: {
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi_control = null;};
+     }) {casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
     ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }:
@@ -31573,7 +31681,7 @@ self: {
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi = null;};
+     }) {casadi = null;};
 
   "casadi-bindings-internal" = callPackage
     ({ mkDerivation, base, casadi, vector }:
@@ -31587,7 +31695,7 @@ self: {
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi = null;};
+     }) {casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
     ({ mkDerivation, base, casadi-bindings-core
@@ -31604,7 +31712,7 @@ self: {
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi_ipopt_interface = null;};
+     }) {casadi_ipopt_interface = null;};
 
   "casadi-bindings-snopt-interface" = callPackage
     ({ mkDerivation, base, casadi-bindings-core
@@ -31621,7 +31729,7 @@ self: {
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { casadi_snopt_interface = null;};
+     }) {casadi_snopt_interface = null;};
 
   "cascading" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, colour
@@ -31680,6 +31788,7 @@ self: {
        homepage = "https://github.com/jb55/cased";
        description = "Track string casing in its type";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "cases" = callPackage
@@ -32055,7 +32164,7 @@ self: {
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cci = null;};
+     }) {cci = null;};
 
   "ccnx" = callPackage
     ({ mkDerivation, base, bytestring }:
@@ -32086,7 +32195,7 @@ self: {
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dttools = null;};
+     }) {dttools = null;};
 
   "cedict" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, parsec
@@ -32472,8 +32581,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.5.2";
-       sha256 = "998770126bf6dff9c230557accb1eb5bbc2b89ed03d209645a92b2f229e52c08";
+       version = "6.5.3";
+       sha256 = "af2f1b09aabb32fe398a575f28331979903afa00333b3f1dc0f19a6d302bca1e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32796,7 +32905,7 @@ self: {
        librarySystemDepends = [ resolv ];
        description = "Confirm whether an email is valid and probably existant";
        license = stdenv.lib.licenses.bsd3;
-     }) { resolv = null;};
+     }) {resolv = null;};
 
   "check-pvp" = callPackage
     ({ mkDerivation, base, Cabal, containers, explicit-exception
@@ -33009,7 +33118,6 @@ self: {
        jailbreak = true;
        description = "measure timings of data evaluation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chu2" = callPackage
@@ -33057,8 +33165,8 @@ self: {
        pname = "chunked-data";
        version = "0.2.0";
        sha256 = "9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272";
-       revision = "1";
-       editedCabalFile = "ba9fa66cf9c9995dfec2c5735692d6f52343a48d6c9cae4242ec399e0f421fdc";
+       revision = "2";
+       editedCabalFile = "8e667f090de9d53e254c511c8658c15f3c097b7652611b4f65bfabd5151319d0";
        libraryHaskellDepends = [
          base blaze-builder bytestring containers mono-traversable
          semigroups text transformers vector
@@ -33135,7 +33243,7 @@ self: {
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cinvoke = null;};
+     }) {cinvoke = null;};
 
   "cio" = callPackage
     ({ mkDerivation, base, monad-stm, mtl, parallel-io, stm }:
@@ -33731,8 +33839,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude";
-       version = "0.12.1.1";
-       sha256 = "670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13";
+       version = "0.12.3";
+       sha256 = "fd7b6e97c8e462844598f76f9aef4c4f445cd833e3b72eebcc94e8c20a7d3a24";
        libraryHaskellDepends = [
          base basic-prelude bifunctors bytestring chunked-data containers
          dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
@@ -33755,8 +33863,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-conduit";
-       version = "0.12.0.1";
-       sha256 = "b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7";
+       version = "0.12.3";
+       sha256 = "d86127153f9a69a2ed87777a0a93d8174c7ff136cbefb470879982b3b4875970";
        libraryHaskellDepends = [
          base bytestring classy-prelude conduit conduit-combinators
          monad-control resourcet transformers void
@@ -33776,8 +33884,8 @@ self: {
      }:
      mkDerivation {
        pname = "classy-prelude-yesod";
-       version = "0.12.0.1";
-       sha256 = "220f42a881672837513de5a425fa060fa545436b99baa02c6d5faaa697a6ff02";
+       version = "0.12.3";
+       sha256 = "ddc03c6e473e3355f5c5efa3cd1eecf15605ef3a109038d0350eb5890b6a3c9d";
        libraryHaskellDepends = [
          aeson base classy-prelude classy-prelude-conduit data-default
          http-conduit http-types persistent yesod yesod-newsfeed
@@ -33835,12 +33943,12 @@ self: {
          web-routes-th xss-sanitize
        ];
        librarySystemDepends = [ openssl ];
-       libraryToolDepends = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
     ({ mkDerivation, acid-state, base, clckwrks, haskeline, mtl
@@ -33855,6 +33963,7 @@ self: {
        executableHaskellDepends = [
          acid-state base clckwrks haskeline mtl network parsec
        ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -33930,6 +34039,7 @@ self: {
          safecopy text web-plugins web-routes web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://clckwrks.com/";
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -33954,6 +34064,7 @@ self: {
          web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://clckwrks.com/";
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -33979,7 +34090,7 @@ self: {
          tagsoup template-haskell text time time-locale-compat uuid
          web-plugins web-routes web-routes-happstack web-routes-th
        ];
-       libraryToolDepends = [ hsx2hs ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -33998,7 +34109,6 @@ self: {
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
        ];
-       libraryToolDepends = [ hsx2hs ];
        homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -34011,8 +34121,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-theme-clckwrks";
-       version = "0.5.0";
-       sha256 = "1b72c96e2c6a2d04c3ec53727b72ab3454f82192f5f77f83ca672a56cfc55f1b";
+       version = "0.5.1";
+       sha256 = "93540dc0dafbf1e9bc6863c215391905201bc4653133fd01c0f0c6a9bacd6858";
        libraryHaskellDepends = [
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
@@ -34235,20 +34345,20 @@ self: {
 
   "clippings" = callPackage
     ({ mkDerivation, assertions, base, bifunctors, bytestring, cassava
-     , data-default, filepath, old-locale, parsec, safecopy, strptime
-     , time
+     , data-default, filepath, functor-infix, old-locale, parsec
+     , safecopy, strptime, time
      }:
      mkDerivation {
        pname = "clippings";
-       version = "0.1.3";
-       sha256 = "79e3e0c4d2ab9a37bfd0fd35ce161de45e3acf96be1ecce93726a3cdf065a036";
+       version = "0.2.0";
+       sha256 = "8562481c8ba001b6c401d6ebfacd458fe44b19676ce8bd2e8694cd45cf825bdb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bifunctors data-default old-locale parsec strptime time
+         base data-default functor-infix old-locale parsec strptime time
        ];
        executableHaskellDepends = [
-         base bifunctors bytestring cassava parsec safecopy
+         base bifunctors bytestring cassava functor-infix parsec safecopy
        ];
        testHaskellDepends = [
          assertions base data-default filepath old-locale parsec time
@@ -34299,7 +34409,7 @@ self: {
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { QtCore = null;};
+     }) {QtCore = null;};
 
   "clogparse" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, filepath, text, time
@@ -34520,7 +34630,7 @@ self: {
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) clutter;  inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;};
 
   "cmaes" = callPackage
     ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random
@@ -34543,8 +34653,8 @@ self: {
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.4.0.1";
-       sha256 = "638328b59c2bb8bdcd0f3042c4554f2b2b7c6deac7770dbc8bc2813c865a35ce";
+       version = "0.4.1";
+       sha256 = "22f006ba36620476916c605b92de8e1f325eb2b5ebec6b30c12aee6220262330";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
@@ -35338,6 +35448,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "comfort-graph" = callPackage
+    ({ mkDerivation, base, containers, QuickCheck, transformers
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "comfort-graph";
+       version = "0.0.0.3";
+       sha256 = "e379d8d331d3b0245528a4c88a0fad369a2ad9a04f45f6e57546a342bf58c783";
+       libraryHaskellDepends = [
+         base containers QuickCheck transformers utility-ht
+       ];
+       testHaskellDepends = [
+         base containers QuickCheck transformers utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/comfort-graph";
+       description = "Graph structure with type parameters for nodes and edges";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "command" = callPackage
     ({ mkDerivation, base, deepseq, process }:
      mkDerivation {
@@ -35531,6 +35660,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "compact-socket" = callPackage
+    ({ mkDerivation, base, binary, bytestring, compact, deepseq
+     , directory, filepath, network, unix
+     }:
+     mkDerivation {
+       pname = "compact-socket";
+       version = "0.1.0.0";
+       sha256 = "e758ee08d3013aebc013fe2d5eb1f529db56ea0f926bd2ba7bc1266cc1c9ee3b";
+       libraryHaskellDepends = [
+         base binary bytestring compact deepseq directory filepath network
+         unix
+       ];
+       jailbreak = true;
+       description = "Socket functions for compact normal form";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {compact = null;};
+
   "compact-string" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -36085,8 +36232,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-machines";
-       version = "0.1.0.0";
-       sha256 = "846fd1bcb15551750da36f525050fc0a5f03c752ccd421fb90dfc92f595a9de6";
+       version = "0.1.0.1";
+       sha256 = "d3db20a02c415f8aa68832212738a09d5847b31549270529c69cc4c2bd2a832e";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -36096,7 +36243,6 @@ self: {
        ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-sa" = callPackage
@@ -36313,10 +36459,8 @@ self: {
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
        pname = "conduit-audio";
-       version = "0.1";
-       sha256 = "8bfabae0f9e9322ffd91e1cd8afbe6a5eb716d46c0035876ab7368c44fb6bdf6";
-       revision = "1";
-       editedCabalFile = "bf853ba8300deda982d278245bd268e91f444ca42185bd0d57eb9feae5ab066c";
+       version = "0.2";
+       sha256 = "8cabe59479eb5b02cea6d64c177181eba19affe6dfb1335ae437e992417b9d55";
        libraryHaskellDepends = [ base conduit vector ];
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
@@ -36331,8 +36475,8 @@ self: {
        pname = "conduit-audio-lame";
        version = "0.1";
        sha256 = "3c85eec27bb2dbfa5f625624d1dc8ccabf22a4f62508d50a9d940be7c9aa9644";
-       revision = "1";
-       editedCabalFile = "34e31416cde87ad1d75570612f3e95d8f54cbeac0539a6f85b93aebaf3979c1a";
+       revision = "2";
+       editedCabalFile = "515e004751c00e38b2d55e549fc2c1fd73cbf86a113e9b35b2a681fcc80a546d";
        libraryHaskellDepends = [
          base bytestring conduit conduit-audio resourcet transformers vector
        ];
@@ -36341,7 +36485,7 @@ self: {
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mp3lame = null;};
+     }) {mp3lame = null;};
 
   "conduit-audio-samplerate" = callPackage
     ({ mkDerivation, base, conduit, conduit-audio, resourcet
@@ -36351,8 +36495,8 @@ self: {
        pname = "conduit-audio-samplerate";
        version = "0.1";
        sha256 = "4f7781a30e57f6fd38f35d565ca4a94640e5b9ed62b821e7a3723d6d41a34513";
-       revision = "1";
-       editedCabalFile = "c3601c344d95841d594827a61b1a7ad05042dec6f62ce9952e88b3d0fe814a63";
+       revision = "2";
+       editedCabalFile = "6a1b8fd7fe0e3bda31d7e02eddfbf9ad569f74a130a2985b55cf09334ee0fd76";
        libraryHaskellDepends = [
          base conduit conduit-audio resourcet transformers vector
        ];
@@ -36361,7 +36505,7 @@ self: {
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { samplerate = null;};
+     }) {samplerate = null;};
 
   "conduit-audio-sndfile" = callPackage
     ({ mkDerivation, base, conduit, conduit-audio, hsndfile
@@ -36371,8 +36515,8 @@ self: {
        pname = "conduit-audio-sndfile";
        version = "0.1";
        sha256 = "6d35ed7b38479ce2b6946d661abe11aa69c1db6821b14b52618e273604fb1b6c";
-       revision = "1";
-       editedCabalFile = "f753b66e55fc5332463bc54a7077b9c503439cd03c7c1c799cd60751ab954a87";
+       revision = "2";
+       editedCabalFile = "2a067b3ffad200da8d993ba8c57f53580b3505d912b9c9dfb160674e642f749a";
        libraryHaskellDepends = [
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
@@ -36846,7 +36990,6 @@ 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
@@ -37120,7 +37263,7 @@ self: {
        executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { hyperleveldb = null;};
+     }) {hyperleveldb = null;};
 
   "continuum-client" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, mtl
@@ -37953,12 +38096,15 @@ self: {
      }:
      mkDerivation {
        pname = "courier";
-       version = "0.1.0.15";
-       sha256 = "5b14d1d5d2bd4efb563a8e5111cd23c5892034b6bfcd2e34ead8c9c3b35549aa";
+       version = "0.1.1.1";
+       sha256 = "950216558b5729d592c2bfd9b230ab25fe0403cd5cfa6825ec9b6123fc330ad6";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring cereal containers hslogger network stm text
          uuid
        ];
+       executableHaskellDepends = [ base cereal ];
        testHaskellDepends = [
          async base cereal containers directory hslogger HUnit network stm
          test-framework test-framework-hunit
@@ -37989,6 +38135,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "coverage" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "coverage";
+       version = "0.1.0.2";
+       sha256 = "ba99dccf43de1021322a870e03fc74b9a46bc5bdffde302859f19870065e6df0";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       jailbreak = true;
+       homepage = "https://github.com/nicodelpiano/coverage";
+       description = "Exhaustivity Checking Library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cpio-conduit" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
      , conduit, conduit-extra, resourcet
@@ -38034,8 +38195,8 @@ self: {
      }:
      mkDerivation {
        pname = "cpphs";
-       version = "1.19.2";
-       sha256 = "bb45b22d8b00605942bc2f675c43ba826e9a861cfe1474f1aad9d427e16690a4";
+       version = "1.19.3";
+       sha256 = "e2546aa382e9c22942c5c2849631edc6b1d8cbea2c50762f66b740755faf57da";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38089,14 +38250,13 @@ self: {
     ({ mkDerivation, array, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "2.5.2";
-       sha256 = "05b32a60a1ec193beafa4e9009b210bb81933cdf30a798611e64aa13a4e2a27e";
+       version = "2.5.3";
+       sha256 = "c7f2d323f0b558e8a39a387f21d7f93b8449f25082d7e8515cc7f805d2a31919";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers parallel ];
        description = "Symbolic cryptographic protocol analyzer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpu" = callPackage
@@ -38156,7 +38316,7 @@ self: {
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) python3;};
+     }) {inherit (pkgs) python3;};
 
   "cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, Decimal, iproute
@@ -38358,7 +38518,7 @@ self: {
        description = "A haskell binding to cracklib";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { crack = null;};
+     }) {crack = null;};
 
   "crackNum" = callPackage
     ({ mkDerivation, base, data-binary-ieee754, ieee754 }:
@@ -39133,8 +39293,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.6";
-       sha256 = "a016ccaa38579beb4517807a8917801baf6e6ddb830a74af91fc064c35acf853";
+       version = "0.7";
+       sha256 = "6cd4d9ff100b06a08ceac56eb12153633957797b309032a963cdf3841f92ecd9";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -39340,8 +39500,8 @@ self: {
      }:
      mkDerivation {
        pname = "css-syntax";
-       version = "0.0.2";
-       sha256 = "9ee149c46c3f76d46943bf7b374be79535aaec393b3a5dc2f176636c76382115";
+       version = "0.0.4";
+       sha256 = "9b9254e3471b7be615f8546a5f46b1a338d81be0f2724aa107311c3ee6ee6bd9";
        libraryHaskellDepends = [
          attoparsec base bytestring scientific text
        ];
@@ -39474,7 +39634,7 @@ self: {
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ctemplate = null;};
+     }) {ctemplate = null;};
 
   "ctkl" = callPackage
     ({ mkDerivation, array, base }:
@@ -39602,7 +39762,7 @@ self: {
        homepage = "https://github.com/bmsherman/cublas";
        description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries";
        license = stdenv.lib.licenses.bsd3;
-     }) { cublas = null;  cusparse = null;};
+     }) {cublas = null; cusparse = null;};
 
   "cuboid" = callPackage
     ({ mkDerivation, base, GLUT, Yampa }:
@@ -39648,8 +39808,8 @@ self: {
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cudd = null;  dddmp = null;  epd = null;  inherit (pkgs) mtr;
-          inherit (pkgs) st;  util = null;};
+     }) {cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr; 
+         inherit (pkgs) st; util = null;};
 
   "cufft" = callPackage
     ({ mkDerivation, base, c2hs, cuda }:
@@ -39674,7 +39834,7 @@ self: {
        librarySystemDepends = [ curl ];
        description = "Haskell binding to libcurl";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) curl;};
+     }) {inherit (pkgs) curl;};
 
   "curl-aeson" = callPackage
     ({ mkDerivation, aeson, base, curl, text, utf8-string }:
@@ -40099,7 +40259,7 @@ self: {
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-     }) { inherit (pkgs) curl;};
+     }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, datetime
@@ -40158,7 +40318,7 @@ self: {
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) curl;};
+     }) {inherit (pkgs) curl;};
 
   "darcs-buildpackage" = callPackage
     ({ mkDerivation, base, ConfigFile, directory, hslogger, MissingH
@@ -40199,8 +40359,8 @@ self: {
        description = "David's Advanced Version Control System";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) curl;  inherit (pkgs) ncurses;
-          inherit (pkgs) zlib;};
+     }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
+         inherit (pkgs) zlib;};
 
   "darcs-fastconvert" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cmdlib, containers
@@ -41333,11 +41493,13 @@ self: {
        pname = "data-reify";
        version = "0.6.1";
        sha256 = "61350a1e96cb1276c2b6b8b13fa1bade5d4e63c702509a3f5e90bbc19ad9b202";
+       revision = "1";
+       editedCabalFile = "f7f3a5b2f482a67eb77f4ba32e15f91bcfa4c220cdda9dde22cd9d9ff18ab447";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
-       homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/IOReification";
+       homepage = "http://ku-fpg.github.io/software/data-reify/";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41641,20 +41803,20 @@ self: {
 
   "dataflow" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
-     , filepath, hastache, hspec, HUnit, markdown, MissingH, mtl, parsec
-     , text, vector
+     , filepath, gitrev, hastache, hspec, HUnit, markdown, MissingH, mtl
+     , parsec, text, vector
      }:
      mkDerivation {
        pname = "dataflow";
-       version = "0.7.1.0";
-       sha256 = "cb7bc18db84941303981a4aafb4b07883ee869d62587f416cb0304d4a0d4bfb4";
+       version = "0.7.3.0";
+       sha256 = "312f2f0497cbd7e34d6eb3c4f1d113443e5375346b70628c0a22211e4baf883a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base blaze-html bytestring containers filepath hastache
          markdown MissingH mtl parsec text vector
        ];
-       executableHaskellDepends = [ base bytestring text ];
+       executableHaskellDepends = [ base bytestring gitrev text ];
        testHaskellDepends = [
          aeson base bytestring containers hspec HUnit parsec vector
        ];
@@ -41846,8 +42008,8 @@ self: {
      }:
      mkDerivation {
        pname = "dbmigrations";
-       version = "0.8.2";
-       sha256 = "3c08e5b321e6b60d0abf5f9f20ca4466c2556759aa7866d85c1ffb28c45c310c";
+       version = "0.9";
+       sha256 = "2e9d9d971a2a8f771148a4b19ea8226e4fa2ac2eefb11c93afa4c9983838435c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41855,11 +42017,7 @@ self: {
          HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
          yaml-light
        ];
-       executableHaskellDepends = [
-         base bytestring configurator containers directory fgl filepath HDBC
-         HDBC-postgresql HDBC-sqlite3 mtl random template-haskell text time
-         yaml-light
-       ];
+       executableHaskellDepends = [ base configurator ];
        testHaskellDepends = [
          base bytestring containers directory fgl filepath HDBC
          HDBC-postgresql HDBC-sqlite3 HUnit mtl process template-haskell
@@ -42296,6 +42454,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dead-code-detection" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , getopt-generics, ghc, ghc-paths, gitrev, Glob, graph-wrapper
+     , hspec, interpolate, mockery, silently, string-conversions
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "dead-code-detection";
+       version = "0.1.1";
+       sha256 = "45bc29a1b21001d9b5524f6fe808581d1871cb97e330637ba6fe4e06aef66351";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers getopt-generics ghc ghc-paths gitrev Glob
+         graph-wrapper silently string-conversions uniplate
+       ];
+       testHaskellDepends = [
+         base containers directory filepath getopt-generics ghc ghc-paths
+         gitrev Glob graph-wrapper hspec interpolate mockery silently
+         string-conversions uniplate
+       ];
+       homepage = "https://github.com/soenkehahn/dead-code-detection#readme";
+       description = "detect dead code in haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dead-simple-json" = callPackage
     ({ mkDerivation, base, containers, parsec, template-haskell
      , transformers, vector
@@ -42322,8 +42506,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian";
-       version = "3.87.2";
-       sha256 = "2994078f24cc7467bf8ffbd14cd8838aebaceb659856f77fb91d59bbbe06ae8c";
+       version = "3.88.1";
+       sha256 = "89451e4c95f798f887edace812ed6bd7418e771dd79097eafb6a1f2015a03ed9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42492,14 +42676,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "deepseq_1_4_1_1" = callPackage
+  "deepseq_1_4_1_2" = callPackage
     ({ mkDerivation, array, base, HUnit, test-framework
      , test-framework-hunit
      }:
      mkDerivation {
        pname = "deepseq";
-       version = "1.4.1.1";
-       sha256 = "908158eb30ac6abe2fb32d9c07cc2c3dae886867520b5529c09b5e87db32b3bf";
+       version = "1.4.1.2";
+       sha256 = "3b7cfa5ff5eb169b3f97285be978f030d664c6e3e84a2525b2fafca4f7380651";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [
          array base HUnit test-framework test-framework-hunit
@@ -42749,6 +42933,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dejafu" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions, monad-loops
+     , mtl, random, stm, transformers
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "0.1.0.0";
+       sha256 = "469c2f0690ede4ad83483d5ae82601471a7c737daddd116ad423d5b9202ee2b4";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions monad-loops mtl random stm
+         transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Overloadable primitives for testable, potentially non-deterministic, concurrency";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -42762,7 +42965,7 @@ self: {
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mpdec = null;};
+     }) {mpdec = null;};
 
   "deka-tests" = callPackage
     ({ mkDerivation, base, bytestring, containers, deka, parsec, pipes
@@ -42917,8 +43120,8 @@ self: {
     ({ mkDerivation, base, containers, dependent-sum }:
      mkDerivation {
        pname = "dependent-map";
-       version = "0.1.1.3";
-       sha256 = "44dd913868dddfaa104c27794cbf852e8c4783fe78f49b3b2dd635b4731ec8af";
+       version = "0.2.0.1";
+       sha256 = "645c5c519d5cb6393ee826dfca183736be84fda87e980f0daecd7be207bb8f50";
        libraryHaskellDepends = [ base containers dependent-sum ];
        homepage = "https://github.com/mokus0/dependent-map";
        description = "Dependent finite maps (partial dependent products)";
@@ -42929,8 +43132,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "dependent-sum";
-       version = "0.2.1.0";
-       sha256 = "835e799c9749822f2818dd5c7dc1e887d4c5b5a6bb37c7e4c0661a2060d6dcc0";
+       version = "0.3.2.1";
+       sha256 = "b91338c9d18b8977114c3ef962dc224b6a7ff12b0861c536f560260429b6a42f";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/mokus0/dependent-sum";
        description = "Dependent sum type";
@@ -43245,6 +43448,7 @@ self: {
        sha256 = "3adffba07d4fdca79909331ec0029e09cf7895cadada5613f3e359d777c8bcc1";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
+       jailbreak = true;
        homepage = "https://github.com/TGOlson/deterministic-game-engine";
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
@@ -43444,7 +43648,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -43577,7 +43780,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -43595,7 +43797,6 @@ self: {
        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
@@ -44004,7 +44205,7 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "digest-pure" = callPackage
     ({ mkDerivation, array, base, bytestring, digest, QuickCheck }:
@@ -44025,13 +44226,12 @@ self: {
      }:
      mkDerivation {
        pname = "digestive-bootstrap";
-       version = "0.1.0.0";
-       sha256 = "ffcf11ad8a5692569df86fdc967ce3ccaafa9b1d973f92893091e924e8683030";
+       version = "0.1.0.1";
+       sha256 = "eb7d7586903f07c4519c4ff862923344e912268f686394cb4f550bd9ef0418f7";
        libraryHaskellDepends = [
          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;
      }) {};
@@ -44374,6 +44574,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diplomacy-server" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , deepseq, diplomacy, filepath, hourglass, json-schema, mtl
+     , optparse-applicative, parsec, random, rest-core, rest-wai, stm
+     , Stream, text, transformers, transformers-compat, TypeNat, wai
+     , warp, warp-tls
+     }:
+     mkDerivation {
+       pname = "diplomacy-server";
+       version = "0.1.0.0";
+       sha256 = "36de8e6754843331fa36f1da296dd467dc6267a80bce3d907e4f73f4f2e4dcf6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson async base bytestring containers deepseq diplomacy filepath
+         hourglass json-schema mtl optparse-applicative parsec random
+         rest-core rest-wai stm Stream text transformers transformers-compat
+         TypeNat wai warp warp-tls
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/avieth/diplomacy-server";
+       description = "Play Diplomacy over HTTP";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "direct-binary-files" = callPackage
     ({ mkDerivation, base, bytestring, mtl }:
      mkDerivation {
@@ -44615,7 +44841,7 @@ self: {
        description = "Haskell bindings to the discount Markdown library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { markdown = null;};
+     }) {markdown = null;};
 
   "discrete-space-map" = callPackage
     ({ mkDerivation, adjunctions, base, comonad, distributive, keys
@@ -45212,8 +45438,8 @@ self: {
      }:
      mkDerivation {
        pname = "diversity";
-       version = "0.7.0.0";
-       sha256 = "41181ef465f7f88904bffadb2057b7d055813b74fb360b6d07fad27b9bc6f513";
+       version = "0.7.0.1";
+       sha256 = "aa5e39896fe48ba067ad5c02213ada4dfbb5f089bb4d2338b58da4b95a56458b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45291,8 +45517,8 @@ self: {
     ({ mkDerivation, base, Cabal, deepseq, QuickCheck }:
      mkDerivation {
        pname = "dlist";
-       version = "0.7.1.1";
-       sha256 = "08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd";
+       version = "0.7.1.2";
+       sha256 = "332d21f16fd30d2534b6ab96c98830a14266d8f368cff21f6a47469fb3493783";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/spl/dlist";
@@ -45380,7 +45606,7 @@ self: {
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dns_sd = null;};
+     }) {dns_sd = null;};
 
   "doc-review" = callPackage
     ({ mkDerivation, base, base64-bytestring, binary, bytestring
@@ -46110,7 +46336,7 @@ self: {
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) dpkg;  libdpkg = null;};
+     }) {inherit (pkgs) dpkg; libdpkg = null;};
 
   "drClickOn" = callPackage
     ({ mkDerivation, base, containers }:
@@ -46144,7 +46370,7 @@ self: {
      }) {};
 
   "drawille" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck }:
+    ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "drawille";
        version = "0.1.0.5";
@@ -46152,7 +46378,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base containers hspec QuickCheck ];
        homepage = "https://github.com/yamadapc/haskell-drawille";
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
@@ -46191,6 +46416,7 @@ self: {
        ];
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -46376,25 +46602,23 @@ self: {
      }) {};
 
   "dtab" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , data-binary-ieee754, pretty, transformers
+    ({ mkDerivation, alex, array, base, binary, bytestring, containers
+     , data-binary-ieee754, happy, pretty, transformers
      }:
      mkDerivation {
        pname = "dtab";
-       version = "1.0";
-       sha256 = "43067c07ec8dd6bedcaa985a51df834987172ba2153d089e5edf7729e99da5ff";
-       revision = "2";
-       editedCabalFile = "50fe31cffb6f7eab4428bf547fd0c7e7804a0f20c604692a18b213d4a54a0a7a";
+       version = "1.0.0.1";
+       sha256 = "d696fd2a9019c9b4916831f88217f92f809dc4341b5ffc506f8e786d91bbe069";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary bytestring containers data-binary-ieee754 pretty
          transformers
        ];
+       libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtd" = callPackage
@@ -46478,7 +46702,6 @@ self: {
        jailbreak = true;
        description = "(Fast) Dynamic Time Warping";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dual-tree" = callPackage
@@ -46586,7 +46809,7 @@ self: {
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { dvdread = null;};
+     }) {dvdread = null;};
 
   "dvi-processing" = callPackage
     ({ mkDerivation, base, bytestring, filepath, transformers }:
@@ -46682,7 +46905,7 @@ self: {
        description = "A binding to the Microsoft DirectX 9 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { d3d9 = null;};
+     }) {d3d9 = null;};
 
   "dx9d3dx" = callPackage
     ({ mkDerivation, base, d3dx9, dx9base, dx9d3d, Win32 }:
@@ -46695,7 +46918,7 @@ self: {
        description = "A binding to the Microsoft DirectX 9 D3DX API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { d3dx9 = null;};
+     }) {d3dx9 = null;};
 
   "dynamic-cabal" = callPackage
     ({ mkDerivation, base, containers, data-default, directory, doctest
@@ -47103,7 +47326,7 @@ self: {
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { canlib = null;};
+     }) {canlib = null;};
 
   "ed25519" = callPackage
     ({ mkDerivation, base, bytestring, hlint, QuickCheck }:
@@ -47116,7 +47339,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ed25519-donna" = callPackage
@@ -47312,7 +47534,6 @@ self: {
        homepage = "https://github.com/maxpow4h/editable";
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "editline" = callPackage
@@ -47589,7 +47810,7 @@ self: {
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { eibclient = null;};
+     }) {eibclient = null;};
 
   "eigen" = callPackage
     ({ mkDerivation, base, binary, bytestring, mtl, primitive
@@ -47920,7 +48141,6 @@ self: {
        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
@@ -47961,7 +48181,6 @@ self: {
        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
@@ -48005,7 +48224,6 @@ self: {
        homepage = "http://github.com/elm-lang/elm-get";
        description = "Tool for sharing and using Elm libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-init" = callPackage
@@ -48046,7 +48264,6 @@ 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
@@ -48078,7 +48295,6 @@ 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
@@ -48103,7 +48319,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "Interactive development tool for Elm programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-repl" = callPackage
@@ -48130,7 +48345,6 @@ 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
@@ -48151,7 +48365,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "Server for developing Elm projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-yesod" = callPackage
@@ -48169,7 +48382,6 @@ self: {
        homepage = "http://elm-lang.org";
        description = "The Elm language Yesod compatibility module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elocrypt" = callPackage
@@ -48721,8 +48933,8 @@ self: {
     ({ mkDerivation, base, containers, hspec }:
      mkDerivation {
        pname = "envparse";
-       version = "0.2.1";
-       sha256 = "8f71913f13df34dc5092ae4d5808c086e7b7d84a0696d6891bf4727254a37dde";
+       version = "0.2.2";
+       sha256 = "72bbac6a4c6755c6f1f0b68a68475afb71cd6763e8fb90c88411457ff16f4a03";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
        homepage = "https://supki.github.io/envparse";
@@ -48745,6 +48957,7 @@ self: {
          base bytestring hspec mtl QuickCheck quickcheck-instances text time
          transformers
        ];
+       jailbreak = true;
        description = "An environmentally friendly way to deal with environment variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49516,6 +49729,7 @@ self: {
          base directory hlint hspec process regex-posix xml
        ];
        testToolDepends = [ happy ];
+       jailbreak = true;
        homepage = "https://github.com/decomputed/euler";
        description = "Mathematics utilities for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -49737,8 +49951,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "exact-pi";
-       version = "0.2.1.1";
-       sha256 = "6ff443ecd07f8727089202b881125c85ef21818594ffa910dfa41eaa54eb14b9";
+       version = "0.2.1.2";
+       sha256 = "a6a6239cf13b18409996bad40c487b80fdf03b87fea48bb0309e32e47243ee38";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
@@ -49931,7 +50145,7 @@ self: {
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) exif;};
+     }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
     ({ mkDerivation, base, constraints, singletons }:
@@ -50643,6 +50857,7 @@ self: {
        sha256 = "c6bde8e127af0dbb2b6e426ef34eb3fafe32ccb32358b8482774e6fc4ab91e7f";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
+       jailbreak = true;
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
@@ -50689,6 +50904,8 @@ self: {
        pname = "fast-logger";
        version = "2.4.1";
        sha256 = "e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e";
+       revision = "1";
+       editedCabalFile = "d33a479d4e18cae6671cd21fa47d3a62cd5674b2f234e35403bb3a8c7a56ae11";
        libraryHaskellDepends = [
          array auto-update base bytestring bytestring-builder directory
          filepath text
@@ -50802,7 +51019,7 @@ self: {
        librarySystemDepends = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fcgi;};
+     }) {inherit (pkgs) fcgi;};
 
   "fastedit" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, containers
@@ -51258,6 +51475,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "feed-translator" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, cmdargs
+     , containers, feed, iso639, lens, naver-translate, network-uri
+     , raw-strings-qq, scotty, text, transformers, wai, warp, wreq, xml
+     }:
+     mkDerivation {
+       pname = "feed-translator";
+       version = "0.1.0.1";
+       sha256 = "ca29fa44090e1f9f62dbb95ecd98a893a2a6d7ec57df3c2b8a71a42104a78fa3";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base blaze-html blaze-markup cmdargs containers feed iso639 lens
+         naver-translate network-uri raw-strings-qq scotty text transformers
+         wai warp wreq xml
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/dahlia/feed-translator";
+       description = "Translate syndication feeds";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "feed2lj" = callPackage
     ({ mkDerivation, base, curl, directory, feed, haskell98, HTTP
      , old-locale, pureMD5, regex-posix, tagsoup, time, utf8-string
@@ -51321,7 +51560,7 @@ self: {
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gcc_s = null;};
+     }) {gcc_s = null;};
 
   "feldspar-language" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, data-default
@@ -51367,8 +51606,8 @@ self: {
        description = "Signal Processing extension for Feldspar";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { feldspar-compiler-shim = null;  imperative-edsl = null;
-          monadic-edsl-priv = null;};
+     }) {feldspar-compiler-shim = null; imperative-edsl = null; 
+         monadic-edsl-priv = null;};
 
   "fen2s" = callPackage
     ({ mkDerivation, api-opentheory-unicode, base, opentheory-unicode
@@ -51422,7 +51661,7 @@ self: {
        description = "Graph-based notetaking system";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { raptor = null;};
+     }) {raptor = null;};
 
   "fez-conf" = callPackage
     ({ mkDerivation, base, containers, regex-compat }:
@@ -51503,8 +51742,8 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ffmpeg;  libavcodec = null;
-          libavformat = null;  libswscale = null;};
+     }) {inherit (pkgs) ffmpeg; libavcodec = null; libavformat = null; 
+         libswscale = null;};
 
   "ffmpeg-tutorials" = callPackage
     ({ mkDerivation, base, bytestring, haskell98, hs-ffmpeg, SDL, stm
@@ -51541,7 +51780,7 @@ self: {
        jailbreak = true;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fftw;  inherit (pkgs) fftwFloat;};
+     }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
     ({ mkDerivation, base, fftw }:
@@ -51554,7 +51793,7 @@ self: {
        homepage = "https://github.com/adamwalker/haskell-fftw-simple";
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) fftw;};
+     }) {inherit (pkgs) fftw;};
 
   "fgl" = callPackage
     ({ mkDerivation, array, base, containers, deepseq, hspec
@@ -51568,6 +51807,7 @@ self: {
          array base containers deepseq transformers
        ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
+       jailbreak = true;
        description = "Martin Erwig's Functional Graph Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51580,6 +51820,7 @@ self: {
        sha256 = "840db22168432e752f9eaf7a2564afd20a0442342b61cea1ec63b21832612684";
        libraryHaskellDepends = [ base fgl QuickCheck ];
        testHaskellDepends = [ base containers fgl hspec QuickCheck ];
+       jailbreak = true;
        description = "QuickCheck support for fgl";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52162,7 +52403,7 @@ self: {
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) cfitsio;};
+     }) {inherit (pkgs) cfitsio;};
 
   "fix-imports" = callPackage
     ({ mkDerivation, base, containers, cpphs, directory, filepath
@@ -52316,11 +52557,10 @@ self: {
     ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }:
      mkDerivation {
        pname = "fixed-vector";
-       version = "0.8.0.0";
-       sha256 = "39da25f74a7c0760cb4675b0116eb9581232de57566e7b323e135e1157068fc2";
+       version = "0.8.1.0";
+       sha256 = "3c3c29c7248c08061949843727e83ad234584ca77f8076ecd9537a185ebe3a93";
        libraryHaskellDepends = [ base deepseq primitive ];
        testHaskellDepends = [ base doctest filemanip primitive ];
-       jailbreak = true;
        description = "Generic vectors with statically known size";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52950,7 +53190,7 @@ self: {
        homepage = "https://github.com/MostAwesomeDude/hsfluidsynth";
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) fluidsynth;};
+     }) {inherit (pkgs) fluidsynth;};
 
   "fmark" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process, Unixutils
@@ -53002,6 +53242,7 @@ self: {
        sha256 = "ab4af7e815cfa2345cdf17c0e765da575f66c0b9b978c8234d620fcf933800db";
        libraryHaskellDepends = [ base data-default stm stm-delay time ];
        testHaskellDepends = [ base hspec stm time ];
+       jailbreak = true;
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
@@ -53022,6 +53263,7 @@ self: {
        testHaskellDepends = [
          base conduit hspec resourcet stm transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
@@ -53065,6 +53307,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "foldl-transduce" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, comonad, containers
+     , doctest, foldl, semigroupoids, tasty, tasty-hunit, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "foldl-transduce";
+       version = "0.2.0.0";
+       sha256 = "38be7ab52831c7ea5ac5fd4e546b9f8b4a66305528af80aa6ec17214b6066e02";
+       libraryHaskellDepends = [
+         base bifunctors bytestring comonad containers foldl semigroupoids
+         text transformers
+       ];
+       testHaskellDepends = [ base doctest foldl tasty tasty-hunit text ];
+       description = "Transducers for foldl folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "folds" = callPackage
     ({ mkDerivation, base, bytestring, comonad, contravariant, deepseq
      , directory, doctest, filepath, lens, mtl, pointed, profunctors
@@ -53136,7 +53397,7 @@ self: {
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { foma = null;};
+     }) {foma = null;};
 
   "font-opengl-basic4x6" = callPackage
     ({ mkDerivation, base, GLFW-b, OpenGL }:
@@ -53391,6 +53652,7 @@ self: {
          base bytestring data-default-class double-conversion hspec HUnit
          lens old-locale QuickCheck text time
        ];
+       jailbreak = true;
        homepage = "https://github.com/Soostone/formattable";
        description = "Business-quality formatting of numbers, dates, and other things";
        license = stdenv.lib.licenses.bsd3;
@@ -53702,7 +53964,7 @@ self: {
        description = "A simple web framework";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghc-binary = null;};
+     }) {ghc-binary = null;};
 
   "frame-markdown" = callPackage
     ({ mkDerivation, base, frame, pandoc }:
@@ -53946,8 +54208,7 @@ self: {
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { freenect = null;  freenect_sync = null;};
+     }) {inherit (pkgs) freenect; freenect_sync = null;};
 
   "freesect" = callPackage
     ({ mkDerivation, array, base, cpphs, directory, mtl, parallel
@@ -54065,7 +54326,7 @@ self: {
        homepage = "https://github.com/RaphaelJ/friday-devil";
        description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "friendly-time" = callPackage
     ({ mkDerivation, base, hspec, old-locale, time }:
@@ -54108,8 +54369,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, transformers }:
      mkDerivation {
        pname = "frpnow";
-       version = "0.13";
-       sha256 = "192b41e9c307dedc7004ff0e2bb50c4025a26de932dc7fa8ba6c7ffe83f3bb8d";
+       version = "0.18";
+       sha256 = "1fafa04d5ec57b49380ad23675075acf03ba63bcf92d52d1341bad265c64b0c7";
        libraryHaskellDepends = [ base containers mtl transformers ];
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
@@ -54273,7 +54534,6 @@ self: {
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftdi" = callPackage
@@ -54439,6 +54699,7 @@ self: {
        homepage = "http://savannah.nongnu.org/projects/funcmp/";
        description = "Functional MetaPost";
        license = stdenv.lib.licenses.gpl3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "function-combine" = callPackage
@@ -54787,7 +55048,7 @@ self: {
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghcjs-base = null;};
+     }) {ghcjs-base = null;};
 
   "g-npm" = callPackage
     ({ mkDerivation, base, HTTP, json }:
@@ -54974,7 +55235,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) GConf;};
+     }) {inherit (pkgs.gnome) GConf;};
 
   "gd" = callPackage
     ({ mkDerivation, base, bytestring, expat, fontconfig, freetype, gd
@@ -54990,10 +55251,10 @@ self: {
        ];
        description = "A Haskell binding to a subset of the GD graphics library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) expat;  inherit (pkgs) fontconfig;
-          inherit (pkgs) freetype;  inherit (pkgs) gd;
-          inherit (pkgs) libjpeg;  inherit (pkgs) libpng;
-          inherit (pkgs) zlib;};
+     }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; 
+         inherit (pkgs) freetype; inherit (pkgs) gd; 
+         inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
+         inherit (pkgs) zlib;};
 
   "gdiff" = callPackage
     ({ mkDerivation, base }:
@@ -55175,7 +55436,7 @@ self: {
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { genders = null;};
+     }) {genders = null;};
 
   "general-prelude" = callPackage
     ({ mkDerivation, base, lens, pointless-fun, strict, system-filepath
@@ -56002,7 +56263,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -56188,8 +56448,8 @@ self: {
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
-       version = "0.1.7.0";
-       sha256 = "e3e085bd656c8865d80994ad909960de448719394d1d033b75b4c6fc756a6031";
+       version = "0.1.8.0";
+       sha256 = "494e9df73942c5e77e01c331eaee94438c15c711d78f48c1d1c4d8977ffb5152";
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
        homepage = "https://github.com/gibiansky/IHaskell";
@@ -56650,7 +56910,7 @@ self: {
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "gio" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib
@@ -56688,7 +56948,6 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -56752,8 +57011,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "5.20150812";
-       sha256 = "0c6f8cd802b38313739b4a5c5fd8ca51493643d60f9290321039c5c0e33546f4";
+       version = "5.20150824";
+       sha256 = "45088dd5ff5a63ca38965e60843e42c1b8424b3437b58af68929cf61ef0819e4";
        configureFlags = [ "-fassistant" "-fproduction" ];
        isLibrary = false;
        isExecutable = true;
@@ -56783,11 +57042,10 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) bup;  inherit (pkgs) curl;  inherit (pkgs) git;
-          inherit (pkgs) gnupg;  inherit (pkgs) lsof;
-          inherit (pkgs) openssh;  inherit (pkgs) perl;
-          inherit (pkgs) rsync;  inherit (pkgs) wget;
-          inherit (pkgs) which;};
+     }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
+         inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
+         inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
+         inherit (pkgs) which;};
 
   "git-checklist" = callPackage
     ({ mkDerivation, base, directory, filepath, optparse-applicative
@@ -56909,7 +57167,6 @@ 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
@@ -57096,7 +57353,7 @@ self: {
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) git;};
+     }) {inherit (pkgs) git;};
 
   "github-post-receive" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
@@ -57116,12 +57373,19 @@ self: {
      }) {};
 
   "github-types" = callPackage
-    ({ mkDerivation, aeson, base, text }:
+    ({ mkDerivation, aeson, aeson-pretty, base, hspec, hspec-smallcheck
+     , http-conduit, smallcheck, text, time, unordered-containers
+     , vector
+     }:
      mkDerivation {
        pname = "github-types";
-       version = "0.1.0.5";
-       sha256 = "f1a4b62882d6b2f263cb411047d947ff0555be338a3699338816f20cd45bd553";
-       libraryHaskellDepends = [ aeson base text ];
+       version = "0.2.0";
+       sha256 = "3f3675dff4076ddc64021bb5cbe89e5b609c65d2f08463a3d12d760b779ee4d8";
+       libraryHaskellDepends = [ aeson base text time ];
+       testHaskellDepends = [
+         aeson aeson-pretty base hspec hspec-smallcheck http-conduit
+         smallcheck text time unordered-containers vector
+       ];
        description = "Type definitions for objects used by the GitHub v3 API";
        license = "unknown";
      }) {};
@@ -57153,6 +57417,7 @@ self: {
        ];
        description = "GitHub WebHook Handler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-webhook-handler-snap" = callPackage
@@ -57169,6 +57434,7 @@ self: {
        ];
        description = "GitHub WebHook Handler implementation for Snap";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitignore" = callPackage
@@ -57203,22 +57469,23 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.11.1.1";
-       sha256 = "bc8a5662a8e262a3ebaba270f54781db28407acd2fb441fbadc6df019d7a8ec4";
+       version = "0.12.0.1";
+       sha256 = "552996f2624ed08cd21a73303d666292f08a1294416d2811f9d57293c9e89506";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base filepath ghc ghc-paths pandoc pandoc-types safe
-       ];
-       executableHaskellDepends = [
          aeson base base64-bytestring blaze-html bytestring ConfigFile
          containers directory feed filepath filestore ghc ghc-paths
          happstack-server highlighting-kate hoauth2 hslogger HStringTemplate
          HTTP http-client-tls http-conduit json mtl network network-uri
          old-locale old-time pandoc pandoc-types parsec pretty process
-         random recaptcha SHA split syb tagsoup text time uri url
+         random recaptcha safe SHA split syb tagsoup text time uri url
          utf8-string uuid xhtml xml xss-sanitize zlib
        ];
+       executableHaskellDepends = [
+         base bytestring directory filepath hslogger HTTP mtl network
+         network-uri syb url utf8-string
+       ];
        homepage = "http://gitit.net";
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
@@ -57316,7 +57583,6 @@ self: {
        ];
        description = "Libgit2 backend for gitlib";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-s3" = callPackage
@@ -57452,7 +57718,7 @@ self: {
        librarySystemDepends = [ mesa ];
        description = "Complete OpenGL raw bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) mesa;};
+     }) {inherit (pkgs) mesa;};
 
   "gl-capture" = callPackage
     ({ mkDerivation, base, bytestring, OpenGL }:
@@ -57479,7 +57745,7 @@ self: {
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) libglade;};
+     }) {inherit (pkgs.gnome) libglade;};
 
   "gladexml-accessor" = callPackage
     ({ mkDerivation, base, glade, HaXml, template-haskell }:
@@ -57495,29 +57761,27 @@ self: {
 
   "glambda" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, directory
-     , errors, haskeline, mtl, parsec, tasty, tasty-hunit
-     , template-haskell
+     , either, haskeline, mtl, parsec, tasty, tasty-hunit
+     , template-haskell, transformers
      }:
      mkDerivation {
        pname = "glambda";
-       version = "1.0";
-       sha256 = "0ef6fc8e1fedc034c6d392aad4323b1b4c825e34b1a18affc6022873de817805";
+       version = "1.0.1";
+       sha256 = "da42696d4ad985cd10d249457d801a234c04a29ef08acdbbd91544dabce2d16f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base containers directory errors haskeline mtl
-         parsec
+         ansi-wl-pprint base containers directory either haskeline mtl
+         parsec transformers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         ansi-wl-pprint base errors mtl parsec tasty tasty-hunit
+         ansi-wl-pprint base either mtl parsec tasty tasty-hunit
          template-haskell
        ];
-       jailbreak = true;
        homepage = "https://github.com/goldfirere/glambda";
        description = "A simply typed lambda calculus interpreter, written with GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glapp" = callPackage
@@ -57567,7 +57831,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GLIB library for Gtk2Hs";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) glib;};
+     }) {inherit (pkgs) glib;};
 
   "glider-nlp" = callPackage
     ({ mkDerivation, base, Cabal, containers, HUnit, text }:
@@ -57725,6 +57989,7 @@ self: {
        libraryHaskellDepends = [
          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;
@@ -57764,6 +58029,7 @@ self: {
        revision = "1";
        editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a";
        libraryHaskellDepends = [ base gloss reactive-banana ];
+       jailbreak = true;
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
@@ -57875,6 +58141,7 @@ self: {
        libraryHaskellDepends = [
          base bmp bytestring containers GLUT OpenGL
        ];
+       jailbreak = true;
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57902,7 +58169,7 @@ self: {
        librarySystemDepends = [ glpk ];
        description = "Comprehensive GLPK linear programming bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) glpk;};
+     }) {inherit (pkgs) glpk;};
 
   "glue" = callPackage
     ({ mkDerivation, async, base, ekg-core, hashable, hspec
@@ -57912,13 +58179,13 @@ self: {
      }:
      mkDerivation {
        pname = "glue";
-       version = "0.1.2";
-       sha256 = "55a2bee39073ad16ddfd2879ec91c8eb9dd78cd2e25498ef39ad6f8dc1f6ae45";
+       version = "0.2.0";
+       sha256 = "784692e29ea1f5effe4ca98732431b77b2595baa5220394c1561b803e4309b2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base ekg-core hashable lifted-base monad-control monad-loops text
-         time transformers transformers-base unordered-containers
+         base ekg-core hashable lifted-base monad-control text time
+         transformers transformers-base unordered-containers
        ];
        executableHaskellDepends = [
          async base ekg-core hashable lifted-base monad-control monad-loops
@@ -57926,7 +58193,7 @@ self: {
        ];
        testHaskellDepends = [
          async base ekg-core hashable hspec lifted-base monad-control
-         monad-loops QuickCheck quickcheck-instances text time transformers
+         QuickCheck quickcheck-instances text time transformers
          transformers-base unordered-containers
        ];
        description = "Make better services";
@@ -58013,7 +58280,7 @@ self: {
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gnome_keyring;};
+     }) {inherit (pkgs.gnome) gnome_keyring;};
 
   "gnomevfs" = callPackage
     ({ mkDerivation, array, base, containers, glib, gnome_vfs
@@ -58033,7 +58300,7 @@ self: {
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gnome_vfs;  gnome_vfs_module = null;};
+     }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;};
 
   "gnuidn" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, libidn, text }:
@@ -58048,7 +58315,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnuidn/";
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) libidn;};
+     }) {inherit (pkgs) libidn;};
 
   "gnuplot" = callPackage
     ({ mkDerivation, array, base, containers, data-accessor
@@ -58083,7 +58350,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnutls/";
        description = "Bindings for GNU libgnutls";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) gnutls;};
+     }) {inherit (pkgs) gnutls;};
 
   "goa" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
@@ -58152,6 +58419,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "google-cloud" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mtl, random, scientific, stm, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "google-cloud";
+       version = "0.0.3";
+       sha256 = "16462026bc546cf51d453524ce0aae735bdc84f4d0d1f276ccc6606e41b8655f";
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types mtl
+         random scientific stm text time unordered-containers
+       ];
+       description = "Client for the Google Cloud APIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "google-dictionary" = callPackage
     ({ mkDerivation, aeson, base, bytestring, HTTP, lens, mtl }:
      mkDerivation {
@@ -58185,7 +58469,6 @@ self: {
        ];
        description = "Google Drive API access";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-html5-slide" = callPackage
@@ -59150,7 +59433,6 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grm" = callPackage
@@ -59196,8 +59478,8 @@ self: {
        pname = "groundhog";
        version = "0.7.0.3";
        sha256 = "39713e7b3423ea34a5ac803d4a563d7f9674bbf72700e263a00c7bc70328ac58";
-       revision = "1";
-       editedCabalFile = "dcf9bbeaf0fd7e7ac0809902a54779097e8935a07b1e7e43c404bc683c17e7f0";
+       revision = "2";
+       editedCabalFile = "b4a2f7876feaaf6ad8d4589989902d4452468910c0f3f01a04827a001036f3ff";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-builder bytestring
          containers monad-control monad-logger mtl scientific text time
@@ -59429,7 +59711,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gsasl/";
        description = "Bindings for GNU libgsasl";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) gsasl;};
+     }) {inherit (pkgs) gsasl;};
 
   "gsc-weighting" = callPackage
     ({ mkDerivation, base, hierarchical-clustering }:
@@ -59507,7 +59789,7 @@ self: {
        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;};
+     }) {inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
     ({ mkDerivation, base, containers, extensible-exceptions, haskeline
@@ -59559,7 +59841,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) gtk;};
+     }) {inherit (pkgs.gnome) gtk;};
 
   "gtk-helpers" = callPackage
     ({ mkDerivation, array, base, gio, glib, gtk, mtl, process
@@ -59620,7 +59902,7 @@ self: {
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gtk-mac-integration-gtk2 = null;};
+     }) {gtk-mac-integration-gtk2 = null;};
 
   "gtk-serialized-event" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk, haskell98, mtl
@@ -59687,7 +59969,7 @@ self: {
        homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) x11;};
+     }) {inherit (pkgs) x11;};
 
   "gtk2hs-buildtools" = callPackage
     ({ mkDerivation, alex, array, base, containers, directory, filepath
@@ -59846,8 +60128,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.14.0";
-       sha256 = "ec548d8a63caabf449ada2c3f2589c6b15e741572affb8362161fd2ab7e4d6c8";
+       version = "0.14.1";
+       sha256 = "4ebbb02611cbbc2a0ff592afb8cf37ffc6c10ec716464975872f46853c38c5a7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -59861,7 +60143,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { gtk3 = null;};
+     }) {inherit (pkgs) gtk3;};
 
   "gtk3-mac-integration" = callPackage
     ({ mkDerivation, array, base, containers, glib
@@ -59878,7 +60160,7 @@ self: {
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gtk-mac-integration-gtk3 = null;};
+     }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, gtkglext
@@ -59896,7 +60178,7 @@ self: {
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) gtkglext;};
+     }) {inherit (pkgs.gnome) gtkglext;};
 
   "gtkimageview" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk
@@ -59916,7 +60198,7 @@ self: {
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gtkimageview;};
+     }) {inherit (pkgs) gtkimageview;};
 
   "gtkrsync" = callPackage
     ({ mkDerivation, base, gconf, glade, gtk, MissingH, process
@@ -59953,7 +60235,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) gtksourceview;};
+     }) {inherit (pkgs.gnome) gtksourceview;};
 
   "gtksourceview3" = callPackage
     ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools
@@ -59971,7 +60253,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) gtksourceview;};
+     }) {inherit (pkgs.gnome) gtksourceview;};
 
   "guarded-rewriting" = callPackage
     ({ mkDerivation, base, instant-generics }:
@@ -60104,7 +60386,6 @@ self: {
        homepage = "https://github.com/Javran/h2048";
        description = "a haskell implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hArduino" = callPackage
@@ -60148,7 +60429,7 @@ self: {
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bdd = null;  mem = null;};
+     }) {bdd = null; mem = null;};
 
   "hBDD-CUDD" = callPackage
     ({ mkDerivation, base, c2hs, containers, cudd, deepseq, epd, hBDD
@@ -60164,8 +60445,8 @@ self: {
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { cudd = null;  epd = null;  inherit (pkgs) mtr;
-          inherit (pkgs) st;  util = null;};
+     }) {cudd = null; epd = null; inherit (pkgs) mtr; 
+         inherit (pkgs) st; util = null;};
 
   "hCsound" = callPackage
     ({ mkDerivation, base, c2hs, csound64, libsndfile, monads-tf
@@ -60182,7 +60463,7 @@ self: {
        description = "interface to CSound API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { csound64 = null;  inherit (pkgs) libsndfile;};
+     }) {csound64 = null; inherit (pkgs) libsndfile;};
 
   "hDFA" = callPackage
     ({ mkDerivation, base, containers, directory, process }:
@@ -60247,7 +60528,7 @@ self: {
        description = "A library for analyzing and transforming LLVM (3.5) assembly codes";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { hooplext = null;};
+     }) {hooplext = null;};
 
   "hMollom" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Crypto
@@ -60478,7 +60759,7 @@ self: {
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) {inherit (pkgs) blas; lapack = null;};
 
   "hXmixer" = callPackage
     ({ mkDerivation, base, directory, gtk3, process, split, text }:
@@ -60654,7 +60935,7 @@ self: {
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { event = null;};
+     }) {event = null;};
 
   "hack-handler-fastcgi" = callPackage
     ({ mkDerivation, base, bytestring, fcgi, hack, hack-handler-cgi }:
@@ -60669,7 +60950,7 @@ self: {
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) fcgi;};
+     }) {inherit (pkgs) fcgi;};
 
   "hack-handler-happstack" = callPackage
     ({ mkDerivation, base, bytestring, cgi, containers, data-default
@@ -60958,6 +61239,7 @@ self: {
        homepage = "http://github.com/peti/hackage-db";
        description = "access Hackage's package database via Data.Map";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "hackage-diff" = callPackage
@@ -60969,13 +61251,14 @@ self: {
        pname = "hackage-diff";
        version = "0.1.0.0";
        sha256 = "bf8010479ba75032c6750444edc7979a65c6ce4c919a629562ddd81aa03aac4d";
+       revision = "1";
+       editedCabalFile = "eddc65fed41375eaa4ce2aa729bd35364d558d7e33b23fcafca58dd6ce3cff1c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal async attoparsec base Cabal cpphs directory filepath
          haskell-src-exts HTTP mtl process text
        ];
-       jailbreak = true;
        homepage = "https://github.com/blitzcode/hackage-diff";
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
@@ -61011,7 +61294,6 @@ self: {
        homepage = "http://fpcomplete.com";
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-plot" = callPackage
@@ -61058,6 +61340,61 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hackage-repo-tool" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , hackage-security, network, network-uri, optparse-applicative, tar
+     , time, unix, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-repo-tool";
+       version = "0.1.0.1";
+       sha256 = "fc8863c28ca2cba3e7ae96bac4cc20376666eeb803b8911749a983f762c325f2";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath hackage-security network
+         network-uri optparse-applicative tar time unix zlib
+       ];
+       homepage = "http://github.com/well-typed/hackage-security/";
+       description = "Utility to manage secure file-based package repositories";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hackage-security" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, Cabal
+     , containers, cryptohash, directory, ed25519, filepath, ghc-prim
+     , mtl, network, network-uri, parsec, tar, template-haskell, time
+     , transformers, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-security";
+       version = "0.3.0.0";
+       sha256 = "7cbc4e0d7338af2d8cec5235c60270df487ef56bb2cd653a7987b1bc672a2fb6";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring Cabal containers cryptohash
+         directory ed25519 filepath ghc-prim mtl network network-uri parsec
+         tar template-haskell time transformers zlib
+       ];
+       description = "Hackage security library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hackage-security-HTTP" = callPackage
+    ({ mkDerivation, base, bytestring, hackage-security, HTTP, mtl
+     , network, network-uri, zlib
+     }:
+     mkDerivation {
+       pname = "hackage-security-HTTP";
+       version = "0.1.0.2";
+       sha256 = "094cc357668437e5a2ac86168fdfdd5f1784d779a706929d676d8e4d430244dc";
+       libraryHaskellDepends = [
+         base bytestring hackage-security HTTP mtl network network-uri zlib
+       ];
+       homepage = "http://github.com/well-typed/hackage-security/";
+       description = "Hackage security bindings against the HTTP library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hackage-server" = callPackage
     ({ mkDerivation, acid-state, aeson, alex, array, async, attoparsec
      , base, base16-bytestring, base64-bytestring, binary, blaze-builder
@@ -61198,6 +61535,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hackmanager" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, file-embed
+     , Glob, hastache, http-client, http-client-tls, http-types, mtl
+     , optparse-applicative, process, text
+     }:
+     mkDerivation {
+       pname = "hackmanager";
+       version = "0.1.0.0";
+       sha256 = "8a5cebf772c8f99b2e56deb9f64a90344ded1528ac1a9967eab2776d72053546";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal directory file-embed Glob hastache
+         http-client http-client-tls http-types mtl process text
+       ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       homepage = "http://github.com/agrafix/hackmanager";
+       description = "Generate useful files for Haskell projects";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hackport" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, extensible-exceptions, filepath, HTTP, HUnit, MissingH
@@ -61389,7 +61747,7 @@ self: {
        homepage = "http://github.com/jystic/hadoop-formats";
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
-     }) { inherit (pkgs) snappy;};
+     }) {inherit (pkgs) snappy;};
 
   "hadoop-rpc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, exceptions
@@ -61576,7 +61934,7 @@ self: {
        description = "Multi-app web platform framework";
        license = stdenv.lib.licenses.mit;
        broken = true;
-     }) { quickcheck-lio-instances = null;};
+     }) {quickcheck-lio-instances = null;};
 
   "hails-bin" = callPackage
     ({ mkDerivation, base, bson, bytestring, containers, ghc-paths
@@ -61880,6 +62238,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hakyll-sass" = callPackage
+    ({ mkDerivation, base, data-default-class, filepath, hakyll, hsass
+     }:
+     mkDerivation {
+       pname = "hakyll-sass";
+       version = "0.2.0";
+       sha256 = "1c0b131f3a581aafde543fc9c3211d75c6f17f6b25d0e32cf6032f4c3377dbc5";
+       revision = "1";
+       editedCabalFile = "afdc3b9e76e09fc1aaf7f9cceb780a2e062ec56aab20659804b8f35d3bb85bb5";
+       libraryHaskellDepends = [
+         base data-default-class filepath hakyll hsass
+       ];
+       homepage = "https://github.com/meoblast001/hakyll-sass";
+       description = "Hakyll SASS compiler over hsass";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "halberd" = callPackage
     ({ mkDerivation, base, Cabal, containers, haskell-names
      , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb
@@ -61983,7 +62358,6 @@ self: {
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma" = callPackage
@@ -62225,17 +62599,17 @@ self: {
   "hans" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring, cereal
      , containers, fingertree, HTTP, monadLib, network, old-locale
-     , random, time, unix
+     , random, stm, time, unix
      }:
      mkDerivation {
        pname = "hans";
-       version = "2.5.0.0";
-       sha256 = "17f018763926d55ab8cc0cb763526a99399003ecaba37a7dd52157c62ce7f5a7";
+       version = "2.6.0.0";
+       sha256 = "2853847c2d8823e43904ddcd2fa4ad1e1b15178a18e703293459866601c057a5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring cereal containers fingertree monadLib random time
-         unix
+         base bytestring cereal containers fingertree monadLib random stm
+         time unix
        ];
        executableHaskellDepends = [
          base blaze-html blaze-markup bytestring cereal containers HTTP
@@ -62243,7 +62617,6 @@ self: {
        ];
        description = "IPv4 Network Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans-pcap" = callPackage
@@ -62257,7 +62630,6 @@ self: {
        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
@@ -62272,7 +62644,7 @@ self: {
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { pfq = null;};
+     }) {pfq = null;};
 
   "hapistrano" = callPackage
     ({ mkDerivation, base, base-compat, directory, either, filepath
@@ -62319,7 +62691,7 @@ self: {
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { appindicator = null;};
+     }) {appindicator = null;};
 
   "happindicator3" = callPackage
     ({ mkDerivation, appindicator, base, glib, gtk3, text }:
@@ -62337,7 +62709,7 @@ self: {
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { appindicator = null;};
+     }) {appindicator = null;};
 
   "happraise" = callPackage
     ({ mkDerivation, base, directory, filepath }:
@@ -62472,6 +62844,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -62646,10 +63019,10 @@ self: {
          monad-control mtl reform reform-happstack reform-hsp safecopy text
          web-routes web-routes-happstack web-routes-hsp web-routes-th
        ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-hamlet" = callPackage
@@ -62725,7 +63098,6 @@ 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
@@ -62878,7 +63250,7 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "happstack-server-tls-cryptonite" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
@@ -63105,7 +63477,7 @@ self: {
        description = "Networked content addressed backup and restore software";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;  inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
   "hark" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, haskell98
@@ -63134,8 +63506,8 @@ self: {
      }:
      mkDerivation {
        pname = "harmony";
-       version = "0.1.0.3";
-       sha256 = "c4d91ca6923e9d04d72590eb309020e6937aa3097b3b649db6803e527eb4c092";
+       version = "0.1.1.0";
+       sha256 = "453e3a4db149729e19bcbd6970abf0ed9d3c25dfffeac2c3cb5be3dcfdddc5dd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63165,7 +63537,7 @@ self: {
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
-     }) { groonga = null;};
+     }) {groonga = null;};
 
   "haroonga-httpd" = callPackage
     ({ mkDerivation, base, directory, haroonga, http-types, old-locale
@@ -63624,7 +63996,7 @@ self: {
        homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) rdkafka;};
+     }) {inherit (pkgs) rdkafka;};
 
   "haskanoid" = callPackage
     ({ mkDerivation, base, freenect, hcwiid, IfElse, MissingH, mtl, SDL
@@ -63643,7 +64015,6 @@ self: {
        homepage = "http://github.com/ivanperez-keera/haskanoid";
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskarrow" = callPackage
@@ -64092,7 +64463,7 @@ self: {
        homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
-     }) { open-pal = null;  open-rte = null;  inherit (pkgs) openmpi;};
+     }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
 
   "haskell-names" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
@@ -64268,7 +64639,7 @@ self: {
        homepage = "https://github.com/jamessanders/haskell-qrencode";
        description = "Haskell bindings for libqrencode";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) qrencode;};
+     }) {inherit (pkgs) qrencode;};
 
   "haskell-reflect" = callPackage
     ({ mkDerivation, base, containers, hint, MonadCatchIO-mtl, mtl
@@ -64718,7 +65089,6 @@ 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
@@ -64756,7 +65126,6 @@ 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
@@ -64776,8 +65145,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;};
+     }) {inherit (pkgs) postgresql;};
 
   "haskelldb-hdbc-sqlite3" = callPackage
     ({ mkDerivation, base, haskelldb, haskelldb-hdbc, HDBC
@@ -64795,7 +65163,6 @@ 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
@@ -64870,7 +65237,7 @@ self: {
        description = "HaskellDB support for the HSQL Oracle driver";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { hsql-oracle = null;};
+     }) {hsql-oracle = null;};
 
   "haskelldb-hsql-postgresql" = callPackage
     ({ mkDerivation, base, haskelldb, haskelldb-hsql, hsql
@@ -64910,7 +65277,7 @@ self: {
        description = "HaskellDB support for the HSQL SQLite driver";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { hsql-sqlite = null;};
+     }) {hsql-sqlite = null;};
 
   "haskelldb-hsql-sqlite3" = callPackage
     ({ mkDerivation, base, haskelldb, haskelldb-hsql, hsql
@@ -65111,20 +65478,19 @@ self: {
 
   "haskmon" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-streams
-     , io-streams, old-locale, time, vector
+     , io-streams, time, vector
      }:
      mkDerivation {
        pname = "haskmon";
-       version = "0.1.1.0";
-       sha256 = "e4543d24662764a8c646b9552129ffd36a06c58c6df8f8889f2b177b9a0457f7";
+       version = "0.2.1.0";
+       sha256 = "69ac7e21a62f20c2fce94db01c373dbd66876a0cb016ab25a99a9dedc4f62677";
        libraryHaskellDepends = [
-         aeson base bytestring containers http-streams io-streams old-locale
-         time vector
+         aeson base bytestring containers http-streams io-streams time
+         vector
        ];
        jailbreak = true;
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin" = callPackage
@@ -65518,7 +65884,7 @@ self: {
        homepage = "https://github.com/otters/haspell";
        description = "Haskell bindings to aspell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) aspell;};
+     }) {inherit (pkgs) aspell;};
 
   "hasql" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, either
@@ -65718,7 +66084,7 @@ self: {
        description = "A port of blaze-markup and blaze-html to Haste";
        license = stdenv.lib.licenses.mit;
        broken = true;
-     }) { haste-lib = null;};
+     }) {haste-lib = null;};
 
   "haste-perch" = callPackage
     ({ mkDerivation, base, haste-compiler, transformers }:
@@ -65981,10 +66347,8 @@ self: {
      }:
      mkDerivation {
        pname = "haxy";
-       version = "1.0";
-       sha256 = "da1d3f638daff80fa82365d02fd6e5dbd1208e3391f6d7c21ced1ebac1ecedbb";
-       revision = "2";
-       editedCabalFile = "1dfd6805d921438c33b5388de37716d320af9aff2d8067837f510d43c3cf5940";
+       version = "1.0.1";
+       sha256 = "6db58fd3433a7c92d660f1c21b11edb739f5cdbe21b47d99336fab2928cd8f4c";
        libraryHaskellDepends = [
          base bytestring data-default-class hostname HTTP http-server mtl
          url
@@ -66014,7 +66378,7 @@ self: {
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) mesa;  inherit (pkgs) wayland;};
+     }) {inherit (pkgs) mesa; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types
@@ -66137,12 +66501,12 @@ self: {
        executableHaskellDepends = [
          base containers mtl old-time OpenGL SDL SDL-mixer
        ];
-       executableSystemDepends = [ SDL SDL_mixer ];
+       executableSystemDepends = [ SDL_mixer ];
        homepage = "http://www.dockerz.net/software/hbeat.html";
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) SDL;  inherit (pkgs) SDL_mixer;};
+     }) {inherit (pkgs) SDL_mixer;};
 
   "hblas" = callPackage
     ({ mkDerivation, base, blas, HUnit, lapack, primitive
@@ -66160,7 +66524,7 @@ self: {
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) {inherit (pkgs) blas; lapack = null;};
 
   "hblock" = callPackage
     ({ mkDerivation, aeson, base, blaze-markup, bytestring, cereal
@@ -66191,8 +66555,8 @@ self: {
      }:
      mkDerivation {
        pname = "hbro";
-       version = "1.4.0.1";
-       sha256 = "aafda5f16e1bc86dec50dde8ff18dbcb086987faba87cbe425225e59d107318a";
+       version = "1.5.0.0";
+       sha256 = "8f66263f288dba0e90cce6d6b9d2682b71acc46c2790128cba78b984c7990d6f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66217,8 +66581,8 @@ self: {
      }:
      mkDerivation {
        pname = "hbro-contrib";
-       version = "1.4.0.0";
-       sha256 = "425fbad68bd203ed4094d3c6b96d3e2d46818ec1ea6a950da8852978c3ebf86c";
+       version = "1.5.0.0";
+       sha256 = "0331c2024f52cfbefba781095e8309fd20cd32082a9a8887c3fcb4f52fc76fbc";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring classy-prelude containers
          directory glib gtk3 hbro lens monad-control mtl network-uri pango
@@ -66394,8 +66758,7 @@ self: {
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bluetooth = null;  cwiid = null;};
+     }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize" = callPackage
     ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog
@@ -66692,7 +67055,7 @@ self: {
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { markdown = null;};
+     }) {markdown = null;};
 
   "hdm" = callPackage
     ({ mkDerivation, base, directory, process, unix, vty }:
@@ -67099,8 +67462,8 @@ self: {
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { newrelic-collector-client = null;  newrelic-common = null;
-          newrelic-transaction = null;};
+     }) {newrelic-collector-client = null; newrelic-common = null; 
+         newrelic-transaction = null;};
 
   "helics-wai" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, helics
@@ -67343,7 +67706,6 @@ self: {
        homepage = "https://github.com/nh2/hemokit";
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hen" = callPackage
@@ -67367,7 +67729,7 @@ self: {
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xenctrl = null;};
+     }) {xenctrl = null;};
 
   "henet" = callPackage
     ({ mkDerivation, base, bitset, bytestring, network, typesafe-endian
@@ -67637,7 +67999,7 @@ self: {
        description = "Text Tetris";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
     ({ mkDerivation, base, containers, deepseq, parallel, random, text
@@ -67767,12 +68129,12 @@ self: {
      }:
      mkDerivation {
        pname = "hexpat-lens";
-       version = "0.1.3";
-       sha256 = "d96d6048d8f7f6773ad8322c8ba94b8852e8408ac64cd240d94af720fffd0309";
+       version = "0.1.4";
+       sha256 = "35783e1bb8654ac74866b7910f7f58385a78d0005d05c26bc7efd36ca9827978";
        libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
-       jailbreak = true;
+       homepage = "https://github.com/tel/hexpat-lens";
        description = "Lenses for Hexpat";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67920,7 +68282,7 @@ self: {
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { doublefann = null;  fann = null;};
+     }) {doublefann = null; fann = null;};
 
   "hfd" = callPackage
     ({ mkDerivation, base, bytestring, haskeline, iteratee, MissingH
@@ -68240,7 +68602,7 @@ self: {
        description = "Various animations generated using HGL";
        license = "GPL";
        broken = true;
-     }) { HTam = null;};
+     }) {HTam = null;};
 
   "hgom" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, mtl, parsec
@@ -68286,7 +68648,7 @@ self: {
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { harp = null;};
+     }) {harp = null;};
 
   "hi" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, directory
@@ -68366,7 +68728,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
-     }) { hidapi-libusb = null;};
+     }) {hidapi-libusb = null;};
 
   "hidapi" = callPackage
     ({ mkDerivation, base, bytestring, deepseq-generics, systemd }:
@@ -68379,7 +68741,7 @@ self: {
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) systemd;};
+     }) {inherit (pkgs) systemd;};
 
   "hieraclus" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, multiset }:
@@ -68668,7 +69030,7 @@ self: {
        description = "Haskell Graphical User Interface for Emerge";
        license = "GPL";
        broken = true;
-     }) { mozembed = null;};
+     }) {mozembed = null;};
 
   "himg" = callPackage
     ({ mkDerivation, base, bytestring, directory, gtk, HTTP
@@ -69307,8 +69669,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsmin";
-       version = "0.1.5.0";
-       sha256 = "f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7";
+       version = "0.1.5.1";
+       sha256 = "d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69438,7 +69800,7 @@ self: {
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gfortran;};
+     }) {inherit (pkgs) gfortran;};
 
   "hlcm" = callPackage
     ({ mkDerivation, array, base, bytestring, bytestring-csv
@@ -69533,6 +69895,7 @@ self: {
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
+       maintainers = with stdenv.lib.maintainers; [ gebner ];
      }) {};
 
   "hledger-interest" = callPackage
@@ -69549,6 +69912,7 @@ self: {
        homepage = "http://github.com/peti/hledger-interest";
        description = "computes interest for a given account";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "hledger-irr" = callPackage
@@ -69666,7 +70030,7 @@ self: {
        homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) libbladeRF;};
+     }) {inherit (pkgs) libbladeRF;};
 
   "hlibev" = callPackage
     ({ mkDerivation, base, ev, network }:
@@ -69680,7 +70044,7 @@ self: {
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ev = null;};
+     }) {ev = null;};
 
   "hlibfam" = callPackage
     ({ mkDerivation, base, fam }:
@@ -69693,7 +70057,7 @@ self: {
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) fam;};
+     }) {inherit (pkgs) fam;};
 
   "hlibgit2" = callPackage
     ({ mkDerivation, base, bindings-DSL, openssl, process, zlib }:
@@ -69706,21 +70070,22 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Low-level bindings to libgit2";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
-    ({ mkDerivation, base, hspec, sass }:
+    ({ mkDerivation, base, hspec, libsass }:
      mkDerivation {
        pname = "hlibsass";
        version = "0.1.4.0";
        sha256 = "2673ff4a4189bdfda61e5b936e1e91c4de29ede91db40055511a835ccbd35818";
+       configureFlags = [ "-fexternallibsass" ];
        libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ sass ];
+       librarySystemDepends = [ libsass ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
-     }) { sass = null;};
+     }) {inherit (pkgs) libsass;};
 
   "hlint" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
@@ -69870,7 +70235,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) blas;  lapack = null;};
+     }) {inherit (pkgs) blas; lapack = null;};
 
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, lapack, transformers }:
@@ -69885,7 +70250,7 @@ self: {
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { lapack = null;};
+     }) {lapack = null;};
 
   "hmatrix-csv" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hmatrix, vector }:
@@ -69910,7 +70275,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
        license = "GPL";
-     }) { inherit (pkgs) glpk;};
+     }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
     ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
@@ -69926,7 +70291,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = "GPL";
-     }) { inherit (pkgs) gsl;};
+     }) {inherit (pkgs) gsl;};
 
   "hmatrix-gsl-stats" = callPackage
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex }:
@@ -69940,7 +70305,7 @@ self: {
        description = "GSL Statistics interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) gsl;};
+     }) {inherit (pkgs) gsl;};
 
   "hmatrix-mmap" = callPackage
     ({ mkDerivation, base, hmatrix, mmap }:
@@ -69979,7 +70344,7 @@ self: {
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { QuadProgpp = null;};
+     }) {QuadProgpp = null;};
 
   "hmatrix-repa" = callPackage
     ({ mkDerivation, base, hmatrix, repa, vector }:
@@ -70232,7 +70597,7 @@ self: {
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "hmpfr" = callPackage
     ({ mkDerivation, base, integer-gmp, mpfr }:
@@ -70246,7 +70611,7 @@ self: {
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) mpfr;};
+     }) {inherit (pkgs) mpfr;};
 
   "hmt" = callPackage
     ({ mkDerivation, array, base, bytestring, colour, containers
@@ -70334,7 +70699,7 @@ self: {
        homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) netcdf;};
+     }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix
@@ -70594,13 +70959,12 @@ self: {
        libraryHaskellDepends = [ base cgen ];
        librarySystemDepends = [ OgreMain ];
        libraryPkgconfigDepends = [ OGRE ];
-       libraryToolDepends = [ cgen cgen-hs grgen ];
+       libraryToolDepends = [ cgen-hs grgen ];
        homepage = "http://anttisalonen.github.com/hogre";
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OGRE = null;  OgreMain = null;  cgen-hs = null;
-          grgen = null;};
+     }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
   "hogre-examples" = callPackage
     ({ mkDerivation, base, hogre, OgreMain }:
@@ -70616,7 +70980,7 @@ self: {
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OgreMain = null;};
+     }) {OgreMain = null;};
 
   "hois" = callPackage
     ({ mkDerivation, base, OIS, X11 }:
@@ -70633,7 +70997,7 @@ self: {
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OIS = null;};
+     }) {OIS = null;};
 
   "hoist-error" = callPackage
     ({ mkDerivation, base, either, mtl }:
@@ -70692,8 +71056,8 @@ self: {
      }:
      mkDerivation {
        pname = "holy-project";
-       version = "0.2.0.0";
-       sha256 = "4f8feb2326214304a0326843383b3cf8e35862fb372f279c148f103ebbd09616";
+       version = "0.2.0.1";
+       sha256 = "b0f60f48377986212ee45a7ab360f4ef32578d4fa4b65cc21132f9c1e90a2814";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -70796,7 +71160,7 @@ self: {
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OpenNI2 = null;  freenect = null;};
+     }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
   "honk" = callPackage
     ({ mkDerivation, base }:
@@ -70955,7 +71319,7 @@ self: {
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs.xlibs) libXi;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXi;};
 
   "hoodle-extra" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
@@ -71119,7 +71483,6 @@ self: {
        homepage = "http://github.com/bgamari/hoogle-index";
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hooks-dir" = callPackage
@@ -71195,7 +71558,7 @@ self: {
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { opencc = null;};
+     }) {opencc = null;};
 
   "hopencl" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, HUnit, OpenCL, QuickCheck
@@ -71216,30 +71579,30 @@ self: {
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OpenCL = null;};
+     }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
      , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset-typed
-     , lens, monad-loops, old-locale, openpgp-asciiarmor
-     , optparse-applicative, resourcet, text, time, transformers
+     , lens, monad-loops, openpgp-asciiarmor, optparse-applicative
+     , resourcet, text, time, time-locale-compat, transformers
      , unordered-containers, wl-pprint-extras, yaml
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.16.2";
-       sha256 = "6f491a68846e60635e0e2dbc9c95cf245d88619a19c0abf83dd51b58e48f6588";
+       version = "0.16.3";
+       sha256 = "8ecdffae493b7ceaf3520f28883d9e12c6cdaaf444e3230c1c8c876d4cc9d25f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
          binary-conduit bytestring conduit conduit-extra containers
          crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
-         ixset-typed lens monad-loops old-locale openpgp-asciiarmor
-         optparse-applicative resourcet text time transformers
-         unordered-containers wl-pprint-extras yaml
+         ixset-typed lens monad-loops openpgp-asciiarmor
+         optparse-applicative resourcet text time time-locale-compat
+         transformers unordered-containers wl-pprint-extras yaml
        ];
        executableToolDepends = [ alex happy ];
        homepage = "http://floss.scru.org/hopenpgp-tools";
@@ -71258,7 +71621,8 @@ self: {
        homepage = "http://github.com/peti/hopenssl";
        description = "FFI bindings to OpenSSL's EVP digest interface";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openssl;};
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {inherit (pkgs) openssl;};
 
   "hopfield" = callPackage
     ({ mkDerivation, array, base, deepseq, directory, erf
@@ -71291,7 +71655,7 @@ self: {
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { MagickCore = null;  inherit (pkgs) imagemagick;};
+     }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
     ({ mkDerivation, base, matrix, MonadRandom, QuickCheck, split
@@ -71422,7 +71786,7 @@ self: {
        description = "Haskell Open Sound Control Utilities";
        license = "GPL";
        broken = true;
-     }) { www-minus = null;};
+     }) {www-minus = null;};
 
   "hostname" = callPackage
     ({ mkDerivation, base }:
@@ -71567,7 +71931,7 @@ self: {
        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;};
+     }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "hp2any-manager" = callPackage
     ({ mkDerivation, array, base, bytestring, cairo, containers
@@ -71721,7 +72085,7 @@ self: {
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { papi = null;};
+     }) {papi = null;};
 
   "hpaste" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
@@ -71926,7 +72290,7 @@ self: {
        homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "hprotoc" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
@@ -71935,8 +72299,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.1.4";
-       sha256 = "124d310f0a541b2267483f05e60dc3edd65933abfc51fbe67320deaab5470405";
+       version = "2.1.5";
+       sha256 = "463ce252cbcf6246bb80cc30efa14580b5370e8e5c5c83debfe1b24833b52353";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72188,8 +72552,8 @@ self: {
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.1.5";
-       sha256 = "aacbd1a8b4b8a10b6f144d6bb714817d164fae2a23abd922a2c4cc39581e32f5";
+       version = "0.3.1.6";
+       sha256 = "f1ca9df8c55a7b97749d1252ccb236d93432d125a55a2b4b26f5812f86dc22a8";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
@@ -72201,7 +72565,7 @@ self: {
        jailbreak = true;
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ruby;};
+     }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, GeoIP }:
@@ -72215,7 +72579,7 @@ self: {
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { GeoIP = null;};
+     }) {GeoIP = null;};
 
   "hs-bibutils" = callPackage
     ({ mkDerivation, base, syb }:
@@ -72248,7 +72612,7 @@ self: {
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
-     }) { b2 = null;};
+     }) {b2 = null;};
 
   "hs-captcha" = callPackage
     ({ mkDerivation, base, bytestring, gd, random }:
@@ -72320,7 +72684,28 @@ self: {
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ole32 = null;  oleaut32 = null;};
+     }) {ole32 = null; oleaut32 = null;};
+
+  "hs-duktape" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
+     , hspec-expectations-pretty-diff, template-haskell, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hs-duktape";
+       version = "0.1.0";
+       sha256 = "4627845867a5b00022b22b0f90355a7f0e9b5b703883f74a6a226507972bf429";
+       libraryHaskellDepends = [
+         aeson base bytestring text transformers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base bytestring hspec hspec-expectations-pretty-diff
+         template-haskell text
+       ];
+       homepage = "https://github.com/myfreeweb/hs-duktape";
+       description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
+       license = stdenv.lib.licenses.mit;
+     }) {};
 
   "hs-excelx" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, text, time
@@ -72364,7 +72749,7 @@ self: {
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { fltk = null;  fltk_images = null;};
+     }) {fltk = null; fltk_images = null;};
 
   "hs-gchart" = callPackage
     ({ mkDerivation, base, mtl }:
@@ -72511,7 +72896,7 @@ self: {
        ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) mesos;  inherit (pkgs) protobuf;};
+     }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;};
 
   "hs-nombre-generator" = callPackage
     ({ mkDerivation, base, HandsomeSoup, hxt, random }:
@@ -72779,7 +73164,7 @@ self: {
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xenctrl = null;};
+     }) {xenctrl = null;};
 
   "hsass" = callPackage
     ({ mkDerivation, base, bytestring, data-default-class, filepath
@@ -73291,8 +73676,7 @@ self: {
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { camwire_1394 = null;  dc1394_control = null;
-          raw1394 = null;};
+     }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
   "hscassandra" = callPackage
     ({ mkDerivation, base, bytestring, cassandra-thrift, containers
@@ -73460,8 +73844,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.4.2";
-       sha256 = "da33782330de5980bf2bbad7b3c5e18751c5b8ee7358652c55a88a09aea857d0";
+       version = "0.1.4.3";
+       sha256 = "66c1bf834bfff8030533f056bb57d4fc4a61d1698ea10c217c9841d2b13aa9ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73523,7 +73907,8 @@ self: {
        homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) adns;};
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {inherit (pkgs) adns;};
 
   "hsdns-cache" = callPackage
     ({ mkDerivation, base, hsdns, network, SafeSemaphore, text, time
@@ -73581,6 +73966,7 @@ self: {
        homepage = "http://github.com/peti/hsemail";
        description = "Internet Message Parsers";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "hsemail-ns" = callPackage
@@ -73719,7 +74105,7 @@ self: {
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gcrypt = null;  inherit (pkgs) gnutls;};
+     }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgnutls-yj" = callPackage
     ({ mkDerivation, base, bytestring, gcrypt, gnutls, mtl, old-time }:
@@ -73733,7 +74119,7 @@ self: {
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gcrypt = null;  inherit (pkgs) gnutls;};
+     }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgsom" = callPackage
     ({ mkDerivation, base, containers, random, stm, time }:
@@ -73796,7 +74182,7 @@ self: {
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  inherit (pkgs) gsl;  lapack = null;};
+     }) {inherit (pkgs) blas; inherit (pkgs) gsl; lapack = null;};
 
   "hsilop" = callPackage
     ({ mkDerivation, base, haskeline }:
@@ -73893,7 +74279,7 @@ self: {
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { svm = null;};
+     }) {svm = null;};
 
   "hslinks" = callPackage
     ({ mkDerivation, base, Cabal, hint, MemoTrie, process, regex-compat
@@ -73999,7 +74385,7 @@ self: {
        ];
        description = "A Lua language interpreter embedding in Haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) lua;};
+     }) {inherit (pkgs) lua;};
 
   "hsmagick" = callPackage
     ({ mkDerivation, base, bytestring, bzip2, directory, filepath
@@ -74023,11 +74409,11 @@ self: {
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { GraphicsMagick = null;  inherit (pkgs) bzip2;
-          freetype2 = null;  inherit (pkgs) jasper;  inherit (pkgs) lcms;
-          inherit (pkgs) libjpeg;  inherit (pkgs) libpng;
-          inherit (pkgs) libxml2;  tiff = null;  wmflite = null;
-          inherit (pkgs) zlib;};
+     }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
+         inherit (pkgs) jasper; inherit (pkgs) lcms; 
+         inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
+         inherit (pkgs) libxml2; tiff = null; wmflite = null; 
+         inherit (pkgs) zlib;};
 
   "hsmisc" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec
@@ -74071,7 +74457,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) libsndfile;};
+     }) {inherit (pkgs) libsndfile;};
 
   "hsndfile-storablevector" = callPackage
     ({ mkDerivation, base, hsndfile, storablevector }:
@@ -74294,8 +74680,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.1.10";
-       sha256 = "f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154";
+       version = "2.2.0";
+       sha256 = "0e733942f2b0c87b62ea43627ca3c90c7e638adb390efff48e5f2f6a7fd7117f";
        libraryHaskellDepends = [
          base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
          transformers
@@ -74360,8 +74746,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.1.10";
-       sha256 = "682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0";
+       version = "2.2.0";
+       sha256 = "44e9c15cca1639ccc24fcd925cd53f92f96322f691ed6903724a8a626629edf1";
        libraryHaskellDepends = [
          ansi-terminal async base deepseq hspec-expectations HUnit
          QuickCheck quickcheck-io random setenv tf-random time transformers
@@ -74380,8 +74766,8 @@ self: {
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.1.10";
-       sha256 = "efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b";
+       version = "2.2.0";
+       sha256 = "fd5f7535f31b202cfe0bc4e00a97488f32e66850b867993bc4903849d7e76a70";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
@@ -74395,8 +74781,8 @@ self: {
     ({ mkDerivation, base, HUnit }:
      mkDerivation {
        pname = "hspec-expectations";
-       version = "0.7.1";
-       sha256 = "afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258";
+       version = "0.7.2";
+       sha256 = "371a176b22ebdbc94b7bba55e0bda2296b44c11af01d20b23e4350ef7094a6f0";
        libraryHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/sol/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
@@ -74451,6 +74837,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-expectations-pretty-diff" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, Diff, haskell-src-exts
+     , hindent, hscolour, hspec, HUnit, text
+     }:
+     mkDerivation {
+       pname = "hspec-expectations-pretty-diff";
+       version = "0.7.2.2";
+       sha256 = "00c1ac7ceb6bed18c8c2ab7ac35342b024731e3fadf2c6304e549dc42d39ff38";
+       libraryHaskellDepends = [
+         ansi-terminal base Diff haskell-src-exts hindent hscolour HUnit
+         text
+       ];
+       testHaskellDepends = [ aeson base hspec HUnit text ];
+       homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme";
+       description = "Catchy combinators for HUnit";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hspec-experimental" = callPackage
     ({ mkDerivation, base, hspec, hspec-meta, HUnit, QuickCheck }:
      mkDerivation {
@@ -74496,8 +74900,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-meta";
-       version = "2.1.7";
-       sha256 = "ffe41373ac24ff3e3c8d9ae5dfaf33c126c48ab16bc08c43ab91a58292f3097a";
+       version = "2.2.0";
+       sha256 = "bfa8fb7708368d063eab0c005addbb0b2f3227d76af55e61676584fbf3abb8ba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74556,13 +74960,15 @@ self: {
      }) {};
 
   "hspec-smallcheck" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, smallcheck }:
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }:
      mkDerivation {
        pname = "hspec-smallcheck";
-       version = "0.3.0";
-       sha256 = "bcb7e3e8f978177decafa7547da18717adf57228085ae49830db01b956f6cbfb";
-       libraryHaskellDepends = [ base hspec smallcheck ];
-       testHaskellDepends = [ base hspec QuickCheck smallcheck ];
+       version = "0.4.1";
+       sha256 = "c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5";
+       libraryHaskellDepends = [ base hspec-core smallcheck ];
+       testHaskellDepends = [
+         base hspec hspec-core QuickCheck smallcheck
+       ];
        homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
@@ -74586,9 +74992,21 @@ self: {
          HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hspec-structured-formatter" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "hspec-structured-formatter";
+       version = "0.1.0.1";
+       sha256 = "f670ea9a7b936ba3f22b19e00f2d19b58b58936e916b21e137a6ff3d4b868195";
+       libraryHaskellDepends = [ base hspec ];
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hspec-test-framework" = callPackage
@@ -74683,8 +75101,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-webdriver";
-       version = "1.0.2";
-       sha256 = "2c3508c9c185c08fcd27f7e2fde69e212eecf4488a0411fc72ab679544d86df2";
+       version = "1.0.3";
+       sha256 = "24b736db0703acff84dfa7ed8cbccaf8b8d1884e4f609249b7461cd1b0959ff7";
        libraryHaskellDepends = [
          base data-default hashable hspec hspec-core HUnit lifted-base stm
          text transformers unordered-containers webdriver
@@ -74801,7 +75219,7 @@ self: {
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mysqlclient = null;};
+     }) {mysqlclient = null;};
 
   "hsql-odbc" = callPackage
     ({ mkDerivation, base, hsql, old-time, unixODBC }:
@@ -74813,7 +75231,7 @@ self: {
        librarySystemDepends = [ unixODBC ];
        description = "A Haskell Interface to ODBC";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) unixODBC;};
+     }) {inherit (pkgs) unixODBC;};
 
   "hsql-postgresql" = callPackage
     ({ mkDerivation, base, hsql, old-time, postgresql }:
@@ -74825,7 +75243,7 @@ self: {
        librarySystemDepends = [ postgresql ];
        description = "A Haskell Interface to PostgreSQL via the PQ library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "hsql-sqlite3" = callPackage
     ({ mkDerivation, base, hsql, sqlite }:
@@ -74837,7 +75255,7 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "SQLite3 driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "hsqml" = callPackage
     ({ mkDerivation, base, c2hs, containers, directory, filepath, qt5
@@ -74859,7 +75277,7 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
-     }) { qt5 = null;};
+     }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
     ({ mkDerivation, base, hsqml, qt5, template-haskell, text }:
@@ -74873,7 +75291,7 @@ self: {
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { qt5 = null;};
+     }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
     ({ mkDerivation, base, exceptions, hsqml-datamodel, type-list
@@ -75266,8 +75684,8 @@ self: {
        description = "embedding prolog in haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;  inherit (pkgs) readline;
-          swipl = null;};
+     }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
+         swipl = null;};
 
   "hsx" = callPackage
     ({ mkDerivation, base, haskell-src-exts, mtl, utf8-string }:
@@ -75299,7 +75717,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -75358,6 +75775,7 @@ self: {
        homepage = "http://github.com/peti/hsyslog";
        description = "FFI interface to syslog(3) from POSIX.1-2001";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "hszephyr" = callPackage
@@ -75371,7 +75789,7 @@ self: {
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { com_err = null;  zephyr = null;};
+     }) {com_err = null; zephyr = null;};
 
   "htags" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell-src, mtl }:
@@ -75775,8 +76193,8 @@ self: {
      }:
      mkDerivation {
        pname = "http-client";
-       version = "0.4.20";
-       sha256 = "8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24";
+       version = "0.4.21";
+       sha256 = "f6465cfec946c7acfeb210daa97e65e67c3924867072ed47193a83cf1226dc30";
        libraryHaskellDepends = [
          array base base64-bytestring blaze-builder bytestring
          case-insensitive containers cookie data-default-class deepseq
@@ -76102,15 +76520,17 @@ self: {
      }) {};
 
   "http-link-header" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring-conversion, errors
-     , hspec, hspec-attoparsec, network-uri, QuickCheck, text
+    ({ mkDerivation, attoparsec, base, bytestring
+     , bytestring-conversion, errors, hspec, hspec-attoparsec
+     , network-uri, QuickCheck, text
      }:
      mkDerivation {
        pname = "http-link-header";
-       version = "0.2.0";
-       sha256 = "0c46155da7d411ba590b9d9d0eb735962bb9454b16bee61c455adf7b3858b56d";
+       version = "1.0.1";
+       sha256 = "908bb3356d3fe24615f5498c6dca1075f76f01e034838538a3c4b0ccc342e9b7";
        libraryHaskellDepends = [
-         attoparsec base bytestring-conversion errors network-uri text
+         attoparsec base bytestring bytestring-conversion errors network-uri
+         text
        ];
        testHaskellDepends = [
          base hspec hspec-attoparsec QuickCheck text
@@ -76551,7 +76971,7 @@ self: {
        description = "Support library for Hubris, the Ruby <=> Haskell bridge";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ruby;};
+     }) {inherit (pkgs) ruby;};
 
   "huffman" = callPackage
     ({ mkDerivation, base, containers, fingertree }:
@@ -76647,6 +77067,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hunch" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , optparse-applicative, parsec, QuickCheck, split
+     }:
+     mkDerivation {
+       pname = "hunch";
+       version = "0.1.1";
+       sha256 = "2b959733b68066abcb8bddfb982c859b772070c2a16f27d183f1c61028817bae";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers directory filepath optparse-applicative parsec
+         split
+       ];
+       testHaskellDepends = [
+         base containers directory filepath optparse-applicative parsec
+         QuickCheck split
+       ];
+       homepage = "https://github.com/loganbraga/hunch";
+       description = "CSS-like syntax for file system manipulation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -76790,7 +77233,7 @@ self: {
        description = "A Command line Interface for the Hunt server";
        license = stdenv.lib.licenses.mit;
        broken = true;
-     }) { hunt-client = null;};
+     }) {hunt-client = null;};
 
   "hurdle" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, kangaroo }:
@@ -76925,8 +77368,8 @@ self: {
     ({ mkDerivation, base, HTF }:
      mkDerivation {
        pname = "hvect";
-       version = "0.2.0.0";
-       sha256 = "310fa7a975673fa99eaace924c0ec3b600d6d21d4f94625c855e97caadcc2a06";
+       version = "0.3.0.0";
+       sha256 = "b2931f7c3bca66b7b6fbfa46bacaf0fc6f8a6c75dc29c0567c3f682764407ebc";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTF ];
        homepage = "https://github.com/agrafix/hvect";
@@ -77460,7 +77903,7 @@ self: {
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { sixense_x64 = null;};
+     }) {sixense_x64 = null;};
 
   "hydra-print" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
@@ -77905,7 +78348,7 @@ self: {
        homepage = "http://github.com/dgvncsz0f/hzk";
        description = "Haskell client library for Apache Zookeeper";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zookeeper_mt;};
+     }) {inherit (pkgs) zookeeper_mt;};
 
   "hzulip" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
@@ -78141,7 +78584,6 @@ self: {
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas" = callPackage
@@ -78430,7 +78872,27 @@ self: {
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ige-mac-integration = null;};
+     }) {ige-mac-integration = null;};
+
+  "ignore" = callPackage
+    ({ mkDerivation, base, directory, Glob, HTF, mtl, path, pcre-heavy
+     , text
+     }:
+     mkDerivation {
+       pname = "ignore";
+       version = "0.1.1.0";
+       sha256 = "aaf481fdab8bdc5a506e4726eadf56697726f82086a3cd0439526b9442c73575";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory Glob mtl path pcre-heavy text
+       ];
+       executableHaskellDepends = [ base directory path ];
+       testHaskellDepends = [ base HTF text ];
+       homepage = "http://github.com/agrafix/ignore";
+       description = "Handle ignore files of different VCSes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
 
   "igraph" = callPackage
     ({ mkDerivation, base, c2hs, containers, hashable, igraph
@@ -78449,7 +78911,7 @@ self: {
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { igraph = null;};
+     }) {igraph = null;};
 
   "igrf" = callPackage
     ({ mkDerivation, ad, base, polynomial }:
@@ -78477,8 +78939,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell";
-       version = "0.6.4.1";
-       sha256 = "524cf3836857ba1762f895379b533352cf25a532ad8825f93f9842d9f235adbe";
+       version = "0.7.0.3";
+       sha256 = "f2df05336dae36d05ffb25f993fab51ccb727f83adb290b83ab251384e8b2e80";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78491,7 +78953,7 @@ self: {
        ];
        executableHaskellDepends = [
          aeson base bin-package-db bytestring containers directory ghc here
-         ipython-kernel strict text transformers unix
+         ipython-kernel process strict text transformers unix
        ];
        testHaskellDepends = [
          aeson base base64-bytestring bin-package-db bytestring cereal
@@ -78501,11 +78963,9 @@ self: {
          setenv shelly split stm strict system-argv0 text transformers unix
          unordered-containers utf8-string uuid vector
        ];
-       jailbreak = true;
-       homepage = "http://gibiansky.github.io/IHaskell/";
+       homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -78522,7 +78982,6 @@ self: {
        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
@@ -78535,7 +78994,6 @@ 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-blaze" = callPackage
@@ -78548,7 +79006,6 @@ self: {
        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
@@ -78566,7 +79023,6 @@ self: {
        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
@@ -78597,7 +79053,6 @@ 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
@@ -78610,7 +79065,6 @@ self: {
        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
@@ -78626,7 +79080,6 @@ self: {
        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
@@ -78644,7 +79097,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-parsec" = callPackage
@@ -78662,7 +79114,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-plot" = callPackage
@@ -78675,7 +79126,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-rlangqq" = callPackage
@@ -78693,7 +79143,6 @@ self: {
        ];
        description = "a rDisp quasiquote to show plots from Rlang-QQ in IHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-widgets" = callPackage
@@ -78803,15 +79252,17 @@ self: {
          text transformers vector
        ];
        libraryPkgconfigDepends = [ imagemagick ];
+       executablePkgconfigDepends = [ imagemagick ];
        testHaskellDepends = [
          base bytestring directory HUnit lifted-base QuickCheck resourcet
          system-filepath test-framework test-framework-hunit
          test-framework-quickcheck2 text transformers vector
        ];
+       testPkgconfigDepends = [ imagemagick ];
        jailbreak = true;
        description = "bindings to imagemagick library";
        license = "unknown";
-     }) { inherit (pkgs) imagemagick;};
+     }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
     ({ mkDerivation, base, containers, HTTP, json, mtl, network
@@ -79304,6 +79755,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "indieweb-algorithms" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, containers
+     , data-default, either, hspec, hspec-expectations-pretty-diff
+     , http-link-header, lens, lens-aeson, microformats2-parser, mtl
+     , network-uri, raw-strings-qq, safe, template-haskell, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "indieweb-algorithms";
+       version = "0.1.0";
+       sha256 = "3417c4dc270ca59b7731319e7e4009a0f5f464d038814a2db2ceac079dcc80b2";
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default either
+         http-link-header lens lens-aeson microformats2-parser network-uri
+         safe text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base bytestring data-default hspec
+         hspec-expectations-pretty-diff microformats2-parser mtl network-uri
+         raw-strings-qq template-haskell text time
+       ];
+       homepage = "https://github.com/myfreeweb/indieweb-algorithms";
+       description = "A collection of implementations of IndieWeb algorithms";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "infer-upstream" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, github, optparse-applicative
      , parsec, process, text
@@ -79570,7 +80048,7 @@ self: {
        ];
        description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) gsl;  gslcblas = null;};
+     }) {inherit (pkgs) gsl; gslcblas = null;};
 
   "inline-c-cpp" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
@@ -79613,7 +80091,7 @@ self: {
        description = "Console client for encyclopedias";
        license = stdenv.lib.licenses.gpl3;
        broken = true;
-     }) { aether = null;};
+     }) {aether = null;};
 
   "inserts" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, dlist }:
@@ -79828,7 +80306,7 @@ self: {
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { intel_aes = null;};
+     }) {intel_aes = null;};
 
   "interchangeable" = callPackage
     ({ mkDerivation, base, containers }:
@@ -80410,7 +80888,7 @@ self: {
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ipopt;  nlopt = null;};
+     }) {inherit (pkgs) ipopt; nlopt = null;};
 
   "ipprint" = callPackage
     ({ mkDerivation, base, Extra, haskell-src }:
@@ -80429,10 +80907,8 @@ self: {
      }:
      mkDerivation {
        pname = "iproute";
-       version = "1.5.0";
-       sha256 = "e33b233c681be367162c342ebf3843ec2d858db49716ef52d96546bd3f6f2557";
-       revision = "1";
-       editedCabalFile = "f601b3319004e7b4a4636c89996ea78fd084e9b10d15d679d7ae58e822fe19b8";
+       version = "1.6.0";
+       sha256 = "792c638d4957ac85d04a17864991eaa4ae09e4fb7e890ff95a7807a2875705d0";
        libraryHaskellDepends = [
          appar base byteorder containers network
        ];
@@ -80499,8 +80975,8 @@ self: {
      }:
      mkDerivation {
        pname = "ipython-kernel";
-       version = "0.6.1.2";
-       sha256 = "1431c7442b9081dd9169348b36f0befafeedca8a773b8d5349518b39fde1e4e2";
+       version = "0.7.0.0";
+       sha256 = "17acfb6ac18e23a85b3fe3324af946439bf0bd886eaf5613d94c027a903174d7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -80510,7 +80986,6 @@ self: {
        executableHaskellDepends = [
          base filepath mtl parsec text transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
@@ -80596,27 +81071,25 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base64-bytestring
      , bytestring, config-value, connection, containers
      , data-default-class, deepseq, directory, filepath, free
-     , haskell-lexer, lens, network, old-locale, split, stm, text, time
-     , tls, transformers, vty, x509, x509-store, x509-system
+     , haskell-lexer, lens, network, old-locale, regex-tdfa, split, stm
+     , text, time, tls, transformers, vty, x509, x509-store, x509-system
      , x509-validation
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "1.1.0.1";
-       sha256 = "a788848f0d60068ed173c394bf28ad637a85df4f3007daebe502126c1907c106";
-       revision = "5";
-       editedCabalFile = "8971a294711aaae3c327c2fe4f1f53eaed33a57b986585c934df43fa69e8f914";
+       version = "1.1.1";
+       sha256 = "9f8e78db1aacf1e74df042e951335277be5bf25e01d1206d119470b451dcd2eb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array attoparsec base base64-bytestring bytestring containers free
-         lens text time transformers
+         lens regex-tdfa text time transformers
        ];
        executableHaskellDepends = [
          array base bytestring config-value connection containers
          data-default-class deepseq directory filepath haskell-lexer lens
-         network old-locale split stm text time tls transformers vty x509
-         x509-store x509-system x509-validation
+         network old-locale regex-tdfa split stm text time tls transformers
+         vty x509 x509-store x509-system x509-validation
        ];
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
@@ -80979,7 +81452,7 @@ self: {
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "iterable" = callPackage
     ({ mkDerivation, base, mtl, tagged, template-haskell, vector }:
@@ -81032,7 +81505,7 @@ self: {
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) bzip2;  inherit (pkgs) zlib;};
+     }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
   "iteratee-mtl" = callPackage
     ({ mkDerivation, base, bytestring, containers, ListLike
@@ -81433,7 +81906,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
-     }) { inherit (pkgs) libjack2;};
+     }) {inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
     ({ mkDerivation, base, c2hs, libjack2, mtl }:
@@ -81447,7 +81920,7 @@ self: {
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libjack2;};
+     }) {inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
     ({ mkDerivation, base, hosc }:
@@ -81507,6 +81980,7 @@ self: {
        homepage = "http://github.com/peti/jailbreak-cabal";
        description = "Strip version restrictions from build dependencies in Cabal files";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "jalaali" = callPackage
@@ -81545,7 +82019,7 @@ self: {
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) blas;  cblas = null;  lapacke = null;};
+     }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
   "jammittools" = callPackage
     ({ mkDerivation, base, boxes, bytestring, conduit, conduit-audio
@@ -81556,6 +82030,8 @@ self: {
        pname = "jammittools";
        version = "0.5.0.1";
        sha256 = "fd01f32dc319f7088791ce696d0421215a624bc7a2923bb8a39e4d102148cae1";
+       revision = "1";
+       editedCabalFile = "723bbb15b1cdc91151255c89977d67e330f4795c35dc330c5cc324d7784d53b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -81568,7 +82044,6 @@ self: {
        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
@@ -82273,6 +82748,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "json-litobj" = callPackage
+    ({ mkDerivation, base, hspec, json, QuickCheck }:
+     mkDerivation {
+       pname = "json-litobj";
+       version = "0.1.0.0";
+       sha256 = "4ac4bd3cc6a559d48445577763497f24b0fdd748bab81d241c1392abd8a41ce6";
+       libraryHaskellDepends = [ base json ];
+       testHaskellDepends = [ base hspec json QuickCheck ];
+       jailbreak = true;
+       homepage = "https://github.com/jonathankochems/json-litobj";
+       description = "Extends Text.JSON to handle literal JS objects.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "json-python" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, pureMD5
      , python, template-haskell
@@ -82289,7 +82778,7 @@ self: {
        homepage = "http://stewart.guru";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) python;};
+     }) {inherit (pkgs) python;};
 
   "json-qq" = callPackage
     ({ mkDerivation, base, haskell-src-meta, parsec, template-haskell
@@ -82619,8 +83108,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsonsql";
-       version = "0.1.0.1";
-       sha256 = "3906445e73a38fadc36dcbaf927597797f0ecd3c6310acf63c48fdab79eb24d7";
+       version = "0.1.2.1";
+       sha256 = "93234e108034457f59e078cd2d6205a7ed4218262f0c7a39a91600e915b7966b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82687,7 +83176,7 @@ self: {
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { Judy = null;};
+     }) {Judy = null;};
 
   "jukebox" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
@@ -82932,17 +83421,12 @@ self: {
      }) {};
 
   "kansas-lava-shake" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, hastache
-     , kansas-lava, shake, temporary, text
-     }:
+    ({ mkDerivation, base, hastache, kansas-lava, shake, text }:
      mkDerivation {
        pname = "kansas-lava-shake";
-       version = "0.1.2";
-       sha256 = "a799b6707aa7cf898d1bfb5d9273390b15a04b7d81fcd76a2bf834224ecdb303";
-       libraryHaskellDepends = [
-         base containers directory filepath hastache kansas-lava shake
-         temporary text
-       ];
+       version = "0.2.0";
+       sha256 = "34837e499a3007fb9eeb84e7c0bfd7c3c3d53e9cb84a8a8851e98b1c84f4f6a4";
+       libraryHaskellDepends = [ base hastache kansas-lava shake text ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83442,8 +83926,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "keycode";
-       version = "0.1";
-       sha256 = "fb2efe1e2b85a638f784c6739533aaf5f52a6ad61f6ab6468d4fe1feab4992b3";
+       version = "0.1.1";
+       sha256 = "7db8ed3fb0ccfbf9cb98124a3585e883a65a93c320e2573df6bd28089276435e";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/RyanGlScott/keycode";
        description = "Maps web browser keycodes to their corresponding keyboard keys";
@@ -83800,7 +84284,7 @@ self: {
        description = "Utilities for working with many HStringTemplate templates from files";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { string-templates = null;};
+     }) {string-templates = null;};
 
   "koofr-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, filepath, http-client
@@ -83912,7 +84396,7 @@ self: {
        homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
-     }) { egl = null;  inherit (pkgs) glew;};
+     }) {egl = null; inherit (pkgs) glew;};
 
   "kure" = callPackage
     ({ mkDerivation, base, dlist, transformers }:
@@ -83950,7 +84434,7 @@ self: {
        librarySystemDepends = [ kyotocabinet ];
        description = "Mid level bindings to Kyoto Cabinet";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) kyotocabinet;};
+     }) {inherit (pkgs) kyotocabinet;};
 
   "l-bfgs-b" = callPackage
     ({ mkDerivation, base, lbfgsb, vector }:
@@ -83964,7 +84448,7 @@ self: {
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { lbfgsb = null;};
+     }) {lbfgsb = null;};
 
   "labeled-graph" = callPackage
     ({ mkDerivation, base, labeled-tree }:
@@ -84306,6 +84790,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
@@ -84328,9 +84813,11 @@ self: {
          template-haskell time transformers transformers-base unix
          utf8-string zlib
        ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -84357,6 +84844,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -84375,6 +84863,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -84398,6 +84887,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -84416,6 +84906,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -84434,6 +84925,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -84450,6 +84942,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -85187,6 +85680,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-nix" = callPackage
+    ({ mkDerivation, base, containers, doctest, hspec, HUnit, mtl
+     , parsec, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "language-nix";
+       version = "1.0";
+       sha256 = "6088471a2b9b270404b7e5f8dcd47f6cdf2fe0be459c7bc36c2b1caef95af6b5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl parsec QuickCheck transformers
+       ];
+       executableHaskellDepends = [
+         base containers mtl parsec QuickCheck transformers
+       ];
+       testHaskellDepends = [
+         base containers doctest hspec HUnit mtl parsec QuickCheck
+         transformers
+       ];
+       homepage = "https://github.com/peti/language-nix";
+       description = "Haskell AST and Parsers for the Nix language";
+       license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {};
+
   "language-objc" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , directory, filepath, happy, newtype, pretty, process, syb
@@ -85299,6 +85818,7 @@ self: {
          array base containers monads-tf pretty transformers utf8-string
        ];
        libraryToolDepends = [ alex happy ];
+       jailbreak = true;
        homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
@@ -85446,8 +85966,8 @@ self: {
     ({ mkDerivation, base, pretty }:
      mkDerivation {
        pname = "language-vhdl";
-       version = "0.1.0.0";
-       sha256 = "ca55cb762f8b6225df178280dd5a0a3bf9fde2ac0ab942cdabd6239e8dedba33";
+       version = "0.1.0.2";
+       sha256 = "8fe8729b350bc5577ef1c4a9228769ff8a3c4341c5b4b548f963933b034ad59e";
        libraryHaskellDepends = [ base pretty ];
        homepage = "https://github.com/markus-git/language-vhdl";
        description = "VHDL AST and pretty printer in Haskell";
@@ -85973,8 +86493,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.1.3";
-       sha256 = "de00aa714ba2e60b7450e0fb7a382bdb88cc8ed9589ef10833e93782630488cf";
+       version = "0.15.1.4";
+       sha256 = "85f60091febd593f996c90cb9fa0e2f2dd1bff1f18a443244be1111540ea30ad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85999,7 +86519,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leksah-server" = callPackage
@@ -86012,8 +86531,8 @@ self: {
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.7";
-       sha256 = "8d98649f6227f0fc3ad9aa169c74f435ec825a1333c57445860b9f8ff1ffc79d";
+       version = "0.15.0.9";
+       sha256 = "78f2ee49b1a06fa12de242a35a9eeaaf3e8b90d7af8bffef3e1b20561826abe5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86317,8 +86836,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.3.1";
-       sha256 = "e2896c1256fda0fc85401c632ae4ca9e822f4846dc38bebd6aaee898e4e4f2a7";
+       version = "0.1.4.1";
+       sha256 = "b192640f9f02da76f36b03efa7e19fe6ed025b0b987e9ede0b1c3b44f9140bbd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -86372,7 +86891,7 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) leveldb;};
+     }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
     ({ mkDerivation, async, base, bytestring, data-default, filepath
@@ -86400,7 +86919,7 @@ self: {
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) leveldb;};
+     }) {inherit (pkgs) leveldb;};
 
   "levmar" = callPackage
     ({ mkDerivation, base, bindings-levmar, hmatrix, vector }:
@@ -86652,7 +87171,7 @@ self: {
        librarySystemDepends = [ archive ];
        description = "Read many archive formats with libarchive and conduit";
        license = stdenv.lib.licenses.bsd3;
-     }) { archive = null;};
+     }) {archive = null;};
 
   "libconfig" = callPackage
     ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, config
@@ -86673,7 +87192,7 @@ self: {
        homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
-     }) { config = null;};
+     }) {config = null;};
 
   "libcspm" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
@@ -86709,7 +87228,7 @@ self: {
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) expect;  inherit (pkgs) tcl;};
+     }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
   "libffi" = callPackage
     ({ mkDerivation, base, bytestring, ffi, libffi }:
@@ -86722,7 +87241,7 @@ self: {
        libraryPkgconfigDepends = [ libffi ];
        description = "A binding to libffi";
        license = stdenv.lib.licenses.bsd3;
-     }) { ffi = null;  inherit (pkgs) libffi;};
+     }) {ffi = null; inherit (pkgs) libffi;};
 
   "libgit" = callPackage
     ({ mkDerivation, base, mtl, process }:
@@ -86787,8 +87306,8 @@ self: {
      }:
      mkDerivation {
        pname = "libjenkins";
-       version = "0.8.1";
-       sha256 = "bfa08eb1f4b2e7c750fffcc0fbd0356b32c086a45af045364b7a2ca3ffe70402";
+       version = "0.8.2";
+       sha256 = "206f7e82ee6496f408347dc0828aea8018b0e7269cae02fcfa7504c750f79ec9";
        libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
@@ -86870,8 +87389,8 @@ self: {
      }:
      mkDerivation {
        pname = "libmpd";
-       version = "0.9.0.2";
-       sha256 = "5fb64d0196204a29bfb655118891c19310969e452599fda2667f7ff7d265d4e0";
+       version = "0.9.0.3";
+       sha256 = "3f0c520f19520dae35bf0d6aebf2fffef067964ace91047193b330a6dfaaa3d6";
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class filepath
          mtl network old-locale text time utf8-string
@@ -86895,7 +87414,7 @@ self: {
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libnotify;};
+     }) {inherit (pkgs) libnotify;};
 
   "libnvvm" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, HUnit, nvvm
@@ -86914,7 +87433,7 @@ self: {
        homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm";
        description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA";
        license = stdenv.lib.licenses.mit;
-     }) { nvvm = null;};
+     }) {nvvm = null;};
 
   "liboleg" = callPackage
     ({ mkDerivation, base, CC-delcont, containers, mtl
@@ -86946,7 +87465,7 @@ self: {
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { pafe = null;};
+     }) {pafe = null;};
 
   "libpq" = callPackage
     ({ mkDerivation, base, bytestring, postgresql, unix }:
@@ -86960,7 +87479,7 @@ self: {
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "librandomorg" = callPackage
     ({ mkDerivation, base, bytestring, curl }:
@@ -87028,7 +87547,7 @@ self: {
        homepage = "https://github.com/portnov/libssh2-hs";
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libssh2;  ssh2 = null;};
+     }) {inherit (pkgs) libssh2; ssh2 = null;};
 
   "libssh2-conduit" = callPackage
     ({ mkDerivation, base, conduit, libssh2, monad-control, stm
@@ -87065,8 +87584,9 @@ self: {
      }) {};
 
   "libsystemd-daemon" = callPackage
-    ({ mkDerivation, base, bytestring, HUnit, network, systemd-daemon
-     , test-framework, test-framework-hunit, utf8-string
+    ({ mkDerivation, base, bytestring, HUnit, libsystemd-daemon
+     , network, systemd-daemon, test-framework, test-framework-hunit
+     , utf8-string
      }:
      mkDerivation {
        pname = "libsystemd-daemon";
@@ -87074,13 +87594,14 @@ self: {
        sha256 = "c03dbef58f9d32fecce539cc3f118f43e9a92418736cb8b96960f87c14f3bfe6";
        libraryHaskellDepends = [ base bytestring network utf8-string ];
        librarySystemDepends = [ systemd-daemon ];
+       libraryPkgconfigDepends = [ libsystemd-daemon ];
        testHaskellDepends = [
          base HUnit network test-framework test-framework-hunit
        ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { systemd-daemon = null;};
+     }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
@@ -87100,7 +87621,7 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) systemd;};
+     }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
     ({ mkDerivation, base, bytestring, glib, taglib }:
@@ -87115,7 +87636,7 @@ self: {
        homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home";
        description = "Binding to TagLib C library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) taglib;};
+     }) {inherit (pkgs) taglib;};
 
   "libvirt-hs" = callPackage
     ({ mkDerivation, base, c2hs, syb, virt }:
@@ -87130,7 +87651,7 @@ self: {
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { virt = null;};
+     }) {virt = null;};
 
   "libvorbis" = callPackage
     ({ mkDerivation, base, bytestring, cpu }:
@@ -87155,7 +87676,7 @@ self: {
        description = "Binding to libxml2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libxml2;};
+     }) {inherit (pkgs) libxml2;};
 
   "libxml-enumerator" = callPackage
     ({ mkDerivation, base, bytestring, enumerator, libxml-sax, text
@@ -87186,7 +87707,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-libxml/";
        description = "Bindings for the libXML2 SAX interface";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libxml2;};
+     }) {inherit (pkgs) libxml2;};
 
   "libxslt" = callPackage
     ({ mkDerivation, base, bytestring, libxml, xslt }:
@@ -87200,7 +87721,7 @@ self: {
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xslt = null;};
+     }) {xslt = null;};
 
   "life" = callPackage
     ({ mkDerivation, array, base, GLUT, OpenGL, random }:
@@ -87522,6 +88043,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "linear-circuit" = callPackage
+    ({ mkDerivation, base, comfort-graph, containers, hmatrix
+     , non-empty, QuickCheck, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "linear-circuit";
+       version = "0.0";
+       sha256 = "8daca90d45a7a0a99910e863f2bedaf46b4b7caaa32cc0ef58e4c4376d72b93e";
+       libraryHaskellDepends = [
+         base comfort-graph containers hmatrix utility-ht
+       ];
+       testHaskellDepends = [
+         base comfort-graph containers non-empty QuickCheck transformers
+         utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/linear-circuit";
+       description = "Compute resistance of linear electrical circuits";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "linear-grammar" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -87560,6 +88101,7 @@ self: {
        libraryHaskellDepends = [
          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;
@@ -87594,8 +88136,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }:
      mkDerivation {
        pname = "linearscan";
-       version = "0.7.0";
-       sha256 = "37f2f77ad17b40fbf62dd823f40ef88ab8db516ced17de1d3d0493f4e4e44e8f";
+       version = "0.9.0";
+       sha256 = "1ca49da5de79fd4aa6849a2b27dae5d01b3a896968e5fce29ad0c6a670065fa2";
        libraryHaskellDepends = [
          base containers ghc-prim mtl transformers
        ];
@@ -87606,22 +88148,21 @@ self: {
      }) {};
 
   "linearscan-hoopl" = callPackage
-    ({ mkDerivation, base, containers, deepseq, free, fuzzcheck, hoopl
-     , hspec, hspec-expectations, lens-family-core, linearscan
-     , QuickCheck, transformers
+    ({ mkDerivation, base, containers, deepseq, free, hoopl, hspec
+     , hspec-expectations, lens-family-core, linearscan, QuickCheck
+     , transformers
      }:
      mkDerivation {
        pname = "linearscan-hoopl";
-       version = "0.7.0";
-       sha256 = "db7ac77ef994fd40c1a11c9ff662d4710b29aff4ec498aeb78c6525f247b7fff";
+       version = "0.9.2";
+       sha256 = "fc52aedb4f8b3def5b993846543801de43cb5ea1f4091a2244626fe820382d6b";
        libraryHaskellDepends = [
          base containers free hoopl linearscan QuickCheck transformers
        ];
        testHaskellDepends = [
-         base containers deepseq fuzzcheck hoopl hspec hspec-expectations
+         base containers deepseq hoopl hspec hspec-expectations
          lens-family-core linearscan QuickCheck transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
@@ -87740,7 +88281,7 @@ self: {
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { blkid = null;};
+     }) {blkid = null;};
 
   "linux-cgroup" = callPackage
     ({ mkDerivation, base, filepath }:
@@ -87803,7 +88344,7 @@ self: {
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libkmod = null;};
+     }) {libkmod = null;};
 
   "linux-mount" = callPackage
     ({ mkDerivation, base, bytestring }:
@@ -88178,6 +88719,7 @@ self: {
        testHaskellDepends = [
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
@@ -88202,6 +88744,7 @@ self: {
          base-prelude conversion conversion-text either hspec html-tokenizer
          list-t-attoparsec list-t-text text xml-types
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
@@ -88256,6 +88799,7 @@ self: {
          base base-prelude bytestring hspec list-t QuickCheck
          quickcheck-instances text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-text";
        description = "A streaming text codec";
        license = stdenv.lib.licenses.mit;
@@ -88386,7 +88930,7 @@ self: {
        jailbreak = true;
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) picosat;};
+     }) {inherit (pkgs) picosat;};
 
   "llrbtree" = callPackage
     ({ mkDerivation, base }:
@@ -88562,7 +89106,7 @@ self: {
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (self.llvmPackages) llvm;};
+     }) {inherit (self.llvmPackages) llvm;};
 
   "llvm-general" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, HUnit
@@ -88588,7 +89132,7 @@ self: {
        ];
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) { llvm-config = null;};
+     }) {llvm-config = null;};
 
   "llvm-general-pure" = callPackage
     ({ mkDerivation, base, containers, HUnit, mtl, parsec, QuickCheck
@@ -88676,8 +89220,8 @@ self: {
     ({ mkDerivation, base, containers, monadLib, pretty }:
      mkDerivation {
        pname = "llvm-pretty";
-       version = "0.4.0.0";
-       sha256 = "6d757a9929a0b43f3e22d0799939d7489b16dd2637553bb396a47cd0318bf23f";
+       version = "0.4.0.1";
+       sha256 = "637506a2356076fefbf7515baa4c19ef2828fc404ab3c0ae0f9b1b2d5f04a42b";
        libraryHaskellDepends = [ base containers monadLib pretty ];
        description = "A pretty printing library inspired by the llvm binding";
        license = stdenv.lib.licenses.bsd3;
@@ -88765,7 +89309,7 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
-     }) { inherit (pkgs) lmdb;};
+     }) {inherit (pkgs) lmdb;};
 
   "load-env" = callPackage
     ({ mkDerivation, base, directory, hspec, HUnit, parsec }:
@@ -89387,7 +89931,7 @@ self: {
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { loris = null;};
+     }) {loris = null;};
 
   "loshadka" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cryptohash
@@ -89514,7 +90058,7 @@ self: {
        description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { language-css-attoparsec = null;};
+     }) {language-css-attoparsec = null;};
 
   "lsystem" = callPackage
     ({ mkDerivation, base, haskell98, uu-parsinglib, wx, wxcore }:
@@ -89563,8 +90107,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.3";
-       sha256 = "86e0ed96110ad0b2be8d63828e4ab8429893e4c269b28a95f4e1d70c73bc05c2";
+       version = "0.15.0.4";
+       sha256 = "6d39540a1aa73516d9390d8d49f1f9b8ec5f9cf15bede8cd51a25810ec345193";
        libraryHaskellDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
@@ -89769,7 +90313,7 @@ self: {
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { objc = null;};
+     }) {objc = null;};
 
   "lushtags" = callPackage
     ({ mkDerivation, base, haskell-src-exts, text, vector }:
@@ -89916,8 +90460,8 @@ self: {
      }:
      mkDerivation {
        pname = "lzma";
-       version = "0.0.0.0";
-       sha256 = "ba6bd66b58d0b378d5f95bb0436257c2862a77352f24ae7c459b82646b6e81c9";
+       version = "0.0.0.1";
+       sha256 = "576583fa5ac2110ca62f24dea62a1bb6effeba51c31b9fe06862dcfa8f7a38ac";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -89926,7 +90470,20 @@ self: {
        homepage = "https://github.com/hvr/lzma";
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lzma;};
+     }) {inherit (pkgs) lzma;};
+
+  "lzma-clib" = callPackage
+    ({ mkDerivation, only-buildable-on-windows }:
+     mkDerivation {
+       pname = "lzma-clib";
+       version = "5.2.1";
+       sha256 = "51f0e8ea4679f80d3c22b6fbf022062b7ac12b4d6b1e6b0f938194ca9a88adcc";
+       libraryHaskellDepends = [ only-buildable-on-windows ];
+       jailbreak = true;
+       description = "liblzma C library and headers for use by LZMA bindings";
+       license = stdenv.lib.licenses.publicDomain;
+       broken = true;
+     }) {only-buildable-on-windows = null;};
 
   "lzma-conduit" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, conduit, HUnit
@@ -89948,7 +90505,7 @@ self: {
        homepage = "http://github.com/alphaHeavy/lzma-conduit";
        description = "Conduit interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lzma;};
+     }) {inherit (pkgs) lzma;};
 
   "lzma-enumerator" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, enumerator, HUnit
@@ -89971,7 +90528,7 @@ self: {
        homepage = "http://github.com/alphaHeavy/lzma-enumerator";
        description = "Enumerator interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) lzma;};
+     }) {inherit (pkgs) lzma;};
 
   "lzma-streams" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, io-streams, lzma
@@ -90015,8 +90572,8 @@ self: {
     ({ mkDerivation, base, network, transformers }:
      mkDerivation {
        pname = "mac";
-       version = "0.1.0.0";
-       sha256 = "71a14d4c4682d9d9d21eee66bc1471d28b2801517c870bbbacc57872ce84a5fa";
+       version = "0.1.2.0";
+       sha256 = "8ac8188429cb9e20aefa83e3943f7b4f2713248160bcbeb9080784e637e5789d";
        libraryHaskellDepends = [ base network transformers ];
        description = "Static Mandatory Access Control in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -90208,7 +90765,7 @@ self: {
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "magic" = callPackage
     ({ mkDerivation, base, file }:
@@ -90220,24 +90777,22 @@ self: {
        librarySystemDepends = [ file ];
        description = "Interface to C file/magic library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) file;};
+     }) {inherit (pkgs) file;};
 
   "magico" = callPackage
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
        pname = "magico";
-       version = "0.0.0.1";
-       sha256 = "97f4f606544bbc741b593d96167bcd4e80d2f5f98face9460a1c6ab1dab12c38";
+       version = "0.0.1.1";
+       sha256 = "149e482d11268d45fb6da03cfa45a0947ea7cacc259c27959314a029c06c2633";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base hmatrix transformers utility-ht
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/thielema/magico";
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "magma" = callPackage
@@ -90945,6 +91500,8 @@ self: {
        pname = "manifolds";
        version = "0.1.3.1";
        sha256 = "f2d286ecbcf0d391fecb61e8be56b56737d9f26d53cc68e815fc2f73766330b4";
+       revision = "1";
+       editedCabalFile = "078a790a2e462108e5d1ed6314f264d40b3fd1b063f56595e3874fcb5137eeea";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq hmatrix
          MemoTrie semigroups tagged transformers vector vector-algorithms
@@ -90953,7 +91510,6 @@ self: {
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "map-syntax" = callPackage
@@ -91325,7 +91881,7 @@ self: {
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) pcre;};
+     }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
     ({ mkDerivation, base, deepseq, erf, HUnit, ieee754, QuickCheck
@@ -91422,7 +91978,7 @@ self: {
        description = "Matlab bindings and interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { eng = null;  mat = null;  mx = null;};
+     }) {eng = null; mat = null; mx = null;};
 
   "matrices" = callPackage
     ({ mkDerivation, base, primitive, tasty, tasty-hunit
@@ -91746,7 +92302,7 @@ self: {
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mecab = null;};
+     }) {mecab = null;};
 
   "mecha" = callPackage
     ({ mkDerivation, base }:
@@ -91977,8 +92533,8 @@ self: {
        pname = "memcached-binary";
        version = "0.2.0";
        sha256 = "4d895459998bfd2fb80337cfc2363a905dfd7dc62adfad0696841c570c58fb8c";
-       revision = "2";
-       editedCabalFile = "663a104dc09413397f9640534b6d1a743835a395598f641d02ef0dbd44093530";
+       revision = "3";
+       editedCabalFile = "3314b765ef10f959862577e55809bc181d16dfd3ff9443b62499b5b393eea6b3";
        libraryHaskellDepends = [
          base bytestring data-default-class network resource-pool
          storable-endian time unordered-containers
@@ -92353,34 +92909,38 @@ self: {
      }) {};
 
   "microformats2-parser" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, containers
-     , data-default, either, hspec, html-conduit, microformats2-types
-     , network, options, pcre-heavy, raw-strings-qq, safe, scotty
-     , streaming-commons, stringable, template-haskell, text, time
-     , wai-extra, warp, xml-lens, xss-sanitize
+    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, blaze-html
+     , blaze-markup, bytestring, containers, data-default, either, hspec
+     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
+     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
+     , scotty, streaming-commons, stringable, template-haskell, text
+     , time, transformers, unordered-containers, vector, wai-extra, warp
+     , xml-lens, xss-sanitize
      }:
      mkDerivation {
        pname = "microformats2-parser";
-       version = "0.1.1";
-       sha256 = "a5506e71b8ab918964c3d26982fea093f173db15ce388641dc4909aebea78c58";
+       version = "1.0.1.2";
+       sha256 = "94c220abb5bfd065e492f138bb72466f37cb2ecf4c53e830226b64e950a061b9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base blaze-markup containers data-default either html-conduit
-         microformats2-types pcre-heavy safe text time xml-lens xss-sanitize
+         aeson aeson-qq base blaze-markup bytestring containers data-default
+         either html-conduit lens-aeson network-uri pcre-heavy safe text
+         time transformers unordered-containers vector xml-lens xss-sanitize
        ];
        executableHaskellDepends = [
-         base blaze-html blaze-markup microformats2-types network options
-         scotty streaming-commons stringable text wai-extra warp
+         aeson aeson-pretty base blaze-html blaze-markup data-default
+         network network-uri options scotty streaming-commons stringable
+         text wai-extra warp
        ];
        testHaskellDepends = [
-         base data-default hspec html-conduit microformats2-types
-         raw-strings-qq template-haskell time xml-lens
+         aeson-qq base bytestring data-default hspec
+         hspec-expectations-pretty-diff html-conduit mtl network-uri
+         raw-strings-qq template-haskell text time xml-lens
        ];
        homepage = "https://github.com/myfreeweb/microformats2-parser";
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microformats2-types" = callPackage
@@ -92403,8 +92963,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.3.1.0";
-       sha256 = "6c822ad2697798b5073f2d04a8951392b6cead80ede5713ad415aa4213b565ee";
+       version = "0.3.3.0";
+       sha256 = "42a4b7c40a02a500419cf4b18df97ca76f31db06b1947d9c7d7434daf6434eab";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -92428,8 +92988,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, containers, microlens }:
      mkDerivation {
        pname = "microlens-ghc";
-       version = "0.2.0.0";
-       sha256 = "d848f874c5af94c64ee8e6e0912fca305687acd5ec2b5353297943a3f5fcbf04";
+       version = "0.2.1.0";
+       sha256 = "0f9544e355d4c262ee94eacc893b57ad54666e473a5e4b7cd7db236fcfdd9ea3";
        libraryHaskellDepends = [
          array base bytestring containers microlens
        ];
@@ -92444,8 +93004,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-mtl";
-       version = "0.1.4.1";
-       sha256 = "5a9a54d7804ece4bc4ab45c1784ce91df7681e2742b301754a212c7ccc2d7e70";
+       version = "0.1.5.0";
+       sha256 = "0f456e058d034e517eed53756d3b70438fcd91a818c93980053ab6ac86213028";
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
@@ -92460,8 +93020,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.1.1.0";
-       sha256 = "73511b2b66b356a1231d7a3a7b2da9021ad5f03c9ab61cfa659483fa03166ad6";
+       version = "0.1.3.0";
+       sha256 = "8f2c08879fb484df0e1f2564dfa2e1fd6dd4745fefae02678e569803db97ad80";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -92475,8 +93035,8 @@ self: {
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.2.1.1";
-       sha256 = "e38ef1cc80a44aadb9e6ffbea6647eceb84971b05a00f64bdd3fde4e2a4a7277";
+       version = "0.2.1.2";
+       sha256 = "ea17fb111790953667cd75e1e29823107eb2123ce41c27a77a71d5c7102a39f9";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -92725,22 +93285,23 @@ self: {
 
   "milena" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, digest
-     , either, hspec, lens, mtl, network, QuickCheck, random
-     , resource-pool, transformers
+     , either, hspec, lens, lifted-base, listsafe, mtl, murmur-hash
+     , network, QuickCheck, random, resource-pool, transformers
      }:
      mkDerivation {
        pname = "milena";
-       version = "0.2.0.0";
-       sha256 = "35ef8dfd4c1b5302c55f5cd3e6df87f64937be72317f24f58c96252b4393ce22";
+       version = "0.3.0.0";
+       sha256 = "924fc92ec94da73dcd5d9a0505247cc77106fd8757016a9ebc1cfc574d96c753";
        libraryHaskellDepends = [
-         base bytestring cereal containers digest either lens mtl network
-         random resource-pool transformers
+         base bytestring cereal containers digest either lens lifted-base
+         listsafe mtl murmur-hash network random resource-pool transformers
+       ];
+       testHaskellDepends = [
+         base bytestring hspec mtl network QuickCheck
        ];
-       testHaskellDepends = [ base bytestring hspec network QuickCheck ];
        jailbreak = true;
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime" = callPackage
@@ -92778,8 +93339,8 @@ self: {
      }:
      mkDerivation {
        pname = "mime-mail";
-       version = "0.4.9";
-       sha256 = "641420aa8b1d2c7f8ebf82fdb0e6000443ffba89a420f4ea11828474b244c3d0";
+       version = "0.4.10";
+       sha256 = "4930f9c6a906e73452a891d93b1cf545b64613ccb079fe625fa4c98c01b25677";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder bytestring filepath process
          random text
@@ -93532,20 +94093,20 @@ self: {
 
   "moesocks" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
-     , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network
-     , optparse-applicative, random, safe, stm, strict, text, time
+     , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens, mtl
+     , network, optparse-applicative, random, stm, strict, text, time
      , transformers, unix, unordered-containers
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.20";
-       sha256 = "06cb6e29dde04f62c9519fa295551e4130f596a96e74fceb9c2e36552d9de52e";
+       version = "0.1.0.27";
+       sha256 = "3e520127ef1727d460d65b1219d5c585973c62fc2f31713d6743aed2406d5abe";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson async attoparsec base binary bytestring containers cryptohash
-         hslogger HsOpenSSL lens mtl network optparse-applicative random
-         safe stm strict text time transformers unix unordered-containers
+         hslogger HsOpenSSL iproute lens mtl network optparse-applicative
+         random stm strict text time transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
@@ -94424,8 +94985,8 @@ self: {
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gecodeint = null;  gecodekernel = null;  gecodesearch = null;
-          gecodeset = null;  gecodesupport = null;};
+     }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
+         gecodeset = null; gecodesupport = null;};
 
   "monadio-unwrappable" = callPackage
     ({ mkDerivation, base, monads-tf, transformers }:
@@ -94642,17 +95203,17 @@ self: {
   "mono-traversable" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers, dlist
      , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck
-     , semigroupoids, semigroups, text, transformers
+     , semigroupoids, semigroups, split, text, transformers
      , unordered-containers, vector, vector-algorithms, vector-instances
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "0.9.2.1";
-       sha256 = "34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef";
+       version = "0.9.3";
+       sha256 = "d73b495b65cdc3951e2407d07e46b3cb5b3ab074b474c0742687b616f4e7e4db";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
-         semigroupoids semigroups text transformers unordered-containers
-         vector vector-algorithms vector-instances
+         semigroupoids semigroups split text transformers
+         unordered-containers vector vector-algorithms vector-instances
        ];
        testHaskellDepends = [
          base bytestring containers foldl hspec HUnit QuickCheck semigroups
@@ -94823,7 +95384,7 @@ self: {
        description = "Riak Resolution Proxy";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { riak-bump = null;  stats-web = null;};
+     }) {riak-bump = null; stats-web = null;};
 
   "montage-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, ListLike, mtl
@@ -94847,7 +95408,7 @@ self: {
        description = "Riak Resolution Proxy Client";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { riak-bump = null;  stats-web = null;};
+     }) {riak-bump = null; stats-web = null;};
 
   "monte-carlo" = callPackage
     ({ mkDerivation, base, gsl-random, ieee754, primitive, QuickCheck
@@ -94950,7 +95511,7 @@ self: {
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { morfeusz = null;};
+     }) {morfeusz = null;};
 
   "morte" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
@@ -95512,7 +96073,7 @@ self: {
        description = "Bindings to libmtp";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { mtp = null;};
+     }) {mtp = null;};
 
   "mtree" = callPackage
     ({ mkDerivation, base, bifunctors }:
@@ -95552,6 +96113,7 @@ 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;
@@ -95684,8 +96246,8 @@ self: {
      }:
      mkDerivation {
        pname = "multihash";
-       version = "0.1.1";
-       sha256 = "2f2c507fdd1492bbcdca737d6c0f8abdd4a0a9941f1661fd04c6b606f9c9d227";
+       version = "0.1.2";
+       sha256 = "dd2b0511c900d83794dec151008b0bec07be676dc0cbb073ce11d5b754c47538";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96573,7 +97135,7 @@ self: {
        homepage = "https://github.com/bos/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
-     }) { mysql = null;};
+     }) {inherit (pkgs) mysql;};
 
   "mysql-effect" = callPackage
     ({ mkDerivation, base, bytestring, extensible-effects, mysql
@@ -96841,7 +97403,7 @@ self: {
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "nano-md5" = callPackage
     ({ mkDerivation, base, bytestring, openssl }:
@@ -96855,7 +97417,7 @@ self: {
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "nanoAgda" = callPackage
     ({ mkDerivation, base, BNFC-meta, cmdargs, containers, mtl, parsec
@@ -96888,7 +97450,7 @@ self: {
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
     ({ mkDerivation, base, bytestring, nanomsg }:
@@ -96901,7 +97463,7 @@ self: {
        jailbreak = true;
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) nanomsg;};
+     }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
     ({ mkDerivation, base, binary, bytestring, nanomsg, QuickCheck
@@ -96921,7 +97483,7 @@ self: {
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) nanomsg;};
+     }) {inherit (pkgs) nanomsg;};
 
   "nanoparsec" = callPackage
     ({ mkDerivation, base, bytestring, ListLike }:
@@ -96977,8 +97539,8 @@ self: {
      }:
      mkDerivation {
        pname = "nationstates";
-       version = "0.2.0.0";
-       sha256 = "88e00660570f45c3ff709a659707b5967db54730f3dff25844dde07d0b3b3a1f";
+       version = "0.2.0.1";
+       sha256 = "091ddee83ea21b6b8505ef5053c8b6ce58b08a578f8cd51bfe1c32745af0426c";
        libraryHaskellDepends = [
          base bytestring clock containers http-client http-client-tls
          http-types multiset transformers xml
@@ -97175,7 +97737,7 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "ndjson-conduit" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }:
@@ -97212,13 +97774,12 @@ self: {
      }:
      mkDerivation {
        pname = "neat-interpolation";
-       version = "0.2.2.1";
-       sha256 = "de357ec4b78f68c5797d84e8bb01a35aff53e8c0d10d5d1ebbe5185d0483b303";
+       version = "0.2.3";
+       sha256 = "a60966321467bf8065796f37774756f94a89c443ee59fac4fbeac964d4a1c20b";
        libraryHaskellDepends = [
          base base-prelude parsec template-haskell
        ];
        testHaskellDepends = [ 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;
@@ -97285,8 +97846,8 @@ self: {
      }:
      mkDerivation {
        pname = "neil";
-       version = "0.9";
-       sha256 = "3385ec7c186bd4e51630015a0d1a2425e43b56c41c5a34571d2da02e16e9e431";
+       version = "0.10";
+       sha256 = "7bf2215903836e058bdbbc0c884e773f081c03f79cfa99964e620969e03a139f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97491,7 +98052,7 @@ self: {
        description = "Concurrent over the network execution library";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghc-binary = null;};
+     }) {ghc-binary = null;};
 
   "netclock" = callPackage
     ({ mkDerivation, base, bytestring, hosc, network }:
@@ -97667,9 +98228,9 @@ self: {
 
   "nettle" = callPackage
     ({ mkDerivation, array, base, byteable, bytestring
-     , crypto-cipher-tests, crypto-cipher-types, HUnit, QuickCheck
-     , securemem, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
+     , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
+     , QuickCheck, securemem, tagged, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "nettle";
@@ -97678,6 +98239,7 @@ self: {
        libraryHaskellDepends = [
          base byteable bytestring crypto-cipher-types securemem tagged
        ];
+       libraryPkgconfigDepends = [ nettle ];
        testHaskellDepends = [
          array base bytestring crypto-cipher-tests crypto-cipher-types HUnit
          QuickCheck tagged test-framework test-framework-hunit
@@ -97687,7 +98249,7 @@ self: {
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
     ({ mkDerivation, base, bimap, binary, bytestring, containers, mtl
@@ -99053,8 +99615,8 @@ self: {
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { g = null;  inherit (pkgs) glib;  libnm-glib = null;
-          nm-glib = null;};
+     }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
+         nm-glib = null;};
 
   "nme" = callPackage
     ({ mkDerivation, base, bytestring, utf8-string }:
@@ -99269,8 +99831,8 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.5.0";
-       sha256 = "8b22f315fe60b95e7b24bae9b206b815851f5b60082cb5139ae2d33816f315e4";
+       version = "0.7.6.0";
+       sha256 = "0ac24214e36b7ab50e9e2714d0806a8f732a52d1b04d596438d9fdd6c877cd8b";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
@@ -99338,7 +99900,7 @@ self: {
        description = "Binding for notmuch MUA library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) notmuch;};
+     }) {inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
     ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base
@@ -99772,8 +100334,10 @@ self: {
      }:
      mkDerivation {
        pname = "nurbs";
-       version = "0.1.0.0";
-       sha256 = "91879fb8840fc1bc907c63df125880a367ec5b52d544806be1306b235103afe7";
+       version = "0.1.1.0";
+       sha256 = "42459775e2b1c419343402da693465f3db61c5ab6e5666f44d810b568cf33054";
+       revision = "1";
+       editedCabalFile = "17ee68339f33b5fa8ccc3ddf788ee5cb3ab3f40170b93175925a1b97534afdbc";
        libraryHaskellDepends = [
          base base-unicode-symbols lens linear mtl
        ];
@@ -99796,8 +100360,8 @@ self: {
      }:
      mkDerivation {
        pname = "nvim-hs";
-       version = "0.0.3";
-       sha256 = "e5768324a22d0e282f2e9e839fbe32b0943f120aa851499f1db9388612bddcb1";
+       version = "0.0.5";
+       sha256 = "46474d2b4ff86a79a94af581f556a527bfc97cddea5c00d7d3cfaaa94fedc6ef";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -99836,6 +100400,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nylas" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, lens, lens-aeson, pipes
+     , pipes-aeson, pipes-bytestring, pipes-http, pipes-parse, text
+     , time, wreq
+     }:
+     mkDerivation {
+       pname = "nylas";
+       version = "0.1.1";
+       sha256 = "a78d4e6d4841049f447b110df0ad22a0af764d845a19791b54a8f5d29e29d6b0";
+       libraryHaskellDepends = [
+         aeson base bytestring lens lens-aeson pipes pipes-aeson
+         pipes-bytestring pipes-http pipes-parse text time wreq
+       ];
+       homepage = "https://github.com/bts/nylas-hs";
+       description = "Client for the Nylas API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nymphaea" = callPackage
     ({ mkDerivation, base, cairo, containers, glade, glib, gtk, mtl
      , parsec, random
@@ -100017,7 +100599,6 @@ 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
@@ -100060,9 +100641,8 @@ self: {
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libX11;
-          inherit (pkgs.xlibs) libXinerama;  inherit (pkgs) mesa;
-          ovr = null;  inherit (pkgs) systemd;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXinerama; 
+         inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;};
 
   "oeis" = callPackage
     ({ mkDerivation, base, HTTP, HUnit, network, network-uri
@@ -100159,7 +100739,7 @@ self: {
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { OIS = null;};
+     }) {OIS = null;};
 
   "old-locale" = callPackage
     ({ mkDerivation, base }:
@@ -100442,6 +101022,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye-classy" = callPackage
+    ({ mkDerivation, base, bytestring, lens, mtl, opaleye
+     , postgresql-simple, product-profunctors, transformers
+     }:
+     mkDerivation {
+       pname = "opaleye-classy";
+       version = "0.1.0.1";
+       sha256 = "874c3f1d394653289542ef2a8ca55d8b93c01c1de78e2c0bbe1c668be39b331a";
+       libraryHaskellDepends = [
+         base bytestring lens mtl opaleye postgresql-simple
+         product-profunctors transformers
+       ];
+       homepage = "https://github.com/benkolera/opaleye-classy/tree/master";
+       description = "Opaleye wrapped up in classy MTL attire";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "opaleye-sqlite" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, direct-sqlite
@@ -100559,7 +101156,7 @@ self: {
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) opencv;};
+     }) {inherit (pkgs) opencv;};
 
   "opendatatable" = callPackage
     ({ mkDerivation, base, hxt, template-haskell, th-lift }:
@@ -100627,7 +101224,7 @@ self: {
        description = "OpenGL ES 2.0 and 3.0 with EGL 1.4";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { EGL = null;  GLESv2 = null;};
+     }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
     ({ mkDerivation, base, bytestring, containers, HsOpenSSL, HTTP
@@ -101317,7 +101914,6 @@ self: {
        jailbreak = true;
        description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchid" = callPackage
@@ -101527,8 +102123,8 @@ self: {
      }:
      mkDerivation {
        pname = "os-release";
-       version = "0.2.1";
-       sha256 = "8a9237966475d4178a266479d0dd9a834bd59349116528539eab66717d884646";
+       version = "0.2.2";
+       sha256 = "a91357fec161695ca6868d27c150f2de05666a6a7708114b3e06ff100f4d2ca7";
        libraryHaskellDepends = [ base containers parsec transformers ];
        testHaskellDepends = [
          base containers hlint hspec parsec process regex-compat temporary
@@ -101718,8 +102314,8 @@ self: {
      }:
      mkDerivation {
        pname = "packdeps";
-       version = "0.4.0.3";
-       sha256 = "172e351d24db1934e2507b5f516c9575c65705a0c7e8e6091f0d11f2b84d5621";
+       version = "0.4.1";
+       sha256 = "c43f878515ecf1e972f683a2671ed941e4389fab4920e68527f8015572a04e36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101960,7 +102556,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) pam;};
+     }) {inherit (pkgs) pam;};
 
   "panda" = callPackage
     ({ mkDerivation, base, cgi, containers, data-default, directory
@@ -102064,8 +102660,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.3.0";
-       sha256 = "f3cdb3988ac223111dc7ccb3a28aa8a4db91ace098475f5e8e0c8f8bcfe6b8bd";
+       version = "0.1.4.0";
+       sha256 = "730cfde295f11c0c328bab8f5ad505743ad42017b899e599245cf7e2db760b23";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102086,8 +102682,8 @@ self: {
        pname = "pandoc-csv2table";
        version = "1.0.1";
        sha256 = "0b872c518f3d3f1ca178e8a6cd2581f0a3b294cfd533e19fccd0fd95dcd79d2c";
-       revision = "1";
-       editedCabalFile = "0924cc418394f855f93486ee6fb3bae991112c3e63df74f95afa6c2d62b09299";
+       revision = "2";
+       editedCabalFile = "522492bc433302f60262c0c9a19ccda171dd4eaec177f42fe75e471b79df1924";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
@@ -102174,7 +102770,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) pango;};
+     }) {inherit (pkgs.gnome) pango;};
 
   "papillon" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, monads-tf
@@ -102963,6 +103559,7 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck text ];
        description = "Components of paths";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "pathfinding" = callPackage
@@ -103250,8 +103847,8 @@ self: {
      }:
      mkDerivation {
        pname = "pcg-random";
-       version = "0.1.3.1";
-       sha256 = "917be65fa6f917ba3e8b1ae98774356559ff6239f0b806ac0943cf160a455d0b";
+       version = "0.1.3.2";
+       sha256 = "288db42bb77ffef6e57007b893b41df5a3ac8f252d5a519306448cb5802ebe71";
        libraryHaskellDepends = [
          base bytestring entropy primitive random time
        ];
@@ -103267,15 +103864,15 @@ self: {
      }:
      mkDerivation {
        pname = "pcre-heavy";
-       version = "0.2.2";
-       sha256 = "834ba945e545983a96d7aa960b86cbbbd8cf5861e367f7919ff2e2e2ea369b21";
+       version = "0.2.5";
+       sha256 = "01b599e8a3629795b4afb2bbb9e65bb114ddbccd867ca8806d75aa56e3bacde7";
        libraryHaskellDepends = [
          base bytestring pcre-light stringable template-haskell
        ];
        testHaskellDepends = [ base doctest Glob ];
        homepage = "https://github.com/myfreeweb/pcre-heavy";
        description = "A regexp library on top of pcre-light you can actually use";
-       license = "unknown";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "pcre-less" = callPackage
@@ -103300,7 +103897,7 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/pcre-light";
        description = "A small, efficient and portable regex library for Perl 5 compatible regular expressions";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) pcre;};
+     }) {inherit (pkgs) pcre;};
 
   "pcre-light-extra" = callPackage
     ({ mkDerivation, base, bytestring, pcre-light }:
@@ -103337,8 +103934,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-content";
-       version = "0.0.3.3";
-       sha256 = "2ccd016046b37ef99fc5d21876cfd9b241e0e85671a54718648fbc65edb87e0e";
+       version = "0.0.4.0";
+       sha256 = "de615950a445022afc2950765d5be9cc7cf16c90bbcc3b4eeded8f491e9afd54";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring bytestring containers io-streams
          pdf-toolbox-core text
@@ -103346,7 +103943,6 @@ 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
@@ -103355,17 +103951,15 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-core";
-       version = "0.0.3.3";
-       sha256 = "1599278af33e5a053ff1f6b88d6a2db45f841988300a1723a02423bcd9b9ce00";
+       version = "0.0.4.0";
+       sha256 = "72760da19e24bea4f2bee3114ce702437d413c531347c8fd544fcae717c83e95";
        libraryHaskellDepends = [
          attoparsec base bytestring containers errors io-streams scientific
          transformers zlib-bindings
        ];
-       jailbreak = true;
        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
@@ -103375,8 +103969,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-document";
-       version = "0.0.5.1";
-       sha256 = "9a7bc1725a725340b4b290669cffbf32596ff8c1078ee5f9f549e6dd61839661";
+       version = "0.0.6.0";
+       sha256 = "ce5f7e1622c73ecfa24e8ec590dad12c3ca27db6bdac20738bff5f0bdce01231";
        libraryHaskellDepends = [
          base bytestring cipher-aes cipher-rc4 containers crypto-api
          cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
@@ -103385,7 +103979,6 @@ 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
@@ -103395,8 +103988,8 @@ self: {
      }:
      mkDerivation {
        pname = "pdf-toolbox-viewer";
-       version = "0.0.3.3";
-       sha256 = "e24b4573520eb1bc27cd8cccc06c036196f514aead62d952b45cd0d2d6eed60a";
+       version = "0.0.4.0";
+       sha256 = "cd7d565349c7ff1c6d3fd04e7f9523732fb03dc000a37cdb07f45ae14f93b05c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -103407,7 +104000,6 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf2line" = callPackage
@@ -103770,6 +104362,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "period" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, optparse-applicative, parsec
+     , text, text-show, time
+     }:
+     mkDerivation {
+       pname = "period";
+       version = "0.1.0.1";
+       sha256 = "b83dfef9a9de6746e0bc852f816cb00cfd564e2cc5af1bcd5c4f2c82b12b308e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base parsec text text-show time ];
+       executableHaskellDepends = [ base optparse-applicative text ];
+       testHaskellDepends = [ base hspec HUnit text time ];
+       homepage = "https://github.com/w3rs/period";
+       description = "Parse and format date periods, collapse and expand their text representations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "perm" = callPackage
     ({ mkDerivation, base, catch-fd, HUnit, mtl, test-framework
      , test-framework-hunit, transformers
@@ -103835,8 +104445,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.1.0.0";
-       sha256 = "46f434e4193dd88d224c03e39281b8bb747289a432ade70925f70fe07bcc03fc";
+       version = "0.1.0.1";
+       sha256 = "ba04f5af4a988e6f4758f32ff8ff767b71680bea5bede391200aba431d0c530d";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell transformers
        ];
@@ -103875,6 +104485,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-cereal" = callPackage
@@ -103966,6 +104577,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-mysql" = callPackage
@@ -103985,6 +104597,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-odbc" = callPackage
@@ -104027,6 +104640,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-protobuf" = callPackage
@@ -104084,6 +104698,7 @@ self: {
        jailbreak = true;
        description = "Backend for persistent library using Redis";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-refs" = callPackage
@@ -104122,6 +104737,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-template" = callPackage
@@ -104145,6 +104761,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persistent-vector" = callPackage
@@ -104192,6 +104809,7 @@ self: {
        jailbreak = true;
        description = "Backend for persistent library using Zookeeper";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "persona" = callPackage
@@ -104367,7 +104985,6 @@ self: {
        ];
        description = "simply download a video (or a file) from a webpage and xdg-open it";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgm" = callPackage
@@ -104491,7 +105108,7 @@ self: {
        description = "Haskell bindings to pHash, the open source perceptual hash library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { pHash = null;};
+     }) {pHash = null;};
 
   "phone-push" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
@@ -105096,6 +105713,7 @@ self: {
        homepage = "http://github.com/kvanberendonck/pipes-courier";
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-csv" = callPackage
@@ -105105,8 +105723,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-csv";
-       version = "1.4.0";
-       sha256 = "d2041b32b683d1a3a74fddd09ca0f572cc21c6c9ca434a394573d23dadb32fe0";
+       version = "1.4.1";
+       sha256 = "9a18f4c24281e87136ea17bc73a37199333da25532a5ffed8d268eb080f5d9c4";
        libraryHaskellDepends = [
          base blaze-builder bytestring cassava pipes unordered-containers
          vector
@@ -105115,10 +105733,9 @@ self: {
          base bytestring cassava HUnit pipes pipes-bytestring test-framework
          test-framework-hunit vector
        ];
-       jailbreak = true;
        description = "Fast, streaming csv parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "pipes-errors" = callPackage
@@ -105217,14 +105834,17 @@ self: {
      }) {};
 
   "pipes-group" = callPackage
-    ({ mkDerivation, base, free, pipes, pipes-parse, transformers }:
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
      mkDerivation {
        pname = "pipes-group";
-       version = "1.0.2";
-       sha256 = "e056ab94a9211698505491a7958c56aa52b682b4bdc32fa0a369bc7c16906106";
+       version = "1.0.3";
+       sha256 = "f0f20cc29410d84faeae1fe055d3d1041a205c27403d627bd865489c7f7ec200";
        libraryHaskellDepends = [
          base free pipes pipes-parse transformers
        ];
+       testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105283,6 +105903,7 @@ self: {
        homepage = "http://github.com/jb55/pipes-mongodb";
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ jb55 ];
      }) {};
 
   "pipes-network" = callPackage
@@ -106161,7 +106782,7 @@ self: {
        librarySystemDepends = [ poker-eval ];
        description = "Binding to libpoker-eval";
        license = stdenv.lib.licenses.publicDomain;
-     }) { inherit (pkgs) poker-eval;};
+     }) {inherit (pkgs) poker-eval;};
 
   "pokitdok" = callPackage
     ({ mkDerivation, aeson, base, base64-string, bytestring
@@ -106247,10 +106868,8 @@ self: {
      }:
      mkDerivation {
        pname = "poly-arity";
-       version = "0.0.4.1";
-       sha256 = "975b761a7c81144c2455fd6c05bb7d1891782659d4fc0a01e57941c57145d497";
-       revision = "2";
-       editedCabalFile = "0bce1ff7388433830c7824530bb9c4fe3f4545bad44683dec2a5780028d870af";
+       version = "0.0.5";
+       sha256 = "d0787fa2a151080e2138b64dd4adc4dc8e41857e22fa494703f9f876e6cd25bb";
        libraryHaskellDepends = [ base constraints HList ];
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
@@ -106572,8 +107191,8 @@ self: {
        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;};
+     }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs.gnome) pango; 
+         inherit (pkgs) poppler;};
 
   "populate-setup-exe-cache" = callPackage
     ({ mkDerivation, base }:
@@ -106609,7 +107228,7 @@ self: {
        homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
-     }) { inherit (pkgs) portaudio;};
+     }) {inherit (pkgs) portaudio;};
 
   "porte" = callPackage
     ({ mkDerivation, base, bytestring, containers
@@ -106695,7 +107314,7 @@ self: {
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) acl;};
+     }) {inherit (pkgs) acl;};
 
   "posix-escape" = callPackage
     ({ mkDerivation, base }:
@@ -106746,7 +107365,7 @@ self: {
        homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
-     }) { util = null;};
+     }) {util = null;};
 
   "posix-realtime" = callPackage
     ({ mkDerivation, base, unix }:
@@ -106892,7 +107511,7 @@ self: {
        homepage = "http://github.com/lpsmith/postgresql-libpq";
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) postgresql;};
+     }) {inherit (pkgs) postgresql;};
 
   "postgresql-orm" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory
@@ -106927,18 +107546,19 @@ self: {
      , 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
+     , th-lift, th-lift-instances, time, transformers, transformers-base
+     , transformers-compat
      }:
      mkDerivation {
        pname = "postgresql-query";
-       version = "1.4.0";
-       sha256 = "593bae5989407891835faffd572ee8fdfd474ff5c1e9a14395db55c9a8d6452d";
+       version = "2.0.0";
+       sha256 = "09b0d4c664ab4965ab61f3c30cb303d03ca18b58dfb76654d733b02572966046";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder bytestring containers
          data-default either exceptions file-embed haskell-src-meta hreader
          hset monad-control monad-logger mtl postgresql-simple resource-pool
-         semigroups template-haskell text time transformers
-         transformers-base transformers-compat
+         semigroups template-haskell text th-lift th-lift-instances time
+         transformers transformers-base transformers-compat
        ];
        testHaskellDepends = [
          attoparsec base QuickCheck quickcheck-assertions
@@ -107212,7 +107832,7 @@ self: {
        description = "Postmaster ESMTP Server";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) adns;  inherit (pkgs) openssl;};
+     }) {inherit (pkgs) adns; inherit (pkgs) openssl;};
 
   "potato-tool" = callPackage
     ({ mkDerivation, base, binary, bytestring, split }:
@@ -108046,12 +108666,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "process_1_2_3_0" = callPackage
+  "process_1_3_0_0" = callPackage
     ({ mkDerivation, base, deepseq, directory, filepath, unix }:
      mkDerivation {
        pname = "process";
-       version = "1.2.3.0";
-       sha256 = "619e04157183631bd16fa921589bd4125b7db12c45287e962a7b8402a70d60c5";
+       version = "1.3.0.0";
+       sha256 = "709b77b7a2a5768c61759fdd000e3b9c47e05cbee7987abf82954fd15d80c3f8";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base ];
        description = "Process libraries";
@@ -108483,7 +109103,7 @@ self: {
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) proj;};
+     }) {inherit (pkgs) proj;};
 
   "project-template" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, conduit
@@ -108670,8 +109290,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.7.1";
-       sha256 = "31e6b0463f36a6241eaadd980648afe487061e213582b457f29e045ee4ea862f";
+       version = "2.7.2";
+       sha256 = "9c1cc565bfdea30d58c5306ef2dda9d4e86984f9f9004c0fe43011b481ce4db8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -108776,7 +109396,7 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the proteaaudio library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) alsaLib;};
 
   "protobuf" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers
@@ -108814,7 +109434,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cplusplus-th template-haskell text
        ];
-       librarySystemDepends = [ protobuf ];
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          base bytestring cereal cplusplus-th criterion hprotoc-fork protobuf
@@ -108825,7 +109444,7 @@ self: {
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) protobuf;};
+     }) {};
 
   "protocol-buffers" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
@@ -108833,8 +109452,8 @@ self: {
      }:
      mkDerivation {
        pname = "protocol-buffers";
-       version = "2.1.4";
-       sha256 = "ad92eb27e09c70a26353377a09b5d61715aa452215e6221e33fcd0065c15c96a";
+       version = "2.1.5";
+       sha256 = "1028200fcef97d76f28e9ff22100066ad6b797c56fbf0222735b1ed4ece060dd";
        libraryHaskellDepends = [
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
@@ -108848,8 +109467,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
-       version = "2.1.4";
-       sha256 = "7e7ff115ed7fefcaa00917ba76052d50d4f5dd786956a646d1b3180212a207d4";
+       version = "2.1.5";
+       sha256 = "cd653ce9ad16eadb080d6e19647da5fe5ccde7e3e2fb85464cbc460d44ca44f0";
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
@@ -109047,8 +109666,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20150814";
-       sha256 = "809fa6a08ed47540b7536811af17075b180b2d2a65508f9090c28614677c0edb";
+       version = "0.20150827";
+       sha256 = "709cf2da54e5a3351d91e866a76d97e32a0a6c3d3178b1ecdd7dfa3e63b9dc4c";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -109221,7 +109840,6 @@ self: {
        homepage = "http://pugscode.org/";
        description = "DrIFT with pugs-specific rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugs-HsSyck" = callPackage
@@ -109253,7 +109871,6 @@ self: {
        ];
        description = "Portable Haskell/POSIX layer for Pugs";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugs-hsregex" = callPackage
@@ -109279,7 +109896,7 @@ self: {
        librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libpulseaudio;};
+     }) {inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
     ({ mkDerivation, array, base, mtl, regex-tdfa, regex-tdfa-text
@@ -109456,8 +110073,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.7.3.0";
-       sha256 = "27d9e4bd3061a2b64e10d4d7c140b2debd786772309aa36e0b7fdaa49b42b5c0";
+       version = "0.7.4.1";
+       sha256 = "82d41cbde580e86620d18d03f38508b2d5f0c1ce4719ac62f3ea2bbe35ee4b9f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109480,7 +110097,6 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -109697,7 +110313,7 @@ self: {
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "pwstore-cli" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, HUnit, process
@@ -109783,7 +110399,7 @@ self: {
        homepage = "http://github.com/Russell91/json-python";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) python;};
+     }) {inherit (pkgs) python;};
 
   "pyfi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, pureMD5
@@ -109801,7 +110417,7 @@ self: {
        homepage = "http://github.com/Russell91/pyfi";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) python;};
+     }) {inherit (pkgs) python;};
 
   "python-pickle" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, cmdargs
@@ -109849,7 +110465,7 @@ self: {
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { qd = null;};
+     }) {qd = null;};
 
   "qd-vec" = callPackage
     ({ mkDerivation, base, qd, Vec }:
@@ -109875,7 +110491,7 @@ self: {
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) qhull;};
+     }) {inherit (pkgs) qhull;};
 
   "qrcode" = callPackage
     ({ mkDerivation, array, base, containers, mtl, vector }:
@@ -110129,9 +110745,10 @@ self: {
     ({ mkDerivation, base, HUnit, QuickCheck }:
      mkDerivation {
        pname = "quickcheck-io";
-       version = "0.1.1";
-       sha256 = "a23a6e011aafd211c2521ddb9f61ffb5d256837148b5f5c35a152bdb37d6039b";
+       version = "0.1.2";
+       sha256 = "50275e5253dcf0c838e340fa19eb841804deb634aeedbf33f0b46a97b89bc1cd";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
+       homepage = "https://github.com/hspec/quickcheck-io#readme";
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -110461,6 +111078,8 @@ self: {
        pname = "quiver-http";
        version = "0.0.0.2";
        sha256 = "e221dbbe65a0b4509e7efbd1e70383575175932e16b28d0cbeaa2165b7a5dfe0";
+       revision = "1";
+       editedCabalFile = "ca7fe920bd4fd519db582ca6fcfdc82f5e62563df3e29827f523acf423f43380";
        libraryHaskellDepends = [
          base bytestring http-client http-client-tls quiver
        ];
@@ -110612,7 +111231,7 @@ self: {
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { rados = null;};
+     }) {rados = null;};
 
   "rail-compiler-editor" = callPackage
     ({ mkDerivation, base, cairo, containers, gtk, HUnit, llvm-general
@@ -110967,7 +111586,7 @@ self: {
        homepage = "http://galois.com";
        description = "A fast, SMP parallel random data generator";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "randproc" = callPackage
     ({ mkDerivation, base }:
@@ -111033,8 +111652,8 @@ self: {
      }:
      mkDerivation {
        pname = "range-space";
-       version = "0.1.1.2";
-       sha256 = "2465f41de6245ccb481ac6734ff7dc22521bc4ed98aa874e668c06eadf2c9419";
+       version = "0.1.2.0";
+       sha256 = "388d6cea0511019d7e0b43989722e94202d505772271a5f84ec66d99856b38c3";
        libraryHaskellDepends = [
          base semigroups vector-space vector-space-points
        ];
@@ -111042,11 +111661,9 @@ self: {
          base QuickCheck semigroups test-framework
          test-framework-quickcheck2 time vector-space vector-space-points
        ];
-       jailbreak = true;
        homepage = "https://github.com/JohnLato/range-space";
        description = "A Range type with vector-space instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rangemin" = callPackage
@@ -111376,8 +111993,8 @@ self: {
     ({ mkDerivation, aeson, base, deepseq, mtl, text }:
      mkDerivation {
        pname = "react-flux";
-       version = "0.9.0";
-       sha256 = "6da5232f92bd5667a0ff2b6c3bbe9139ba412e82a8f619cfd05f2c056b907209";
+       version = "0.9.1";
+       sha256 = "704b253c655442c03eb90e1c4b36660dc6416745c041c590362c3f6762cc9615";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ aeson base deepseq mtl text ];
@@ -111476,20 +112093,20 @@ self: {
      }) {};
 
   "reactive-banana" = callPackage
-    ({ mkDerivation, base, containers, hashable, HUnit, psqueues
-     , test-framework, test-framework-hunit, transformers
+    ({ mkDerivation, base, containers, hashable, HUnit, pqueue
+     , psqueues, test-framework, test-framework-hunit, transformers
      , unordered-containers, vault
      }:
      mkDerivation {
        pname = "reactive-banana";
-       version = "0.8.1.2";
-       sha256 = "ead933b650793b078a9c8c9daf86c4f1cd45007a4a1a4c96bfa5257f328863aa";
+       version = "0.9.0.0";
+       sha256 = "255930fdf0dcf40fe126ae2f4f274267cfd1e5f49b548618c3c84e3a8ad79683";
        libraryHaskellDepends = [
-         base containers hashable psqueues transformers unordered-containers
+         base containers hashable pqueue transformers unordered-containers
          vault
        ];
        testHaskellDepends = [
-         base containers hashable HUnit psqueues test-framework
+         base containers hashable HUnit pqueue psqueues test-framework
          test-framework-hunit transformers unordered-containers vault
        ];
        homepage = "http://wiki.haskell.org/Reactive-banana";
@@ -111509,6 +112126,7 @@ self: {
          base data-lens data-lens-template reactive-banana SDL SDL-image
          SDL-ttf
        ];
+       jailbreak = true;
        homepage = "https://github.com/JPMoresmau/reactive-banana-sdl";
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
@@ -111535,15 +112153,15 @@ self: {
     ({ mkDerivation, base, cabal-macosx, reactive-banana, wx, wxcore }:
      mkDerivation {
        pname = "reactive-banana-wx";
-       version = "0.8.0.4";
-       sha256 = "8fe99c2d49ae2b579716447caf9b75b31d951e57b796073bd6c1cdad530600e4";
+       version = "0.9.0.1";
+       sha256 = "554e9d6715665a52e6395148749d9c1ec58db2cf8dfaa4944374a605072529ba";
        configureFlags = [ "-f-buildexamples" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base cabal-macosx reactive-banana wx wxcore
        ];
-       homepage = "http://haskell.org/haskellwiki/Reactive-banana";
+       homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111678,7 +112296,7 @@ self: {
        librarySystemDepends = [ ncurses readline ];
        description = "An interface to the GNU readline library";
        license = "GPL";
-     }) { inherit (pkgs) ncurses;  inherit (pkgs) readline;};
+     }) {inherit (pkgs) ncurses; inherit (pkgs) readline;};
 
   "readline-statevar" = callPackage
     ({ mkDerivation, base, readline, StateVar }:
@@ -111942,21 +112560,22 @@ self: {
 
   "reddit" = callPackage
     ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal
-     , data-default, hspec, http-conduit, http-types, network, stm, text
-     , time, transformers, unordered-containers, vector
+     , data-default-class, free, hspec, http-client, http-client-tls
+     , http-types, network, text, time, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "reddit";
-       version = "0.1.1.0";
-       sha256 = "f3bcada2af55e8b70fffabd918ac1f4fa51cd81765e8cc8a5e4495461b579aba";
+       version = "0.2.0.0";
+       sha256 = "1969dea9612d12611b73f209466e6567e46a2706b59f2f243234d47bf2749ec0";
        libraryHaskellDepends = [
-         aeson api-builder base bytestring data-default http-conduit
-         http-types network stm text time transformers unordered-containers
-         vector
+         aeson api-builder base bytestring data-default-class free
+         http-client http-client-tls http-types network text time
+         transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         api-builder base bytestring Cabal hspec http-conduit text time
-         transformers
+         aeson api-builder base bytestring Cabal hspec http-client
+         http-client-tls text time transformers
        ];
        jailbreak = true;
        homepage = "https://github.com/intolerable/reddit";
@@ -112224,7 +112843,7 @@ self: {
        description = "Generalization of lenses, folds and traversals to handle monads and addition";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { instance-control = null;};
+     }) {instance-control = null;};
 
   "refh" = callPackage
     ({ mkDerivation, base, clippard, cmdargs, directory, filepath
@@ -112317,6 +112936,7 @@ self: {
        testHaskellDepends = [
          base containers dependent-map MemoTrie mtl ref-tf
        ];
+       jailbreak = true;
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
@@ -112367,7 +112987,7 @@ self: {
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghcjs-base = null;};
+     }) {ghcjs-base = null;};
 
   "reflex-gloss" = callPackage
     ({ mkDerivation, base, dependent-sum, gloss, reflex, transformers
@@ -112379,6 +112999,7 @@ self: {
        libraryHaskellDepends = [
          base dependent-sum gloss reflex transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
@@ -112616,7 +113237,7 @@ self: {
        homepage = "http://hackage.haskell.org/package/regex-pcre";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) pcre;};
+     }) {inherit (pkgs) pcre;};
 
   "regex-pcre-builtin" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, regex-base }:
@@ -112699,6 +113320,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "regex-tdfa-pipes" = callPackage
+    ({ mkDerivation, array, base, lens, monads-tf, pipes, regex-base
+     , regex-tdfa
+     }:
+     mkDerivation {
+       pname = "regex-tdfa-pipes";
+       version = "0.1.0.0";
+       sha256 = "221369b630ea479034bf959e936a71646ec9d13db13035d817cc7c10eb1d3098";
+       libraryHaskellDepends = [
+         array base lens monads-tf pipes regex-base regex-tdfa
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/erisco/regex-tdfa-pipes";
+       description = "Parse with regular expressions on Producers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "regex-tdfa-quasiquoter" = callPackage
+    ({ mkDerivation, base, regex-tdfa, template-haskell }:
+     mkDerivation {
+       pname = "regex-tdfa-quasiquoter";
+       version = "0.2.0.0";
+       sha256 = "8ae16a6297b7357ef3d9f8d2e09d006e74f67b889ec7d86296eb0ac6fb2c8361";
+       libraryHaskellDepends = [ base regex-tdfa template-haskell ];
+       jailbreak = true;
+       homepage = "http://github.com/erisco/regex-tdfa-quasiquoter";
+       description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-tdfa-rc" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim, mtl
      , parsec, regex-base
@@ -112719,10 +113370,8 @@ self: {
     ({ mkDerivation, array, base, regex-base, regex-tdfa, text }:
      mkDerivation {
        pname = "regex-tdfa-text";
-       version = "1.0.0.2";
-       sha256 = "cdad83b2c3b871e00404eb8649b056465c5f27c494634f6324a77521c7ee27dc";
-       revision = "2";
-       editedCabalFile = "4b0e54f79540143c88adb071ea8e0aa3734a625db026a6a44ca2ef45b870b07c";
+       version = "1.0.0.3";
+       sha256 = "38d77a0d225c306c52c6d4eed12d11d05a4bc4194d547cb9a7a9b6f5a8792001";
        libraryHaskellDepends = [ array base regex-base regex-tdfa text ];
        description = "Text interface for regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
@@ -112773,7 +113422,7 @@ self: {
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) tre;};
+     }) {inherit (pkgs) tre;};
 
   "regex-xmlschema" = callPackage
     ({ mkDerivation, base, haskell98, parsec }:
@@ -113201,15 +113850,15 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.1.0.0";
-       sha256 = "729b3474dc3b0815315f09866d8309ff03ee3b7a86c02954ad0c33c44d92b4e4";
+       version = "0.1.0.1";
+       sha256 = "23c9296e772ab840936e6bf9916e3949726ab168de4d0a81b31505fcc08f726c";
        libraryHaskellDepends = [
          base containers convertible HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
          template-haskell
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "HDBC instance of relational join and typed query for HDBC";
+       description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -113345,7 +113994,6 @@ self: {
        homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remotion" = callPackage
@@ -113502,7 +114150,7 @@ self: {
        homepage = "https://github.com/RaphaelJ/repa-devil";
        description = "Support for image reading and writing of Repa arrays using in-place FFI calls";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
 
   "repa-eval" = callPackage
     ({ mkDerivation, base, ghc-prim }:
@@ -113931,18 +114579,16 @@ self: {
     ({ mkDerivation, base, hmatrix, transformers, utility-ht }:
      mkDerivation {
        pname = "resistor-cube";
-       version = "0.0";
-       sha256 = "6c1eeaf029f0990b141dcdb7ba930bd3a16eb6b670a3d60cf83c0b37c65db269";
+       version = "0.0.0.3";
+       sha256 = "09f41cea22f4b0bbf2f32c80d8eab274a520d9fe611d1b83df4d14d46afb34ad";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base hmatrix transformers utility-ht
        ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/thielema/resistor-cube";
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resolve-trivial-conflicts" = callPackage
@@ -114358,8 +115004,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb";
-       version = "2.0.0.0";
-       sha256 = "cdc4aa7a96ffeb2804ee644aee58013915388de5a21979adaa7a27456c7bb125";
+       version = "2.1.0.2";
+       sha256 = "80689203aafcbf26b555952953012fc1a1272d2e28cd5dcc30fcceb50951fd07";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114369,9 +115015,8 @@ self: {
        ];
        executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
-       jailbreak = true;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
-       description = "A driver for RethinkDB 2.0";
+       description = "A driver for RethinkDB 2.1";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -114383,8 +115028,8 @@ self: {
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.19";
-       sha256 = "d1db41828f7290919cb25be67b86c8f5834266ab52485ffc6f638447ddf5f57b";
+       version = "0.0.20";
+       sha256 = "9cd46fed35bfb1b09283e9109e6da5d848b6e50794e4debe4819f3654d4b8381";
        libraryHaskellDepends = [
          aeson base binary bytestring hashable mtl network old-locale
          scientific template-haskell text time unordered-containers vector
@@ -114515,8 +115160,8 @@ self: {
      }:
      mkDerivation {
        pname = "reverse-geocoding";
-       version = "0.2.1";
-       sha256 = "1a05a7be8baff090de7f58f0a970ad9dc1a12cb76d050ead76f6c317b60b3721";
+       version = "0.2.2.1";
+       sha256 = "0c63a52ef6bd4f62b9b9fe0c16e279d3cf91326847da0f3c778a8e867c059b7c";
        libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
@@ -114781,7 +115426,7 @@ self: {
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "ripple" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base58address, binary
@@ -115037,7 +115682,7 @@ self: {
        homepage = "http://github.com/agrafix/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) rocksdb;};
+     }) {inherit (pkgs) rocksdb;};
 
   "roguestar" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-time
@@ -115623,8 +116268,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "rspp";
-       version = "0.1.0.0";
-       sha256 = "ec2e950158f8fdb0c9ba78778e2637a07a47b17b51d4cac5b3f2a0c43f349de6";
+       version = "0.1.0.1";
+       sha256 = "3e6771df48c5949c27d020d325295dbc322e0a1427db7f70bccf2552d73d5a8c";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "http://github.com/AJChapman/rspp";
@@ -115697,7 +116342,7 @@ self: {
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) rtl-sdr;};
+     }) {inherit (pkgs) rtl-sdr;};
 
   "rtorrent-rpc" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-textual
@@ -115746,14 +116391,14 @@ self: {
        sha256 = "d5b94ba1bc5422ab35556b56a2546047b08e895f592661a5363df37d94004496";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ rubberband ];
+       libraryPkgconfigDepends = [ rubberband ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) rubberband;};
+     }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, hspec, mtl
@@ -116222,7 +116867,7 @@ self: {
        ];
        description = "Cryptography that's easy to digest (NaCl/libsodium bindings)";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libsodium;};
+     }) {inherit (pkgs) libsodium;};
 
   "saltine-quickcheck" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, hex
@@ -116243,7 +116888,7 @@ self: {
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libsodium;};
+     }) {inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, fclabels
@@ -116413,7 +117058,7 @@ self: {
        homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "samtools-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, filepath, resourcet
@@ -116593,8 +117238,8 @@ self: {
      }:
      mkDerivation {
        pname = "satchmo";
-       version = "2.9.9";
-       sha256 = "7c4930eab38145ddd9e086e14b8061267e3d56358884a206e9b06d775a17918c";
+       version = "2.9.9.1";
+       sha256 = "3414dcc5184cd34bce55eb041ff84f8985672964c64786d146b9520237ee13e2";
        libraryHaskellDepends = [
          array async base bytestring containers deepseq directory hashable
          lens memoize minisat mtl process transformers
@@ -117398,6 +118043,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scotty-rest" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, convertible
+     , data-default-class, hspec, hspec-wai, http-date, http-media
+     , http-types, mtl, QuickCheck, scotty, string-conversions, text
+     , time, transformers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "scotty-rest";
+       version = "0.1.0.0";
+       sha256 = "4012c5bf50c1512e7053027fd0068df817b7710f294f24bb6563a4a0b73b1dfc";
+       libraryHaskellDepends = [
+         base base-prelude bytestring convertible data-default-class
+         http-date http-media http-types mtl scotty string-conversions text
+         time transformers wai wai-extra
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-wai mtl QuickCheck scotty
+         string-conversions text wai
+       ];
+       homepage = "http://github.com/ehamberg/scotty-rest";
+       description = "Webmachine-style REST library for scotty";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "scotty-session" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , crypto-api, http-types, scotty, stm, text, time, transformers
@@ -117634,7 +118303,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 ];
        description = "Low-level bindings to SDL2";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) SDL2;};
+     }) {inherit (pkgs) SDL2;};
 
   "sdl2-image" = callPackage
     ({ mkDerivation, base, SDL2, sdl2, SDL2_image }:
@@ -117647,7 +118316,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 SDL2_image ];
        description = "Haskell binding to sdl2-image";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_image;};
+     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-ttf" = callPackage
     ({ mkDerivation, base, SDL2, sdl2, SDL2_ttf }:
@@ -117660,7 +118329,7 @@ self: {
        testHaskellDepends = [ base sdl2 ];
        description = "Binding to libSDL2-ttf";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) SDL2;  inherit (pkgs) SDL2_ttf;};
+     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
@@ -117808,8 +118477,8 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.6.0.0";
-       sha256 = "fcfcf1aa3ac621abd651d9213b070d66ab638e2dfdaaf22e8bdaa0bf1c36e2f0";
+       version = "0.6.1.0";
+       sha256 = "fd57241ab24d7f752326573ea74240b168b1ff6168cf20b35af9d764368c5c72";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring binary bytestring clock conduit
          containers deepseq exceptions hashable hashtables hslogger http2
@@ -117829,7 +118498,7 @@ self: {
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "secret-santa" = callPackage
     ({ mkDerivation, base, containers, diagrams-cairo, diagrams-lib
@@ -117933,7 +118602,7 @@ self: {
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { sedna = null;};
+     }) {sedna = null;};
 
   "select" = callPackage
     ({ mkDerivation, base }:
@@ -118023,7 +118692,7 @@ self: {
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { selinux = null;};
+     }) {selinux = null;};
 
   "semaphore-plus" = callPackage
     ({ mkDerivation, base }:
@@ -118071,14 +118740,13 @@ self: {
      }:
      mkDerivation {
        pname = "semigroupoids";
-       version = "5.0.0.3";
-       sha256 = "17dc07085806c6b8c79863f489f0ad534713578a529935b081691830bab4d292";
+       version = "5.0.0.4";
+       sha256 = "cde047e36c4072dd32fcda5846155a3dd4e844f441e4c651b886ee069d95c7c9";
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
          distributive semigroups tagged transformers transformers-compat
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
@@ -118587,8 +119255,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-JuicyPixels";
-       version = "0.1.0.0";
-       sha256 = "12914a3047b8e0e00db4f2d37a4d6f3aee0d1aa93bb76e815fdf2282ccf4d4ba";
+       version = "0.2.0.0";
+       sha256 = "3b2da6980c0c35ef5f9dcce145b7d59f3134b418ee659b84794d6bb6c503e4b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -118900,9 +119568,11 @@ self: {
          acid-state base containers hspec mtl safecopy serversession
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serversession-backend-persistent" = callPackage
@@ -119087,12 +119757,12 @@ self: {
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
        pname = "set-cover";
-       version = "0.0.4";
-       sha256 = "7200a1908e0097d2336023404f16a5493bbb67d3afe3aef9508a9569a5a0430c";
+       version = "0.0.5";
+       sha256 = "a3a4b4f2099780fe5652036346d7dae2bf1db4a56e77e663ca6964312dec7c99";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers utility-ht ];
-       homepage = "http://code.haskell.org/~thielema/set-cover/";
+       homepage = "http://hub.darcs.net/thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119313,7 +119983,7 @@ self: {
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
-     }) { inherit (pkgs) libsndfile;  inherit (pkgs) openal;};
+     }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
 
   "sfmt" = callPackage
     ({ mkDerivation, base, bytestring, entropy, primitive }:
@@ -119382,13 +120052,12 @@ self: {
     ({ mkDerivation, base, binary, bytestring, io-streams, SHA }:
      mkDerivation {
        pname = "sha-streams";
-       version = "0.1.1";
-       sha256 = "5134e20354eb38b5b2b5a3eebe78b618ad70970c255b38e03fb91122ea6d5ae1";
+       version = "0.2.0";
+       sha256 = "de53ff3189b191d2217fe61b6c2142888e501eb0f9a35a4205d8528fcd648191";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base binary bytestring io-streams SHA ];
        executableHaskellDepends = [ base io-streams SHA ];
-       jailbreak = true;
        homepage = "https://github.com/noteed/sha-streams";
        description = "SHA hashes for io-streams";
        license = stdenv.lib.licenses.bsd3;
@@ -119647,6 +120316,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
   "shakespeare-css" = callPackage
@@ -120223,7 +120893,7 @@ self: {
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { gdk_x11 = null;  gtk_x11 = null;};
+     }) {gdk_x11 = null; gtk_x11 = null;};
 
   "sign" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, HUnit
@@ -120245,6 +120915,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "signal" = callPackage
+    ({ mkDerivation, base, unix }:
+     mkDerivation {
+       pname = "signal";
+       version = "0.1.0.2";
+       sha256 = "80643e609ce60d9be49c13cf2a11b6ed948248de413434a162f3253c66f901fe";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base unix ];
+       executableHaskellDepends = [ base ];
+       jailbreak = true;
+       homepage = "http://github.com/pmlodawski/signal";
+       description = "Multiplatform signal support for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "signals" = callPackage
     ({ mkDerivation, array, base, constraints, containers, data-reify
      , exception-mtl, exception-transformers, language-c-quote
@@ -120397,7 +121083,7 @@ self: {
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { bluetooth = null;};
+     }) {bluetooth = null;};
 
   "simple-c-value" = callPackage
     ({ mkDerivation, base, checkers, DebugTraceHelpers, derive, dlist
@@ -121023,7 +121709,7 @@ self: {
        description = "Simple wrapper around libssh2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { ssh2 = null;};
+     }) {ssh2 = null;};
 
   "simplex" = callPackage
     ({ mkDerivation, base, directory, filepath, mtl, process, random
@@ -121116,7 +121802,7 @@ self: {
        description = "A programming language for simple GUIs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libXft;};
+     }) {inherit (pkgs.xlibs) libXft;};
 
   "singleton-nats" = callPackage
     ({ mkDerivation, base, singletons }:
@@ -121399,7 +122085,7 @@ self: {
        description = "Export Skype chat logs to text files";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { ghc-binary = null;};
+     }) {ghc-binary = null;};
 
   "slack" = callPackage
     ({ mkDerivation, aeson, base, containers, either, http-conduit, mtl
@@ -121521,23 +122207,25 @@ self: {
      }) {};
 
   "sloane" = callPackage
-    ({ mkDerivation, ansi-terminal, base, bytestring, cereal
-     , containers, directory, download-curl, filepath, HTTP, network
-     , optparse-applicative, stringsearch, terminal-size, text, zlib
+    ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
+     , bloomfilter, bytestring, conduit, conduit-extra, containers
+     , directory, filepath, http-conduit, http-types
+     , optparse-applicative, stringsearch, terminal-size, text
+     , transformers
      }:
      mkDerivation {
        pname = "sloane";
-       version = "2.0.5";
-       sha256 = "29225cd58923e0b595e6920ba035f359766f588747d9d7f4022c4d610bf7b6ca";
+       version = "4.0.1";
+       sha256 = "015cc227cab7e205c0684821138f36d4d38a9fee893fbf23d13add0e27ec19e9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         ansi-terminal base bytestring cereal containers directory
-         download-curl filepath HTTP network optparse-applicative
-         stringsearch terminal-size text zlib
+         aeson ansi-terminal attoparsec base bloomfilter bytestring conduit
+         conduit-extra containers directory filepath http-conduit http-types
+         optparse-applicative stringsearch terminal-size text transformers
        ];
        homepage = "http://github.com/akc/sloane";
-       description = "A command line interface to Sloane's On-Line Encyclopedia of Integer Sequences";
+       description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -121812,6 +122500,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smsaero" = callPackage
+    ({ mkDerivation, aeson, base, either, servant, servant-client, text
+     , time
+     }:
+     mkDerivation {
+       pname = "smsaero";
+       version = "0.1.1";
+       sha256 = "d6d37cae946a2bdea1f4e5d05b3bcde56ee12362c72f490bf138ca3b8d9446d3";
+       libraryHaskellDepends = [
+         aeson base either servant servant-client text time
+       ];
+       homepage = "https://github.com/GetShopTV/smsaero";
+       description = "SMSAero API and HTTP client based on servant library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "smt-lib" = callPackage
     ({ mkDerivation, array, base, directory, polyparse }:
      mkDerivation {
@@ -121832,6 +122536,8 @@ self: {
        pname = "smtLib";
        version = "1.0.7";
        sha256 = "6e660125d16c7ad42120df7fb0bd53d1d0614532ed3956aa34f6bcd3413ac2ca";
+       revision = "1";
+       editedCabalFile = "7a1d7c3e0e90bddb41538fa724f410e2a6915793ab14df4dfc4074c9d09d448e";
        libraryHaskellDepends = [ base pretty ];
        description = "A library for working with the SMTLIB format";
        license = stdenv.lib.licenses.bsd3;
@@ -122071,10 +122777,8 @@ self: {
      }:
      mkDerivation {
        pname = "snap-core";
-       version = "0.9.7.2";
-       sha256 = "526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651";
-       revision = "1";
-       editedCabalFile = "d39520edcc970d9d1f683af9631ccbcad39536b9f88040b93efb66cbe7aefc55";
+       version = "0.9.8.0";
+       sha256 = "47310fcd9c347883f5985c27c1fbcfac8c5783472a01afcc720bcc850622d2db";
        libraryHaskellDepends = [
          attoparsec attoparsec-enumerator base blaze-builder
          blaze-builder-enumerator bytestring bytestring-mmap
@@ -122322,6 +123026,7 @@ self: {
        libraryHaskellDepends = [
          acid-state base mtl snap text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
@@ -122736,10 +123441,8 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-postgresql-simple";
-       version = "0.6.0.2";
-       sha256 = "b792889664db48fda8bafe5dbf306bf060ffbf0837daac4ef3ddec59534fa677";
-       revision = "2";
-       editedCabalFile = "cfc56ee20478bf05a650bdcb457b606a640daa71b84a3a2a3bdb8930dcbbeb7b";
+       version = "0.6.0.3";
+       sha256 = "0f4c86c9d94560a1e12af151a7ab9bb7e21f10c70ddb5403ae8503dd1a0cf866";
        libraryHaskellDepends = [
          base bytestring clientsession configurator errors lens
          MonadCatchIO-transformers mtl postgresql-simple
@@ -123062,7 +123765,7 @@ self: {
        homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) snappy;};
+     }) {inherit (pkgs) snappy;};
 
   "snappy-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, snappy }:
@@ -123199,8 +123902,8 @@ self: {
      }:
      mkDerivation {
        pname = "snmp";
-       version = "0.2.0.0";
-       sha256 = "c7b8da17a08c7960c3494da4757fe059e87a4f215927e6f6977a47a2b4bc4b6e";
+       version = "0.2.1.1";
+       sha256 = "0737d6fc4299a00d248d263ebdde7b3451f32da3f9a6f5afac0a125eb57384a4";
        libraryHaskellDepends = [
          asn1-encoding asn1-parse asn1-types async base binary bytestring
          cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl
@@ -123415,7 +124118,7 @@ self: {
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { sctp = null;};
+     }) {sctp = null;};
 
   "socketio" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base
@@ -123728,7 +124431,7 @@ self: {
        description = "Write, read, convert audio signals using libsox";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) sox;};
+     }) {inherit (pkgs) sox;};
 
   "soyuz" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cmdargs, containers
@@ -124175,7 +124878,7 @@ self: {
        description = "Experimental web browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) libsoup;};
+     }) {inherit (pkgs.gnome) libsoup;};
 
   "spine" = callPackage
     ({ mkDerivation, base }:
@@ -124648,7 +125351,7 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "sqlite-simple" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder
@@ -124707,8 +125410,8 @@ self: {
      }:
      mkDerivation {
        pname = "squeeze";
-       version = "1.0.4.4";
-       sha256 = "c4865b707eeda4e8a8588a1ce7aa835128c7dc1c0506b9f4689ced5f5852d1a2";
+       version = "1.0.4.5";
+       sha256 = "9079a9e9163b27612c4625542bcd530766576e1d43e496c21cc42ffdbf3c6231";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125168,8 +125871,8 @@ self: {
      , classy-prelude-conduit, conduit, conduit-extra, containers
      , cryptohash, cryptohash-conduit, data-default-class, directory
      , filepath, hspec, html-conduit, http-client, http-client-tls
-     , http-conduit, mime-types, monad-unlift, mono-traversable, mtl
-     , old-locale, optparse-applicative, optparse-simple, process
+     , http-conduit, lucid, mime-types, monad-unlift, mono-traversable
+     , mtl, old-locale, optparse-applicative, optparse-simple, process
      , QuickCheck, resourcet, semigroups, stackage-cli, stackage-install
      , stackage-metadata, stackage-types, stackage-update, stm
      , streaming-commons, system-fileio, system-filepath, tar, temporary
@@ -125178,8 +125881,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.10.0";
-       sha256 = "36610b312932a3c348dba4f2b93fb0242312d54e729e1a522964c5b5527d9a36";
+       version = "0.11.0";
+       sha256 = "4e6946926728bbc91d9897e81f43c4dc5f9efa886bba51068014a78576bf754d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125187,12 +125890,12 @@ self: {
          base16-bytestring blaze-html byteable bytestring Cabal
          classy-prelude-conduit conduit conduit-extra containers cryptohash
          cryptohash-conduit data-default-class directory filepath
-         html-conduit http-client http-client-tls http-conduit mime-types
-         monad-unlift mono-traversable mtl old-locale process resourcet
-         semigroups stackage-install stackage-metadata stackage-types stm
-         streaming-commons system-fileio system-filepath tar temporary text
-         time transformers unix-compat utf8-string xml-conduit xml-types
-         yaml zlib
+         html-conduit http-client http-client-tls http-conduit lucid
+         mime-types monad-unlift mono-traversable mtl old-locale process
+         resourcet semigroups stackage-install stackage-metadata
+         stackage-types stm streaming-commons system-fileio system-filepath
+         tar temporary text time transformers unix-compat utf8-string
+         xml-conduit xml-types yaml zlib
        ];
        executableHaskellDepends = [
          base http-client http-client-tls optparse-applicative
@@ -125202,7 +125905,6 @@ self: {
          base Cabal classy-prelude-conduit containers hspec http-client
          http-client-tls QuickCheck text yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/fpco/stackage";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
@@ -125560,7 +126262,7 @@ self: {
        description = "The ST monad and STRefs";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { applicative = null;};
+     }) {applicative = null;};
 
   "statgrab" = callPackage
     ({ mkDerivation, async, base, bytestring, statgrab, time
@@ -125578,7 +126280,7 @@ self: {
        description = "Collect system level metrics and statistics";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { statgrab = null;};
+     }) {statgrab = null;};
 
   "static-canvas" = callPackage
     ({ mkDerivation, base, double-conversion, free, mtl, text }:
@@ -125871,7 +126573,6 @@ self: {
        homepage = "https://github.com/schell/steeloverseer";
        description = "A file watcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stemmer" = callPackage
@@ -126487,17 +127188,32 @@ self: {
      }) {};
 
   "streaming" = callPackage
-    ({ mkDerivation, base, ghc-prim, mmorph, mtl, transformers }:
+    ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "streaming";
-       version = "0.1.0.6";
-       sha256 = "604014b7d23181e7906b81a9bca1829f8e63b8e3dc690709a7d5c348d0ff3af9";
-       libraryHaskellDepends = [ base ghc-prim mmorph mtl transformers ];
+       version = "0.1.0.11";
+       sha256 = "824351fc0c99bd5141ad4fef9db85032c5fb4d5cd745b9aca1490ea4dbfccf06";
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/michaelt/streaming";
        description = "A free monad transformer optimized for streaming applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, mmorph, mtl, streaming
+     , transformers
+     }:
+     mkDerivation {
+       pname = "streaming-bytestring";
+       version = "0.1.0.2";
+       sha256 = "cae7ee4205506ab7aa22904a4a055249f8225c5d6c4049313a09ce219ba98985";
+       libraryHaskellDepends = [
+         base bytestring deepseq mmorph mtl streaming transformers
+       ];
+       description = "effectful bytestrings, or: lazy bytestring done right";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-commons" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
@@ -126545,6 +127261,7 @@ self: {
        homepage = "http://github.com/peti/streamproc";
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
   "streams" = callPackage
@@ -126924,6 +127641,7 @@ self: {
          aeson base bytestring either HsOpenSSL hspec http-streams random
          text time transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -127510,7 +128228,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) librsvg;};
+     }) {inherit (pkgs) librsvg;};
 
   "svgutils" = callPackage
     ({ mkDerivation, base, filepath, xml }:
@@ -127624,7 +128342,7 @@ self: {
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) tokyocabinet;};
+     }) {inherit (pkgs) tokyocabinet;};
 
   "swearjure" = callPackage
     ({ mkDerivation, attoparsec, base, containers, fixplate, mtl
@@ -127711,8 +128429,8 @@ self: {
      }:
      mkDerivation {
        pname = "sws";
-       version = "0.3.1.1";
-       sha256 = "8dc76a7b25543ea8006553817d19ad8217fca38f7fa037213fcb304e0b2cd42a";
+       version = "0.3.1.2";
+       sha256 = "e86be4df4f505f7f6eab69957ae3843455fbce9e13dd211ee65cff034449240c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -127961,7 +128679,7 @@ self: {
        description = "Similar code analysis";
        license = "unknown";
        broken = true;
-     }) { Synt = null;};
+     }) {Synt = null;};
 
   "syntactic" = callPackage
     ({ mkDerivation, base, constraints, containers, data-hash, deepseq
@@ -128254,7 +128972,7 @@ self: {
        description = "Audio signal processing with dynamic physical dimensions";
        license = "GPL";
        broken = true;
-     }) { UniqueLogicNP = null;};
+     }) {UniqueLogicNP = null;};
 
   "synthesizer-llvm" = callPackage
     ({ mkDerivation, base, containers, event-list, filepath, llvm-extra
@@ -128551,7 +129269,7 @@ self: {
        description = "Various system utils lifted to EitherT";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { easy-data = null;};
+     }) {easy-data = null;};
 
   "system-uuid" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, libossp_uuid
@@ -128576,7 +129294,7 @@ self: {
        homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) libossp_uuid;};
+     }) {inherit (pkgs) libossp_uuid;};
 
   "systemd" = callPackage
     ({ mkDerivation, base, bytestring, network, transformers, unix }:
@@ -129003,7 +129721,7 @@ self: {
        libraryPkgconfigDepends = [ taglib ];
        description = "Binding to TagLib (ID3 tag library)";
        license = "LGPL";
-     }) { inherit (pkgs) taglib;};
+     }) {inherit (pkgs) taglib;};
 
   "taglib-api" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, taglib, text
@@ -129020,7 +129738,7 @@ self: {
        jailbreak = true;
        description = "An FFI layer over TagLib's C bindings";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) taglib;};
+     }) {inherit (pkgs) taglib;};
 
   "tagset-positional" = callPackage
     ({ mkDerivation, base, binary, containers, parsec, text
@@ -129155,7 +129873,7 @@ self: {
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { clntsh = null;  sqlplus = null;};
+     }) {clntsh = null; sqlplus = null;};
 
   "tamarin-prover" = callPackage
     ({ mkDerivation, aeson, array, base, binary, blaze-builder
@@ -129376,7 +130094,6 @@ self: {
        ];
        description = "Manage pools of possibly interdependent tasks using STM and async";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty" = callPackage
@@ -129436,18 +130153,18 @@ self: {
      }) {};
 
   "tasty-hspec" = callPackage
-    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random, tasty
-     , tasty-quickcheck, tasty-smallcheck
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
+     , tagged, tasty, tasty-quickcheck, tasty-smallcheck
      }:
      mkDerivation {
        pname = "tasty-hspec";
-       version = "1.1";
-       sha256 = "260ae081474e173e957fc268455520aba320536a0495656609acbd499c349e96";
+       version = "1.1.2";
+       sha256 = "69c5409e70694e8ba5791aaeb272e34af37cd28665c6d1c1f742cc7f053fab67";
        libraryHaskellDepends = [
-         base hspec hspec-core QuickCheck random tasty tasty-quickcheck
-         tasty-smallcheck
+         base hspec hspec-core QuickCheck random tagged tasty
+         tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "http://github.com/mitchellwrosen/tasty-hspec";
+       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
        description = "Hspec support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129626,6 +130343,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-tap" = callPackage
+    ({ mkDerivation, base, containers, directory, stm, tasty
+     , tasty-golden, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "tasty-tap";
+       version = "0.0.2";
+       sha256 = "e4390ec7d63393909aa46da9346dc1abc9a4eafa4b82923b6ba776d0777784b7";
+       libraryHaskellDepends = [ base containers stm tasty ];
+       testHaskellDepends = [
+         base directory tasty tasty-golden tasty-hunit
+       ];
+       homepage = "https://github.com/michaelxavier/tasty-tap";
+       description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tasty-th" = callPackage
     ({ mkDerivation, base, language-haskell-extract, tasty
      , template-haskell
@@ -129850,7 +130584,6 @@ self: {
        homepage = "https://github.com/phaazon/tellbot";
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template" = callPackage
@@ -130248,7 +130981,7 @@ self: {
        homepage = "https://github.com/judah/terminfo";
        description = "Haskell bindings to the terminfo library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "terminfo-hs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
@@ -130264,7 +130997,6 @@ self: {
        testHaskellDepends = [ base directory errors filepath QuickCheck ];
        description = "A pure-Haskell (no FFI) module for accessing terminfo databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terrahs" = callPackage
@@ -130280,7 +131012,7 @@ self: {
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { terralib4c = null;  translib = null;};
+     }) {terralib4c = null; translib = null;};
 
   "tersmu" = callPackage
     ({ mkDerivation, base, containers, mtl, process, syb, transformers
@@ -130360,6 +131092,8 @@ self: {
        pname = "test-framework-hunit";
        version = "0.3.0.1";
        sha256 = "d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0";
+       revision = "1";
+       editedCabalFile = "ef6155a767dc221d6f4dd2740fc79f5f4525b67e4cbb5c0ef3e5503d69594b29";
        libraryHaskellDepends = [
          base extensible-exceptions HUnit test-framework
        ];
@@ -130942,7 +131676,7 @@ self: {
        homepage = "https://github.com/bos/text-icu";
        description = "Bindings to the ICU library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) icu;};
+     }) {inherit (pkgs) icu;};
 
   "text-icu-translit" = callPackage
     ({ mkDerivation, base, icu, QuickCheck, test-framework
@@ -130960,7 +131694,7 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) icu;};
+     }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
     ({ mkDerivation, base, haskell-src-meta, json, json-qq, parsec
@@ -131706,6 +132440,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-traced" = callPackage
+    ({ mkDerivation, base, containers, mtl, template-haskell }:
+     mkDerivation {
+       pname = "th-traced";
+       version = "0.0.1.0";
+       sha256 = "e267a20fa11bd42a4c4018cc428051089225514f11e38ad1821842f03abbb0c2";
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
+       homepage = "https://github.com/konn/th-traced";
+       description = "Tracing Q monad computation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "th-typegraph" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
@@ -131777,7 +132523,6 @@ self: {
        homepage = "http://github.com/bennofs/themplate/";
        description = "Project templating tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "theoremquest" = callPackage
@@ -131809,23 +132554,24 @@ self: {
 
   "these" = callPackage
     ({ mkDerivation, base, bifunctors, containers, mtl, profunctors
-     , semigroupoids, semigroups, transformers, vector
+     , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck
+     , transformers, vector
      }:
      mkDerivation {
        pname = "these";
-       version = "0.4.2";
-       sha256 = "e732b9c0af7bfc7ae2aad97383d560d909b503ddb2fadbb6f5938679404c4543";
-       revision = "1";
-       editedCabalFile = "02eb71fed8c848cc4f94f1181f09a6f9667caac38746f757bd57ca881aa47629";
+       version = "0.6.0.0";
+       sha256 = "c8e94f28561e87a1c51498a8529a74983fe68d785b250c118d02a9a25d1b9383";
        libraryHaskellDepends = [
          base bifunctors containers mtl profunctors semigroupoids semigroups
          transformers vector
        ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base bifunctors QuickCheck tasty tasty-quickcheck transformers
+         vector
+       ];
        homepage = "https://github.com/isomorphism/these";
        description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thespian" = callPackage
@@ -132192,7 +132938,6 @@ self: {
        homepage = "https://github.com/koterpillar/tianbar";
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tic-tac-toe" = callPackage
@@ -132546,7 +133291,6 @@ self: {
        homepage = "https://bitbucket.org/jfmueller/time-patterns";
        description = "Patterns for recurring events";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-qq" = callPackage
@@ -133070,19 +133814,19 @@ self: {
      }) {};
 
   "tls" = callPackage
-    ({ mkDerivation, asn1-encoding, asn1-types, async, base, byteable
-     , bytestring, cereal, cryptonite, data-default-class, hourglass
-     , memory, mtl, network, QuickCheck, tasty, tasty-quickcheck
-     , transformers, x509, x509-store, x509-validation
+    ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring
+     , cereal, cryptonite, data-default-class, hourglass, memory, mtl
+     , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509
+     , x509-store, x509-validation
      }:
      mkDerivation {
        pname = "tls";
-       version = "1.3.1";
-       sha256 = "747f840677115d077ef548b4da54acb479253ce3cb58ad3a03275fe2b452d5d0";
+       version = "1.3.2";
+       sha256 = "e9f2d3685b4731cb865a1d9ea9a2ddd5dce5393c49d8fd89dd9e00e8b0e06ce4";
        libraryHaskellDepends = [
-         asn1-encoding asn1-types async base byteable bytestring cereal
-         cryptonite data-default-class memory mtl network transformers x509
-         x509-store x509-validation
+         asn1-encoding asn1-types async base bytestring cereal cryptonite
+         data-default-class memory mtl network transformers x509 x509-store
+         x509-validation
        ];
        testHaskellDepends = [
          base bytestring cereal cryptonite data-default-class hourglass mtl
@@ -133352,7 +134096,7 @@ self: {
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) tokyocabinet;};
+     }) {inherit (pkgs) tokyocabinet;};
 
   "tokyotyrant-haskell" = callPackage
     ({ mkDerivation, base, bytestring, mtl, tokyocabinet, tokyotyrant
@@ -133366,7 +134110,7 @@ self: {
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) tokyocabinet;  inherit (pkgs) tokyotyrant;};
+     }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
     ({ mkDerivation, base, OpenAL, stm, vector }:
@@ -133875,6 +134619,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "transient" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, HTTP, mtl
+     , network, network-info, process, random, stm, transformers
+     }:
+     mkDerivation {
+       pname = "transient";
+       version = "0.1.0.4";
+       sha256 = "d12bf8fdbe05966d67ba0966bcf9eff6b637dce128b18424c1b250108cf86468";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath HTTP mtl network network-info
+         process random stm transformers
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath HTTP mtl network random stm
+         transformers
+       ];
+       homepage = "http://www.fpcomplete.com/user/agocorona";
+       description = "A monad for extensible effects and primitives for unrestricted composability of applications";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "translatable-intset" = callPackage
     ({ mkDerivation, base, fingertree }:
      mkDerivation {
@@ -134388,8 +135155,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.4.0.3";
-       sha256 = "2de9817bfeee47ea168194862a2fa27c86bff3c7f5063537394c38851f7ed757";
+       version = "1.4.0.4";
+       sha256 = "b3e15148fa1090cdffaa91094aadedb6f80ad70ebcf9740e27d2c5256147a260";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -135874,7 +136641,7 @@ self: {
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) icu;};
+     }) {inherit (pkgs) icu;};
 
   "udbus" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, containers
@@ -135939,7 +136706,7 @@ self: {
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libudev = null;};
+     }) {libudev = null;};
 
   "uglymemo" = callPackage
     ({ mkDerivation, base, containers }:
@@ -136402,7 +137169,7 @@ self: {
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) icu;};
+     }) {inherit (pkgs) icu;};
 
   "unicode-prelude" = callPackage
     ({ mkDerivation, base }:
@@ -136487,14 +137254,14 @@ self: {
        description = "Uniform IO over files, network, watever";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) openssl;};
+     }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
     ({ mkDerivation, base, ShowF }:
      mkDerivation {
        pname = "uniform-pair";
-       version = "0.1.5";
-       sha256 = "014187360a2aa088c507773bc4b7144e945b7e1944cf2e1d88b79f0e6b87737e";
+       version = "0.1.8";
+       sha256 = "1668512c64d71f299a4b3f477dbf1b027cf38e65e4892c68cda3ca7f3d98e316";
        libraryHaskellDepends = [ base ShowF ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
@@ -136606,6 +137373,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unit" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "unit";
+       version = "0.1.0.0";
+       sha256 = "0747cc0c3a8e6bb64343b79c079702757d81f63ae2bc7dd76727b8bcee8edc74";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/cxfreeio/unit#readme";
+       description = "Aliases for ()";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "units" = callPackage
     ({ mkDerivation, base, containers, HUnit-approx, mtl, multimap
      , singletons, syb, tasty, tasty-hunit, template-haskell, th-desugar
@@ -137149,6 +137929,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uom-plugin" = callPackage
+    ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra, tasty
+     , tasty-hunit, template-haskell, units-parser
+     }:
+     mkDerivation {
+       pname = "uom-plugin";
+       version = "0.1.0.0";
+       sha256 = "34c00b7e48152e654ae0dfeaf74a12c9fd037549489f2a13e7e9534994bb3a38";
+       libraryHaskellDepends = [
+         base containers ghc ghc-tcplugins-extra template-haskell
+         units-parser
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "https://github.com/adamgundry/uom-plugin";
+       description = "Units of measure as a GHC typechecker plugin";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "up" = callPackage
     ({ mkDerivation, base, directory, filepath, lambda-options, mtl
      , split
@@ -137280,8 +138078,8 @@ self: {
      }:
      mkDerivation {
        pname = "uri-bytestring";
-       version = "0.1.6";
-       sha256 = "46c6d0d84fcaca2ada708b9e7421fb9529619287696c6b44c755c8dcb32ce473";
+       version = "0.1.7";
+       sha256 = "e29aef1ce933239fc3183e785d42f3b1f86478efc4df00f7582e97140d3a5968";
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring
        ];
@@ -137795,8 +138593,8 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "utf8-string";
-       version = "1";
-       sha256 = "79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08";
+       version = "1.0.1.1";
+       sha256 = "fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
@@ -137807,8 +138605,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "utility-ht";
-       version = "0.0.10";
-       sha256 = "ad8399180f495e6bb30e416a67a43d1bf82a7dd99293badd6e0d7674c1facd9f";
+       version = "0.0.11";
+       sha256 = "5cdcc5c1eab4029d18f1712472d69b61265c2d543a8065e1e9762b1ddc235812";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
        description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
@@ -138854,16 +139652,14 @@ self: {
     ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
      mkDerivation {
        pname = "vector-fftw";
-       version = "0.1.3.2";
-       sha256 = "a0bab8a9466856583b59fd40337337d2cd57995aeb3d89d3e2e4f2e80dcadb65";
+       version = "0.1.3.3";
+       sha256 = "131d88fa9ea17e7e46a6d886f37e77282e8e95f2022ccefd2cf11adeca0b9172";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ fftw ];
-       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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) fftw;};
+     }) {inherit (pkgs) fftw;};
 
   "vector-functorlazy" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive, vector, vector-th-unbox
@@ -139206,7 +140002,6 @@ self: {
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimus" = callPackage
@@ -139235,7 +140030,7 @@ self: {
        ];
        description = "An MPD client with vim-like key bindings";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) ncurses;};
+     }) {inherit (pkgs) ncurses;};
 
   "vintage-basic" = callPackage
     ({ mkDerivation, array, base, directory, filepath, HUnit, mtl
@@ -139546,7 +140341,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs.gnome) vte;};
+     }) {inherit (pkgs.gnome) vte;};
 
   "vtegtk3" = callPackage
     ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, pango, vte }:
@@ -139562,7 +140357,7 @@ self: {
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.gnome) vte;};
+     }) {inherit (pkgs.gnome) vte;};
 
   "vty" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
@@ -139656,7 +140451,6 @@ self: {
        homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-ui-extras" = callPackage
@@ -139951,7 +140745,7 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Wai handler to fastcgi";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) fcgi;};
+     }) {inherit (pkgs) fcgi;};
 
   "wai-handler-launch" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, http-types
@@ -140013,7 +140807,7 @@ self: {
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { QtWebKit = null;};
+     }) {QtWebKit = null;};
 
   "wai-hastache" = callPackage
     ({ mkDerivation, base, bytestring, hastache, http-types
@@ -140359,7 +141153,6 @@ self: {
        homepage = "https://github.com/Helkafen/wai-middleware-metrics";
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -140464,17 +141257,17 @@ self: {
      }) {};
 
   "wai-middleware-throttle" = callPackage
-    ({ mkDerivation, base, bytestring, containers, hlint, hspec
-     , http-types, HUnit, network, stm, token-bucket, transformers, wai
-     , wai-extra
+    ({ mkDerivation, base, bytestring, containers, hashable, hlint
+     , hspec, http-types, HUnit, network, stm, token-bucket
+     , transformers, wai, wai-extra
      }:
      mkDerivation {
        pname = "wai-middleware-throttle";
-       version = "0.2.0.1";
-       sha256 = "56b55cdb8e081693c35b35791a59b155a91a628e205c9645cbe9d160176b1d23";
+       version = "0.2.0.2";
+       sha256 = "b38b28d2a2dcda631cf12ff066343539986028106867594dbf07efe40e81d712";
        libraryHaskellDepends = [
-         base containers http-types network stm token-bucket transformers
-         wai
+         base containers hashable http-types network stm token-bucket
+         transformers wai
        ];
        testHaskellDepends = [
          base bytestring hlint hspec http-types HUnit stm transformers wai
@@ -140570,18 +141363,24 @@ self: {
      }) {};
 
   "wai-routes" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
-     , http-types, monad-loops, mtl, path-pieces, random
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, data-default-class
+     , filepath, hspec, hspec-wai, hspec-wai-json, http-types
+     , mime-types, monad-loops, mtl, path-pieces, random
      , template-haskell, text, wai
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.7.3";
-       sha256 = "92d694a9b63b8f34e1e62f5f29b65cb85566eeb9cad90b7dd34689bc296b139b";
+       version = "0.8.1";
+       sha256 = "0ebdf952830d550a6f56bf048ae7f554c88ab8fa0f3a3b613569f620133d41d2";
        libraryHaskellDepends = [
-         aeson base blaze-builder bytestring containers http-types
+         aeson base blaze-builder bytestring case-insensitive containers
+         cookie data-default-class filepath http-types mime-types
          monad-loops mtl path-pieces random template-haskell text wai
        ];
+       testHaskellDepends = [
+         aeson base hspec hspec-wai hspec-wai-json wai
+       ];
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
@@ -140915,8 +141714,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp-tls";
-       version = "3.1.1";
-       sha256 = "5e9a75cc877f52053c5e1ceb15427ac28bf9937750336af0f71569b4e9e213bd";
+       version = "3.1.2";
+       sha256 = "3940708b273b195eefdeeb63448fcb121ead5a010cad04f1c3ab4bd7470e34a2";
        libraryHaskellDepends = [
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
@@ -141545,7 +142344,7 @@ self: {
        description = "Parser and Pretty Printer for the Web IDL Language";
        license = stdenv.lib.licenses.bsd3;
        broken = true;
-     }) { LEXER = null;};
+     }) {LEXER = null;};
 
   "webify" = callPackage
     ({ mkDerivation, base, binary, binary-strict, blaze-builder
@@ -141585,7 +142384,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) webkit;};
+     }) {inherit (pkgs) webkit;};
 
   "webkit-javascriptcore" = callPackage
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, webkit }:
@@ -141616,7 +142415,7 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
-     }) { inherit (pkgs) webkit;};
+     }) {inherit (pkgs) webkit;};
 
   "webkitgtk3-javascriptcore" = callPackage
     ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, webkit
@@ -141631,7 +142430,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) webkit;};
+     }) {inherit (pkgs) webkit;};
 
   "webpage" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, hastache, lucid
@@ -141946,6 +142745,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "why3" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
+     , directory, filepath, happy, monadLib, pretty, pretty-show
+     , profunctors, text
+     }:
+     mkDerivation {
+       pname = "why3";
+       version = "0.8";
+       sha256 = "8e2d6d29c6fd6f0ecd72a28c3075843533db6a086c67a2a9a520f0dcc916fbf5";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath
+         monadLib pretty pretty-show profunctors text
+       ];
+       libraryToolDepends = [ alex happy ];
+       description = "Haskell support for the Why3 input format";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "wikipedia4epub" = callPackage
     ({ mkDerivation, base, bytestring, directory, epub, filepath
      , haskell98, HTTP, network, regex-base, regex-posix, tagsoup, url
@@ -142029,7 +142846,7 @@ self: {
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { kernel32 = null;  ws2_32 = null;};
+     }) {kernel32 = null; ws2_32 = null;};
 
   "wiring" = callPackage
     ({ mkDerivation, base, hspec, mtl, QuickCheck, template-haskell
@@ -142037,8 +142854,8 @@ self: {
      }:
      mkDerivation {
        pname = "wiring";
-       version = "0.3.0";
-       sha256 = "1d99c9604d179b61687f2bec82c97dd6665fba4ea024271806abae82bb79fd30";
+       version = "0.4.1";
+       sha256 = "b2a6e2ac3299d109244432dbdce4094d9967f10916c31a3df5a7bf6fbcc67b01";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base hspec mtl QuickCheck template-haskell transformers
@@ -142214,7 +143031,7 @@ self: {
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { wlc = null;};
+     }) {wlc = null;};
 
   "wobsurv" = callPackage
     ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring
@@ -142755,12 +143572,12 @@ self: {
      }) {};
 
   "wx" = callPackage
-    ({ mkDerivation, base, stm, wxcore }:
+    ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
        pname = "wx";
-       version = "0.91.0.0";
-       sha256 = "5eba8936c4e783bb0d97ea8b8bc4140a0ff13e7529f5a2c2e1be63b707936c8c";
-       libraryHaskellDepends = [ base stm wxcore ];
+       version = "0.92.0.0";
+       sha256 = "7a649a4445aaf4681e1c2c9e0b664bce656cc4700a527af8596920019d3295e4";
+       libraryHaskellDepends = [ base stm time wxcore ];
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
@@ -142802,19 +143619,19 @@ self: {
     ({ mkDerivation, base, libX11, mesa, wxdirect, wxGTK }:
      mkDerivation {
        pname = "wxc";
-       version = "0.91.0.0";
-       sha256 = "4a8fb2ce231222dec30c40b6f6eae2afc14485a0b4376f7fa49e3624a0582a6a";
+       version = "0.92.0.0";
+       sha256 = "ed5872f17e05055abaf4427f45f32d817b0f9be0352432fc3ffd08b65305a8dc";
        libraryHaskellDepends = [ base wxdirect ];
        librarySystemDepends = [ libX11 mesa ];
        libraryPkgconfigDepends = [ wxGTK ];
        doHaddock = false;
-       postInstall = "cp -v dist/build/libwxc.so.0.91.0.0 $out/lib/libwxc.so";
+       postInstall = "cp -v dist/build/libwxc.so.0.92.0.0 $out/lib/libwxc.so";
        postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
-     }) { inherit (pkgs.xlibs) libX11;  inherit (pkgs) mesa;
-          inherit (pkgs) wxGTK;};
+     }) {inherit (pkgs.xlibs) libX11; inherit (pkgs) mesa; 
+         inherit (pkgs) wxGTK;};
 
   "wxcore" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
@@ -142822,8 +143639,8 @@ self: {
      }:
      mkDerivation {
        pname = "wxcore";
-       version = "0.91.0.0";
-       sha256 = "7f52bcb0412f50fa77677a7fe9d45d087a2c9d623b89c03d9d327a18b557fb06";
+       version = "0.92.0.0";
+       sha256 = "332a68b658be7eeca62e9992dd01d26016a3f24e6666e803107291a3c71145b9";
        libraryHaskellDepends = [
          array base bytestring containers directory filepath parsec stm time
          wxc wxdirect
@@ -142832,7 +143649,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
-     }) { inherit (pkgs) wxGTK;};
+     }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, parsec
@@ -142840,14 +143657,13 @@ self: {
      }:
      mkDerivation {
        pname = "wxdirect";
-       version = "0.91.0.0";
-       sha256 = "475c9f977576f1ea881461d7ac729caa71c0b5958db8500fab9b3de57ddcb49f";
+       version = "0.92.0.0";
+       sha256 = "b13687de38402df779780db1bc410f02a6ae6815d3e984b702d2c7c4be799ec8";
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [
          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;
@@ -142974,7 +143790,7 @@ self: {
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs.xlibs) libXi;};
+     }) {inherit (pkgs.xlibs) libXi;};
 
   "x509" = callPackage
     ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base
@@ -143091,7 +143907,7 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) attr;};
+     }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
     ({ mkDerivation, base, old-time, select, X11 }:
@@ -143127,8 +143943,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.3.5";
-       sha256 = "9e5a1c67a4879bbb4a2fbe2232d4ab508db34810e6ebec063e4621a817032566";
+       version = "0.3.6";
+       sha256 = "69941191e5be3671555670f1894cdd30a44e8e9b303561fee87c5f84f9bbe251";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -143254,7 +144070,7 @@ self: {
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libxfconf-0 = null;};
+     }) {libxfconf-0 = null;};
 
   "xformat" = callPackage
     ({ mkDerivation, base }:
@@ -143397,7 +144213,7 @@ self: {
        description = "Bindings to xine-lib";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { libxine = null;  xine = null;};
+     }) {libxine = null; xine = null;};
 
   "xing-api" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
@@ -143457,7 +144273,7 @@ self: {
        testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) libxkbcommon;};
+     }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HTTP
@@ -143714,12 +144530,11 @@ self: {
     ({ mkDerivation, base, mtl, safe, transformers, xml }:
      mkDerivation {
        pname = "xml-extractors";
-       version = "0.4.0.0";
-       sha256 = "98c34b3ae23141a8eda870418297615a21db8d48024821a919a7ee4f52076808";
+       version = "0.4.0.1";
+       sha256 = "38ffa6ab354dcaddbdd1ca4c187418715fd7d7de77abc4861c9840c88bce1e79";
        libraryHaskellDepends = [ base mtl safe transformers xml ];
-       jailbreak = true;
        homepage = "https://github.com/holmisen/xml-extractors";
-       description = "Wrapper over xml to extract data from parsed xml";
+       description = "Extension to the xml package to extract data from parsed xml";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -144121,8 +144936,8 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
-     }) { Xrender = null;  inherit (pkgs.xlibs) libXpm;
-          inherit (pkgs.xlibs) libXrandr;  inherit (pkgs) wirelesstools;};
+     }) {Xrender = null; inherit (pkgs.xlibs) libXpm; 
+         inherit (pkgs.xlibs) libXrandr; inherit (pkgs) wirelesstools;};
 
   "xmonad" = callPackage
     ({ mkDerivation, base, containers, directory, extensible-exceptions
@@ -144132,13 +144947,14 @@ self: {
        pname = "xmonad";
        version = "0.11.1";
        sha256 = "39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd";
+       revision = "1";
+       editedCabalFile = "12849de2637cf39a8c0311d81418632e719125f55db2faf931b1905d85d5bf3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base containers directory extensible-exceptions filepath mtl
          process unix utf8-string X11
        ];
-       jailbreak = true;
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
@@ -144306,8 +145122,8 @@ self: {
     ({ mkDerivation, base, magic, mtl, random, unix, xmonad }:
      mkDerivation {
        pname = "xmonad-wallpaper";
-       version = "0.0.1.1";
-       sha256 = "a720bd9f3ba17835373e4093b64b7d7f522d095281a853447943be16502fac4c";
+       version = "0.0.1.2";
+       sha256 = "b02e1c7a524dd9cf28d5cff6933194fe245fa4e9247f701ec87195a20a8cf265";
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
        license = stdenv.lib.licenses.gpl3;
@@ -144370,7 +145186,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/xosd";
        description = "A binding to the X on-screen display";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) xosd;};
+     }) {inherit (pkgs) xosd;};
 
   "xournal-builder" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, double-conversion
@@ -144527,7 +145343,7 @@ self: {
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { xslt = null;};
+     }) {xslt = null;};
 
   "xss-sanitize" = callPackage
     ({ mkDerivation, attoparsec, base, containers, css-text, hspec
@@ -144572,7 +145388,7 @@ self: {
        librarySystemDepends = [ libXtst ];
        description = "Thin FFI bindings to X11 XTest library";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs.xlibs) libXtst;};
+     }) {inherit (pkgs.xlibs) libXtst;};
 
   "xturtle" = callPackage
     ({ mkDerivation, base, convertible, Imlib, setlocale, X11, X11-xft
@@ -144680,7 +145496,6 @@ 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
@@ -144725,7 +145540,7 @@ self: {
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) yajl;};
+     }) {inherit (pkgs) yajl;};
 
   "yajl-enumerator" = callPackage
     ({ mkDerivation, base, bytestring, enumerator, json-types, text
@@ -145069,7 +145884,28 @@ self: {
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) libdevil;};
+     }) {inherit (pkgs) libdevil;};
+
+  "yate" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, hspec, mtl, scientific
+     , template-haskell, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yate";
+       version = "0.1.0.0";
+       sha256 = "20275bafdb52ce74f3c3cecb6cbb8925c7d9f40bea74d6872145ff93df49d85d";
+       libraryHaskellDepends = [
+         aeson attoparsec base mtl scientific template-haskell text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base hspec mtl unordered-containers vector
+       ];
+       jailbreak = true;
+       description = "Yet Another Template Engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
 
   "yavie" = callPackage
     ({ mkDerivation, base, Cabal, directory, event-driven, filepath
@@ -145179,8 +146015,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod";
-       version = "1.4.1.5";
-       sha256 = "a1160d366cf2c91502bcd5c8f251041ec8a1bc962729c95d5bc572dbe9f8296b";
+       version = "1.4.2";
+       sha256 = "d6d13e608af954de23721261b39ee79569907beb173477db8820acc5e9f45757";
        libraryHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring conduit-extra
          data-default directory fast-logger monad-control monad-logger safe
@@ -145446,12 +146282,11 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-ldap-mediocre";
-       version = "0.1.0.0";
-       sha256 = "509eb2cc3a4895f9fe797f152b3f3511fbae7b765730016c3a93a6888290f10e";
+       version = "0.1.1";
+       sha256 = "ecf280a3e185d9864a9924681856fa92e5fe441d02e0f29164c3bc4d9eef430b";
        libraryHaskellDepends = [
          aeson base LDAP text yesod-auth yesod-core yesod-form
        ];
-       jailbreak = true;
        description = "Very simlple LDAP auth for yesod";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -145562,8 +146397,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-bin";
-       version = "1.4.13.3";
-       sha256 = "cc84e0c8f081211c01a6c8d58544b9b7fe5c5c180d8a2edcb30a79edbe198e61";
+       version = "1.4.14";
+       sha256 = "6ed15a3ac5084926073c92fa7fd3ad2efa5ff8b4dc17fa4e6b1c109d57717a0c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -145646,8 +146481,8 @@ self: {
 
   "yesod-core" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
-     , blaze-html, blaze-markup, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
      , data-default, deepseq, directory, exceptions, fast-logger, hspec
      , hspec-expectations, http-types, HUnit, lifted-base, monad-control
      , monad-logger, mtl, mwc-random, network, old-locale, parsec
@@ -145659,11 +146494,11 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.13";
-       sha256 = "219bf0858977468d9aa74ab5f2d330e46bbbe95d700c989b3565be5d99d319da";
+       version = "1.4.15";
+       sha256 = "b9878ee01f66346967a157c597d284735c66db61a18a93c319b85233500050b4";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
-         bytestring case-insensitive cereal clientsession conduit
+         byteable bytestring case-insensitive cereal clientsession conduit
          conduit-extra containers cookie data-default deepseq directory
          exceptions fast-logger http-types lifted-base monad-control
          monad-logger mtl mwc-random old-locale parsec path-pieces primitive
@@ -145767,8 +146602,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-dsl";
-       version = "0.1.1.24";
-       sha256 = "a73d0796e4148507937566155287721d83c687114c1dfdfd73441ef1e6f8255f";
+       version = "0.2.0";
+       sha256 = "934aa5de181619e11c39054e9299271a4f447e753589d1b6eafd757216193c49";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -145783,7 +146618,6 @@ self: {
        ];
        description = "DSL for generating Yesod subsite to manage an RDBMS;";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-eventsource" = callPackage
@@ -145826,7 +146660,7 @@ self: {
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) sqlite;};
+     }) {inherit (pkgs) sqlite;};
 
   "yesod-fay" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
@@ -146304,7 +147138,6 @@ self: {
        ];
        description = "RAML style route definitions for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -146364,7 +147197,6 @@ self: {
        homepage = "https://github.com/frontrowed/yesod-routes-flow";
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-routes-typescript" = callPackage
@@ -146534,6 +147366,7 @@ self: {
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
@@ -146545,8 +147378,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-table";
-       version = "1.0.5";
-       sha256 = "873cb5ae68d3726678ce4f254a5342f56244f86e88c731ca6849691df30f85df";
+       version = "1.0.6";
+       sha256 = "69d4f11c31d9928551c7de3b1fc12a470e29ead58729f1b752b773be862e3b30";
        libraryHaskellDepends = [
          base bytestring containers contravariant text yesod-core
        ];
@@ -146576,8 +147409,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-test";
-       version = "1.4.3.1";
-       sha256 = "a29e0173b31aacaa4a0235bfdcc8c7809b8685a9069a1f5b6083f204d1fd1394";
+       version = "1.5.0.1";
+       sha256 = "9b19fb51e901935f8b0926e3b9bbae772d45967a747fb3a1bf9cb893724c29a4";
        libraryHaskellDepends = [
          attoparsec base blaze-builder blaze-html blaze-markup bytestring
          case-insensitive containers cookie hspec-core html-conduit
@@ -146585,8 +147418,8 @@ self: {
          transformers wai wai-extra xml-conduit xml-types yesod-core
        ];
        testHaskellDepends = [
-         base bytestring containers hspec html-conduit HUnit text wai
-         xml-conduit yesod-core yesod-form
+         base bytestring containers hspec html-conduit http-types HUnit text
+         wai xml-conduit yesod-core yesod-form
        ];
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
@@ -146655,8 +147488,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-transloadit";
-       version = "0.3.0.0";
-       sha256 = "95c485106e4aa6d30e3b3d981ef67fafbbd2fb23597aae7780d45106d4bf565c";
+       version = "0.4.1.0";
+       sha256 = "4e0a68a2f1d90bdc4489ac18f05bff3728da89756ebbd54cc1654d6b81114c80";
        libraryHaskellDepends = [
          aeson base byteable bytestring cryptohash lens lens-aeson
          old-locale shakespeare text time transformers unordered-containers
@@ -147040,7 +147873,7 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/yices-painless";
        description = "An embedded language for programming the Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) gmp;  inherit (pkgs) yices;};
+     }) {inherit (pkgs) gmp; inherit (pkgs) yices;};
 
   "yjftp" = callPackage
     ({ mkDerivation, base, directory, ftphs, haskeline, hsConfigure
@@ -147304,7 +148137,7 @@ self: {
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
-     }) { gomp = null;  inherit (pkgs) z3;};
+     }) {gomp = null; inherit (pkgs) z3;};
 
   "zampolit" = callPackage
     ({ mkDerivation, base, cmdargs, containers, directory, filepath
@@ -147437,7 +148270,7 @@ self: {
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zeromq;};
+     }) {inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, lifted-base
@@ -147479,7 +148312,7 @@ self: {
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) { inherit (pkgs) zeromq;};
+     }) {inherit (pkgs) zeromq;};
 
   "zeromq4-haskell" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, exceptions
@@ -147500,7 +148333,7 @@ self: {
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;
-     }) { inherit (pkgs) zeromq;};
+     }) {inherit (pkgs) zeromq;};
 
   "zeroth" = callPackage
     ({ mkDerivation, base, Cabal, derive, directory, filepath
@@ -147567,7 +148400,7 @@ self: {
        homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zip;};
+     }) {inherit (pkgs) zip;};
 
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
@@ -147657,7 +148490,7 @@ self: {
        librarySystemDepends = [ zlib ];
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "zlib" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, QuickCheck, tasty
@@ -147675,7 +148508,7 @@ self: {
        jailbreak = true;
        description = "Compression and decompression in the gzip and zlib formats";
        license = stdenv.lib.licenses.bsd3;
-     }) { inherit (pkgs) zlib;};
+     }) {inherit (pkgs) zlib;};
 
   "zlib-bindings" = callPackage
     ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
@@ -147756,10 +148589,10 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "zmidi-core";
-       version = "0.7.0";
-       sha256 = "3455f95bd3451f667e224d278aae4c474e8d4efe0d44a9f76d2c1b9297671f6d";
+       version = "0.8.1";
+       sha256 = "5bfb08b41d20ea1d0520dac48fefe07fc4f174bcfa9de6d7eb613234e962cbd8";
        libraryHaskellDepends = [ base binary bytestring containers ];
-       homepage = "http://code.google.com/p/copperbox/";
+       homepage = "https://github.com/stephentetley/zmidi-core";
        description = "Read and write MIDI files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index a4eb7439b0d5..f5cf11ead970 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -100,7 +100,12 @@ let
        ln -s $out/pypy-c/include $out/include/${libPrefix}
        ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix}
 
-       wrapProgram "$out/bin/pypy" \
+       # We must wrap the original, not the symlink.
+       # PyPy uses argv[0] to find its standard library, and while it knows
+       # how to follow symlinks, it doesn't know about wrappers. So, it
+       # will think the wrapper is the original. As long as the wrapper has
+       # the same path as the original, this is OK.
+       wrapProgram "$out/pypy-c/pypy-c" \
          --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}:$out/lib" \
          --set LIBRARY_PATH "${LIBRARY_PATH}:$out/lib"
 
diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix
index 6dc1b5241f23..5975a61ff77c 100644
--- a/pkgs/development/libraries/belle-sip/default.nix
+++ b/pkgs/development/libraries/belle-sip/default.nix
@@ -9,11 +9,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "belle-sip-1.4.0";
+  name = "belle-sip-1.4.1";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/belle-sip/${name}.tar.gz";
-    sha256 = "1lwxfvwvclbh0bfwf69jrknqzqh1igzm293wwwbmq4kn8c5fiypz";
+    sha256 = "0q1d3fqsrxi3kxcjcibr376js25h6in8c1hm7c53wz252jx6f42b";
   };
 
   nativeBuildInputs = [ jre ];
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix
index 49376b74c172..625ec2995e34 100644
--- a/pkgs/development/libraries/catch/default.nix
+++ b/pkgs/development/libraries/catch/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
 
   name = "catch-${version}";
-  version = "1.1-3";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "philsquared";
     repo = "Catch";
-    rev = "c51e86819dc993d590e5d0adaf1952f4b53e5355";
-    sha256 = "0kgi7wxxysgjbpisqfj4dj0k19cyyai92f001zi8gzkybd4fkgv5";
+    rev = "v" + version;
+    sha256 = "0rz2nmvvh66x6w2nb7l08vc5x9aqg1qfz2qfiykaz1ybc19fwck2";
   };
 
   buildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix
new file mode 100644
index 000000000000..a86bdc8e035b
--- /dev/null
+++ b/pkgs/development/libraries/cwiid/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk }:
+
+stdenv.mkDerivation rec {
+    name = "cwiid-2010-02-21-git";
+    src = fetchgit {
+        url = https://github.com/abstrakraft/cwiid;
+        sha256 = "6f5355d036dab017da713c49d3042011fa24fb732ed0d5ee338ab6f5ff400f06";
+        rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82";
+    };
+    configureFlags = "--without-python";
+    prePatch = ''
+        sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in
+    '';
+    buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk ];
+    postInstall = ''
+        # Some programs (for example, cabal-install) have problems with the double 0
+        sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc
+    '';
+    meta = {
+        description = "Linux Nintendo Wiimote interface";
+        homepage = http://cwiid.org;
+        license = stdenv.lib.licenses.gpl2Plus;
+        maintainers = [ stdenv.lib.maintainers.bennofs ];
+        platforms = stdenv.lib.platforms.linux; 
+    };   
+}
diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix
new file mode 100644
index 000000000000..c79c389128b2
--- /dev/null
+++ b/pkgs/development/libraries/freenect/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }:
+
+stdenv.mkDerivation rec {
+    name = "freenect-${version}";
+    version = "0.5.2";
+    src = fetchzip {
+        url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz";
+        sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9";
+    };
+
+    buildInputs = [ libusb freeglut mesa libXi libXmu ];
+    nativeBuildInputs = [ cmake pkgconfig ];
+
+    meta = {
+        description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and OS X";
+        inherit version;
+        homepage = http://openkinect.org;
+        license = with stdenv.lib.licenses; [ gpl2 asl20 ];
+        maintainers = with stdenv.lib.maintainers; [ bennofs ];
+        platforms = stdenv.lib.platforms.linux;
+    };
+}
diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
new file mode 100644
index 000000000000..f4d01def94a2
--- /dev/null
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "libb2-${meta.version}";
+
+  meta = {
+    version = "0.97";
+    description = "The BLAKE2 family of cryptographic hash functions";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ dfoxfranke ];
+    license = licenses.cc0;
+  };
+
+  src = fetchurl {
+    url = "https://blake2.net/${name}.tar.gz";
+    sha256 = "7829c7309347650239c76af7f15d9391af2587b38f0a65c250104a2efef99051";
+  };
+}
diff --git a/pkgs/development/libraries/libgdata/0.6.nix b/pkgs/development/libraries/libgdata/0.6.nix
deleted file mode 100644
index 4ce95505f8fc..000000000000
--- a/pkgs/development/libraries/libgdata/0.6.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-x@{builderDefsPackage
-  , glib, libsoup, libxml2, pkgconfig, intltool, perl
-  , libtasn1, nettle, gmp
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="libgdata";
-    majorVersion="0.6";
-    minorVersion="6";
-    version="${majorVersion}.${minorVersion}";
-    name="${baseName}-${version}";
-    url="mirror://gnome/sources/${baseName}/${majorVersion}/${name}.tar.bz2";
-    hash="cf6de3b60443faaf8e9c3b4c4b160c22a48df7925c1c793a7bb71d3d746f69f5";
-  };
-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 = ["doConfigure" "doMakeInstall"];
-      
-  meta = {
-    description = "GData API library";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.lgpl21Plus;
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/${sourceInfo.baseName}/${sourceInfo.majorVersion}";
-    };
-  };
-}) x
-
diff --git a/pkgs/development/libraries/libkolab/default.nix b/pkgs/development/libraries/libkolab/default.nix
deleted file mode 100644
index 3475b22d26d4..000000000000
--- a/pkgs/development/libraries/libkolab/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl,
- cmake, qt4, clucene_core, librdf_redland, libiodbc
-, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "libkolab-0.4.2";
-
-  src = fetchurl {
-    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
-    sha256 = "1wdbg42s14p472dn35n6z638i6n64f6mjjxmjam1r54pzsdykks6";
-  };
-
-  # We disable the Java backend, since we do not need them and they make the closure size much bigger
-#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    homepage = http://soprano.sourceforge.net/;
-    description = "An object-oriented C++/Qt4 framework for RDF data";
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ phreedo ];
-    inherit (qt4.meta) platforms;
-  };
-}
diff --git a/pkgs/development/libraries/libkolabxml/default.nix b/pkgs/development/libraries/libkolabxml/default.nix
deleted file mode 100644
index c0217abd7863..000000000000
--- a/pkgs/development/libraries/libkolabxml/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, boost, curl, cmake, xercesc, qt4
-#, qt4, clucene_core, librdf_redland, libiodbc
-, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "libkolabxml-0.8.4";
-
-  src = fetchurl {
-    url = "http://mirror.kolabsys.com/pub/releases/${name}.tar.gz";
-    sha256 = "08gdhimnrhizpbvddj7cyz4jwwxrx5a70vz29cy989qgym2vn72q";
-  };
-
-  buildInputs = [ boost curl xercesc ];
-#  buildInputs = [ qt4 clucene_core librdf_redland libiodbc ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    homepage = http://soprano.sourceforge.net/;
-    description = "An object-oriented C++/Qt4 framework for RDF data";
-    license = "LGPL";
-    maintainers = with stdenv.lib.maintainers; [ phreedo ];
-    inherit (qt4.meta) platforms;
-  };
-}
diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index b389176b3da8..6b40eeb3b1f5 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, qt4 }:
 
 stdenv.mkDerivation rec {
-  name = "libQGLViewer-2.3.4";
+  name = "libqglviewer-2.6.3";
+  version = "2.6.3";
 
   src = fetchurl {
-    url = "http://www.libqglviewer.com/src/${name}.tar.gz";
-    sha256 = "01b9x2n3v5x3zkky2bjpgbhn5bglqn4gd7x5j5p7y2dw0jnzz7j0";
+    url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz";
+    sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
   };
 
   buildInputs = [ qt4 ];
@@ -17,9 +18,10 @@ stdenv.mkDerivation rec {
       make
     '';
 
-  meta = { 
-    description = "trackball-based 3D viewer qt widget including many useful features";
-    homepage = http://artis.imag.fr/Members/Gilles.Debunne/QGLViewer/installUnix.html;
-    license = stdenv.lib.licenses.gpl2;
+  meta = with stdenv.lib; {
+    description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers";
+    homepage = http://libqglviewer.com/;
+    license = licenses.gpl2;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index d272ad184925..3d564fc00f8b 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
+    sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6";
   };
 
   buildInputs = [ lcms2 jasper ] ;
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)";
     homepage = http://www.libraw.org/;
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
   };
 }
 
diff --git a/pkgs/development/libraries/libtidy/default.nix b/pkgs/development/libraries/libtidy/default.nix
deleted file mode 100644
index 412f34008f11..000000000000
--- a/pkgs/development/libraries/libtidy/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, lib, fetchcvs, cmake, libtool, automake, autoconf }:
-
-stdenv.mkDerivation rec {
-  name = "libtidy-${version}";
-
-  version = "1.46";
-
-  src = fetchcvs {
-    cvsRoot = ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy";
-    module  = "tidy";
-    date    = "2009-03-25";
-    sha256  = "0bnxn1qgjx1pfyn2q4y24yj1gwqq5bxwf5ksjljqzqzrmjv3q46x";
-  };
-
-  preConfigure = ''
-    source build/gnuauto/setup.sh
-  '';
-
-  buildInputs = [ libtool automake autoconf ];
-
-  meta = with lib; {
-    description = "Validate, correct, and pretty-print HTML files";
-    homepage    = http://tidy.sourceforge.net;
-    license     = licenses.mit;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ cstrahan ];
-  };
-}
diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix
index 19e71fd66c12..4a672b226ea6 100644
--- a/pkgs/development/libraries/mediastreamer/default.nix
+++ b/pkgs/development/libraries/mediastreamer/default.nix
@@ -4,18 +4,19 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mediastreamer-2.11.1";
+  name = "mediastreamer-2.11.2";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/mediastreamer/${name}.tar.gz";
-    sha256 = "0gfv4k2rsyvyq838xjgsrxmmn0fkw40apqs8vakzjwzsz2c9z8pd";
+    sha256 = "1g6gawrlz1lixzs1kzckm3rxc401ww8pi00x7r5kb84bdijb02cc";
   };
 
+  patches = [ ./plugins_dir.patch ];
+
   postPatch = ''
     sed -i "s/\(SRTP_LIBS=\"\$SRTP_LIBS -lsrtp\"\)/SRTP_LIBS=\"$(pkg-config --libs-only-l libsrtp)\"/g" configure
   '';
 
-  # TODO: make it load plugins from *_PLUGIN_PATH
   nativeBuildInputs = [ pkgconfig intltool ];
 
   propagatedBuildInputs = [
@@ -28,6 +29,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-external-ortp"
     "--with-srtp=${srtp}"
+    "--enable-xv"
+    "--enable-glx"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix
new file mode 100644
index 000000000000..e312c730ab21
--- /dev/null
+++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, mediastreamer, openh264 }:
+
+stdenv.mkDerivation rec {
+  name = "mediastreamer-openh264-${version}";
+  version = "1.0.0";
+
+  src = fetchurl {
+    url = "http://download-mirror.savannah.gnu.org/releases/linphone/plugins/sources/msopenh264-${version}.tar.gz";
+    sha256 = "1622ma8g4yqvxa8pqwddsmhlpwak31i8zfl88f60k71k4dplw845";
+  };
+
+  buildInputs = [ autoreconfHook pkgconfig mediastreamer openh264 ];
+
+  meta = with stdenv.lib; {
+    description = "H.264 encoder/decoder plugin for mediastreamer2";
+    homepage = http://www.linphone.org/technical-corner/mediastreamer2/overview;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/development/libraries/mediastreamer/plugins_dir.patch
new file mode 100644
index 000000000000..e64bfc5a43a1
--- /dev/null
+++ b/pkgs/development/libraries/mediastreamer/plugins_dir.patch
@@ -0,0 +1,24 @@
+diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c
+--- a/src/base/msfactory.c	2015-05-13 16:53:49.801113249 +0200
++++ b/src/base/msfactory.c	2015-08-26 21:35:44.994724647 +0200
+@@ -630,12 +630,18 @@
+ }
+ 
+ void ms_factory_init_plugins(MSFactory *obj) {
++	char *package_plugins_dir;
+ 	if (obj->plugins_dir == NULL) {
++		package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR");
++		if (package_plugins_dir!=NULL){
++			obj->plugins_dir = ms_strdup(package_plugins_dir);
++		} else {
+ #ifdef PACKAGE_PLUGINS_DIR
+-		obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
++			obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR);
+ #else
+-		obj->plugins_dir = ms_strdup("");
++			obj->plugins_dir = ms_strdup("");
+ #endif
++		}
+ 	}
+ 	if (strlen(obj->plugins_dir) > 0) {
+ 		ms_message("Loading ms plugins from [%s]",obj->plugins_dir);
diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index e0b8dcca1af3..4ce1787dbac6 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  cmakeFlags = [
-    "-DCMAKE_BUILD_TYPE=Release"
-  ];
-
   meta = {
     description = "Open Computer Vision Library with more than 500 algorithms";
     homepage = http://opencv.org/;
diff --git a/pkgs/development/libraries/openexr_ctl/default.nix b/pkgs/development/libraries/openexr_ctl/default.nix
deleted file mode 100644
index cd26aae660c4..000000000000
--- a/pkgs/development/libraries/openexr_ctl/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, openexr, ilmbase, ctl }:
-
-stdenv.mkDerivation {
-  name = "openexr_ctl-1.0.1";
-
-  src = fetchurl {
-    url = mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz;
-    sha256 = "1jg9smpaplal8l14djp184wzk11nwd3dvm4lhkp69kjgw8jdd21d";
-  };
-
-  propagatedBuildInputs = [ ilmbase ];
-  
-  buildInputs = [ openexr ctl ];
-  
-  configureFlags = "--with-ilmbase-prefix=${ilmbase}";
-
-  meta = {
-    description = "Color Transformation Language";
-    homepage = http://ampasctl.sourceforge.net;
-  };
-}
diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix
new file mode 100644
index 000000000000..76188d484f91
--- /dev/null
+++ b/pkgs/development/libraries/openh264/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, nasm }:
+
+stdenv.mkDerivation rec {
+  name = "openh264-1.4.0";
+
+  src = fetchurl {
+    url = "https://github.com/cisco/openh264/archive/v1.4.0.tar.gz";
+    sha256 = "08haj0xkyjlwbpqdinxk0cmvqw89bx89ly0kqs9lf87fy6ksgfd1";
+  };
+
+  buildInputs = [ nasm ];
+
+  installPhase = ''
+    make PREFIX=$out install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A codec library which supports H.264 encoding and decoding";
+    homepage = http://www.openh264.org;
+    license = stdenv.lib.licenses.bsd2;
+  };
+}
diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix
index 561d0df4e805..746f10eebed1 100644
--- a/pkgs/development/libraries/ortp/default.nix
+++ b/pkgs/development/libraries/ortp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ortp-0.24.1";
+  name = "ortp-0.24.2";
 
   src = fetchurl {
     url = "mirror://savannah/linphone/ortp/sources/${name}.tar.gz";
-    sha256 = "1mach7cdq4kydqkll8ra1kir818da07z253rf9pihifipqhcxv6i";
+    sha256 = "05k6ianphr533qnjwxsv7jnh7fb2sq0dj1pdy1bk2w5khmlwfdyb";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
deleted file mode 100644
index 596a3aea6749..000000000000
--- a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux
-*** pdf2xml/Makefile.linux	2008-02-07 17:43:10.000000000 +0100
---- pdf2xml-new/Makefile.linux	2010-08-25 15:41:23.000000000 +0200
-***************
-*** 30,36 ****
-  
-  
-  # Executable name
-! PDFTOXMLEXE=pdftoxml.exe
-  
-  # Main target
-  all: pdftoxmlEXE
---- 30,36 ----
-  
-  
-  # Executable name
-! PDFTOXMLEXE=pdftoxml
-  
-  # Main target
-  all: pdftoxmlEXE
-diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc
-*** pdf2xml/src/pdftoxml.cc	2010-04-26 10:58:01.000000000 +0200
---- pdf2xml-new/src/pdftoxml.cc	2010-08-25 15:36:15.000000000 +0200
-***************
-*** 11,21 ****
-  //
-  //===========================================================================
-  
-  #include <aconf.h>
-- #include <stdio.h>
-  #include <stdlib.h>
-  #include <stddef.h>
-! #include <string.h>
-  #include "parseargs.h"
-  #include "GString.h"
-  #include "gmem.h"
---- 11,21 ----
-  //
-  //===========================================================================
-  
-+ #include <string.h>
-  #include <aconf.h>
-  #include <stdlib.h>
-  #include <stddef.h>
-! #include <cstdio>
-  #include "parseargs.h"
-  #include "GString.h"
-  #include "gmem.h"
diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 786235037943..c5db97877065 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     homepage = http://rocksdb.org;
     description = "A library that provides an embeddable, persistent key-value store for fast storage";
     license = licenses.bsd3;
-    platforms = platforms.all;
+    platforms = platforms.allBut [ "i686-linux" ];
     maintainers = with maintainers; [ wkennington ];
   };
 }
diff --git a/pkgs/development/libraries/ruby_gpgme/default.nix b/pkgs/development/libraries/ruby_gpgme/default.nix
deleted file mode 100644
index c5f2366bfa1c..000000000000
--- a/pkgs/development/libraries/ruby_gpgme/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl, gpgme, ruby, rubygems, hoe }:
-
-stdenv.mkDerivation {
-  name = "ruby-gpgme-1.0.8";
-
-  src = fetchurl {
-    url = "https://github.com/ueno/ruby-gpgme/archive/1.0.8.tar.gz";
-    sha256 = "1j7jkl9s8iqcmxf3x6c9kljm19hw1jg6yvwbndmkw43qacdr9nxb";
-  };
-
-  meta = {
-    description = ''
-      Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made
-      Easy)
-    '';
-    homepage = "http://rubyforge.org/projects/ruby-gpgme/";
-    longDescription = ''
-      Ruby-GPGME is a Ruby language binding of GPGME (GnuPG Made Easy).
-
-      GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG
-      easier for applications. It provides a High-Level Crypto API for
-      encryption, decryption, signing, signature verification and key
-      management.
-    '';
-  };
-
-  buildInputs = [ gpgme rubygems hoe ruby ];
-
-  buildPhase = ''
-    ${ruby}/bin/ruby extconf.rb
-    rake gem
-  '';
-
-  installPhase = ''
-    export HOME=$TMP/home; mkdir -pv "$HOME"
-
-    # For some reason, the installation phase doesn't work with the default
-    # make install command run by gem (we'll fix it and do it ourselves later)
-    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri pkg/gpgme-1.0.8.gem || true
-
-    # Create a bare-bones gemspec file so that ruby will recognise the gem
-    cat <<EOF >"$out/${ruby.gemPath}/specifications/gpgme.gemspec"
-    Gem::Specification.new do |s|
-      s.name              = 'gpgme'
-      s.version           = '1.0.8'
-      s.files             = Dir['{lib,examples}/**/*']
-      s.rubyforge_project = 'ruby-gpgme'
-      s.require_paths     = ['lib']
-    end
-    EOF
-
-    cd "$out/${ruby.gemPath}/gems/gpgme-1.0.8"
-    mkdir src
-    mv lib src
-    sed -i "s/srcdir = ./srcdir = src/" Makefile
-    make install
-
-    mv lib lib.bak
-    mv src/lib lib
-    rmdir src
-  '';
-}
-
diff --git a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix b/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
deleted file mode 100644
index 8d55bafeb20d..000000000000
--- a/pkgs/development/libraries/ruby_ncursesw_sup/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, ncurses, ruby, rubygems }:
-
-stdenv.mkDerivation rec {
-  name = "ncursesw-sup-${version}";
-  version = "1.4.6";
-
-  src = fetchurl {
-    url = "https://github.com/sup-heliotrope/ncursesw-ruby/archive/v${version}.tar.gz";
-    sha256 = "1fzmj5kqh2aql7r7jys8cyf7mb78kz71yc4a6gh74h9s8pybyhh7";
-  };
-
-  meta = {
-    description = ''
-      Hacked up version of ncurses gem that supports wide characters for
-      supmua.org
-    '';
-    homepage = ''http://github.com/sup-heliotrope/ncursesw-ruby'';
-    longDescription = ''
-      This wrapper provides access to the functions, macros, global variables
-      and constants of the ncurses library.  These are mapped to a Ruby Module
-      named "Ncurses":  Functions and external variables are implemented as
-      singleton functions of the Module Ncurses.
-    '';
-  };
-
-  buildInputs = [ ncurses rubygems ];
-
-  buildPhase = "gem build ncursesw.gemspec";
-
-  installPhase = ''
-    export HOME=$TMP/home; mkdir -pv "$HOME"
-
-    # For some reason, the installation phase doesn't work with the default
-    # make install command run by gem (we'll fix it and do it ourselves later)
-    gem install --no-verbose --install-dir "$out/${ruby.gemPath}" \
-        --bindir "$out/bin" --no-rdoc --no-ri ncursesw-${version}.gem || true
-
-    # Needed for ruby to recognise the gem
-    cp ncursesw.gemspec "$out/${ruby.gemPath}/specifications"
-
-    cd "$out/${ruby.gemPath}/gems/ncursesw-${version}"
-    mkdir src
-    mv lib src
-    sed -i "s/srcdir = ./srcdir = src/" Makefile
-    make install
-  '';
-}
-
diff --git a/pkgs/development/libraries/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index 07fffeff20d6..0ec6342c39e6 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, cmake, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "uid_wrapper-1.1.0";
+  name = "uid_wrapper-1.1.1";
 
   src = fetchurl {
     url = "mirror://samba/cwrap/${name}.tar.gz";
-    sha256 = "18xdyy7rvn0zg6j44ay0sxd4q0bplq64syyki9wi8ixhkrzqn0yn";
+    sha256 = "0y033cjs0kwmpx70xc4wh789vk9rw6bziizs28h50ad7lyyvx5b9";
   };
 
-  buildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   meta = with stdenv.lib; {
     description = "a wrapper for the user, group and hosts NSS API";
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index f6030bb9526e..57c455f851c5 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -4,11 +4,11 @@ stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
   name = "${python.executable}-${shortName}";
 
-  version = "18.0.1";
+  version = "18.2";
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "152b4qlpqc54939vfx5ipjpgx0kln02n3ywpm6x25pqysngwjjad";
+    sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509";
   };
 
   buildInputs = [ python wrapPython distutils-cfg ];
@@ -35,5 +35,5 @@ stdenv.mkDerivation rec {
     homepage = http://pypi.python.org/pypi/setuptools;
     license = [ "PSF" "ZPL" ];
     platforms = platforms.all;
-  };    
+  };
 }
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 3c59bf45effe..da127b2f8eef 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "14sgsvjjalbcqpcayyv5cndc9hfm5bigkp684b6cr6virksmlk19";
   }) ./linux-4.0.patch];
 
+  outputs = [ "out" "doc" ];
+
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 88e8c55b0618..b1bd535c5fd6 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -2,17 +2,17 @@
 , containers, deepseq, deepseq-generics, directory, doctest, filepath
 , hackage-db, hspec, lens, monad-par, monad-par-extras, mtl
 , optparse-applicative, pretty, process, QuickCheck, regex-posix, SHA, split
-, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel
+, stdenv, transformers, utf8-string, makeWrapper, gitMinimal, cartel, data-default
 , nix-prefetch-scripts
 }:
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150807-6-g9f58996";
+  version = "20150824";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69";
-    sha256 = "0vy18gmyrw72m98psz7hz51aqj66b98h1pdv98hf3k1hrdva3ncv";
+    rev = "560fb2b1d22f4c995a526529bb034bd183e85a31";
+    sha256 = "0qaa0l23lc8677wvbgz327yvfg2pxxmvrxga6568ra5kgdy4204c";
     deepClone = true;
   };
   isLibrary = false;
@@ -21,19 +21,19 @@ mkDerivation rec {
     aeson ansi-wl-pprint base bytestring Cabal containers
     deepseq-generics directory filepath hackage-db lens monad-par
     monad-par-extras mtl optparse-applicative pretty process
-    regex-posix SHA split transformers utf8-string
+    regex-posix SHA split transformers utf8-string data-default
   ];
   executableHaskellDepends = [
     aeson ansi-wl-pprint base bytestring Cabal containers
     deepseq-generics directory filepath hackage-db lens monad-par
     monad-par-extras mtl optparse-applicative pretty process
-    regex-posix SHA split transformers utf8-string
+    regex-posix SHA split transformers utf8-string data-default
   ];
   testHaskellDepends = [
     aeson ansi-wl-pprint base bytestring Cabal containers deepseq
     deepseq-generics directory doctest filepath hackage-db hspec lens
     monad-par monad-par-extras mtl optparse-applicative pretty process
-    QuickCheck regex-posix SHA split transformers utf8-string
+    QuickCheck regex-posix SHA split transformers utf8-string data-default
   ];
   buildDepends = [ cartel ];
   buildTools = [ gitMinimal makeWrapper ];
diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix
index 7334fa8754f4..ea52fff64ccb 100644
--- a/pkgs/development/tools/misc/openocd/default.nix
+++ b/pkgs/development/tools/misc/openocd/default.nix
@@ -1,19 +1,15 @@
-{ stdenv, fetchurl, libftdi, libusb1, pkgconfig }:
-
-# TODO: Add "hidapi" as dependency to gain access to CMSIS-DAP debuggers.
-# Support should be auto-detected, but if not, pass "--enable-cmsis-dap" to
-# configure.
+{ stdenv, fetchurl, libftdi, libusb1, pkgconfig, hidapi }:
 
 stdenv.mkDerivation rec {
   name = "openocd-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/openocd/openocd-${version}.tar.bz2";
-    sha256 = "0byk7hnccgmhw0f84qlkfhps38gp2xp628bfrsc03vq08hr6q1sv";
+    sha256 = "0hzlnm19c4b35vsxs6ik94xbigv3ykdgr8gzrdir6sqmkan44w43";
   };
 
-  buildInputs = [ libftdi libusb1 pkgconfig ];
+  buildInputs = [ libftdi libusb1 pkgconfig hidapi ];
 
   configureFlags = [
     "--enable-jtag_vpi"
diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 8b89e8ae82db..651e64467c49 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
+{ stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "packer-0.7.5";
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
   };
 
-  buildInputs = [ gox ];
+  buildInputs = [ go gox ];
 
   installPhase = ''
     export GOPATH=$src
diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
index c8d69d3078d8..ed4aed35e115 100644
--- a/pkgs/games/cataclysm-dda/default.nix
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -36,7 +36,8 @@ in stdenv.mkDerivation rec {
       --add-flags "--datadir $out/share/"
   '';
 
-  enableParallelBuilding = true;
+  # Disable, possible problems with hydra
+  #enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "A free, post apocalyptic, zombie infested rogue-like";
diff --git a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch
new file mode 100644
index 000000000000..1de99542bdbf
--- /dev/null
+++ b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch
@@ -0,0 +1,36 @@
+From 21eb5b79072b147d0a9b7fafca98501e7056c834 Mon Sep 17 00:00:00 2001
+From: koda <vittorio.giovara@gmail.com>
+Date: Tue, 2 Jun 2015 19:51:04 +0100
+Subject: [PATCH] Fix building hedgewars-server
+
+---
+ gameServer/CoreTypes.hs           | 2 +-
+ gameServer/hedgewars-server.cabal | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs
+index 553e722..2c75153 100644
+--- a/gameServer/CoreTypes.hs
++++ b/gameServer/CoreTypes.hs
+@@ -38,7 +38,7 @@ import RoomsAndClients
+ instance NFData B.ByteString
+ #endif
+ 
+-instance NFData (Chan a)
++instance NFData (Chan a) where rnf a  = ()
+ 
+ instance NFData Action where
+     rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` ()
+diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal
+index 122f2ef..f36a190 100644
+--- a/gameServer/hedgewars-server.cabal
++++ b/gameServer/hedgewars-server.cabal
+@@ -33,7 +33,7 @@ Executable hedgewars-server
+     utf8-string,
+     SHA,
+     entropy,
+-    zlib
++    zlib >= 0.5.3 && < 0.6
+ 
+   if !os(windows)
+     build-depends: unix
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index bb776a7a10d0..b92a14d84c28 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -1,27 +1,27 @@
 { SDL_image, SDL_ttf, SDL_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut
 , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL, SDL_mixer
-, zlib, libpng, mesa
+, zlib, libpng, mesa, physfs
 }:
 
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          network vector utf8-string bytestring-show random hslogger dataenc
+          network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2
         ]);
 in
 stdenv.mkDerivation rec {
-  version = "0.9.20.5";
+  version = "0.9.21";
   name = "hedgewars-${version}";
   src = fetchurl {
     url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2";
-    sha256 = "1k5dq14s9pshrqlz8vnix237bcapfif4k3rc4yj4cmwdx1pqkl56";
+    sha256 = "0abnzpyq6sxlfcz5b0kh6r7n1692dwrgsdsr4s216xhh9n19xm0w";
   };
 
   buildInputs = [
     SDL_ttf SDL_net cmake pkgconfig lua5_1 SDL SDL_mixer SDL_image fpc
-    qt4 ghc ffmpeg freeglut makeWrapper
+    qt4 ghc ffmpeg freeglut makeWrapper physfs
   ];
 
-  patches = [ ./fix-ghc-7.8-build-failure.diff ];
+  patches = [ ./21eb5b79072b147d0a9b7fafca98501e7056c834.patch ];
 
   preBuild = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib
+    wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${mesa}/lib/:${freeglut}/lib:${physfs}/lib
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/freestyle/default.nix b/pkgs/misc/freestyle/default.nix
index bb3520e300ab..231b8eabb071 100644
--- a/pkgs/misc/freestyle/default.nix
+++ b/pkgs/misc/freestyle/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libQGLViewer
+{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libqglviewer
 , swig, python }:
 
 stdenv.mkDerivation {
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
     sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga";
  };
 
-  buildInputs = [ qt4 libpng lib3ds freeglut libXi libQGLViewer swig ];
+  buildInputs = [ qt4 libpng lib3ds freeglut libXi libqglviewer swig ];
   
-  inherit python freeglut libQGLViewer lib3ds; # if you want to use another adopt patch and Config.pri 
+  inherit python freeglut libqglviewer lib3ds; # if you want to use another adopt patch and Config.pri
 
   buildPhase = ''
     export PYTHON_VERSION=2.5
diff --git a/pkgs/misc/freestyle/patch b/pkgs/misc/freestyle/patch
index 733f50dbf10e..dae1b66f9bbd 100644
--- a/pkgs/misc/freestyle/patch
+++ b/pkgs/misc/freestyle/patch
@@ -155,8 +155,8 @@ diff -U3 -r a/src/libconfig.pri b/src/libconfig.pri
 -    }
 -  }
 -  win32:    LIBS        *= QGLViewer2.lib
-+  INCLUDEPATH *= $(libQGLViewer)/include
-+  LIBS        *= -L$(libQGLViewer)/lib -lQGLViewer
++  INCLUDEPATH *= $(libqglviewer)/include
++  LIBS        *= -L$(libqglviewer)/lib -lQGLViewer
  }
 diff -U3 -r a/src/swig/Makefile b/src/swig/Makefile
 --- a/src/swig/Makefile	2008-06-06 22:08:06.000000000 +0200
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 675a6839c863..4fe6ae4c6e22 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -22,11 +22,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "uboot-${defconfig}-${version}";
-  version = "2015.04";
+  version = "2015.07";
 
   src = fetchurl {
     url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-    sha256 = "0q2x1wh1f6rjh9rmcnkf28dxcvp9hkhi4vzspqkzamb6b3gp06ha";
+    sha256 = "1nclmyii5a1igvgjc4kxvi1fk2y82hp2iy4iywp34b3zf6ywjj0b";
   };
 
   patches = [ ./vexpress-Use-config_distro_bootcmd.patch ];
diff --git a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
index 9c61847f02ee..ce057b6aa657 100644
--- a/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
+++ b/pkgs/misc/uboot/vexpress-Use-config_distro_bootcmd.patch
@@ -1,4 +1,4 @@
-From 53a8612ff19f360363edaaf70137968f7fd6a1cd Mon Sep 17 00:00:00 2001
+From 1fb764e1866513a69b4a0c29b69f8e78ea1df7fa Mon Sep 17 00:00:00 2001
 From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
 Date: Mon, 8 Jun 2015 22:29:23 +0300
 Subject: [PATCH] vexpress: Use config_distro_bootcmd
@@ -7,9 +7,10 @@ Also had to hack cli_readline.c, as one codepath in
 cli_readline_into_buffer doesn't respect the timeout.
 ---
  common/cli_readline.c             | 12 +++++++++++-
+ configs/vexpress_ca9x4_defconfig  |  2 --
  include/configs/vexpress_ca9x4.h  |  1 -
- include/configs/vexpress_common.h | 35 +++++++++++++++++++++++------------
- 3 files changed, 34 insertions(+), 14 deletions(-)
+ include/configs/vexpress_common.h | 34 ++++++++++++++++++++++------------
+ 4 files changed, 33 insertions(+), 16 deletions(-)
 
 diff --git a/common/cli_readline.c b/common/cli_readline.c
 index 9a9fb35..ca997a9 100644
@@ -41,6 +42,22 @@ index 9a9fb35..ca997a9 100644
  
  #ifdef CONFIG_SHOW_ACTIVITY
  		while (!tstc()) {
+diff --git a/configs/vexpress_ca9x4_defconfig b/configs/vexpress_ca9x4_defconfig
+index 2947fc1..9a5123d 100644
+--- a/configs/vexpress_ca9x4_defconfig
++++ b/configs/vexpress_ca9x4_defconfig
+@@ -5,11 +5,9 @@ CONFIG_TARGET_VEXPRESS_CA9X4=y
+ # CONFIG_CMD_IMLS is not set
+ # CONFIG_CMD_XIMG is not set
+ # CONFIG_CMD_EDITENV is not set
+-# CONFIG_CMD_ENV_EXISTS is not set
+ # CONFIG_CMD_LOADB is not set
+ # CONFIG_CMD_LOADS is not set
+ # CONFIG_CMD_FPGA is not set
+-# CONFIG_CMD_ECHO is not set
+ # CONFIG_CMD_ITEST is not set
+ # CONFIG_CMD_SETEXPR is not set
+ # CONFIG_CMD_NFS is not set
 diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
 index 38ac4ed..993398c 100644
 --- a/include/configs/vexpress_ca9x4.h
@@ -53,7 +70,7 @@ index 38ac4ed..993398c 100644
  
  #endif /* VEXPRESS_CA9X4_H */
 diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
-index db78c85..1dd069b 100644
+index 0c1da01..72850d0 100644
 --- a/include/configs/vexpress_common.h
 +++ b/include/configs/vexpress_common.h
 @@ -123,7 +123,6 @@
@@ -64,16 +81,15 @@ index db78c85..1dd069b 100644
  
  /* Size of malloc() pool */
  #define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 128 * 1024)
-@@ -152,6 +151,8 @@
+@@ -152,6 +151,7 @@
  #define CONFIG_SYS_SERIAL0		V2M_UART0
  #define CONFIG_SYS_SERIAL1		V2M_UART1
  
 +#include <config_distro_defaults.h>
-+#include <config_cmd_default.h>
  /* Command line configuration */
- #define CONFIG_CMD_BDI
  #define CONFIG_CMD_DHCP
-@@ -169,7 +170,6 @@
+ #define CONFIG_CMD_PXE
+@@ -163,7 +163,6 @@
  #define CONFIG_SUPPORT_RAW_INITRD
  
  #define CONFIG_CMD_FAT
@@ -81,7 +97,7 @@ index db78c85..1dd069b 100644
  #define CONFIG_MMC			1
  #define CONFIG_CMD_MMC
  #define CONFIG_GENERIC_MMC
-@@ -207,17 +207,28 @@
+@@ -201,17 +200,28 @@
  					 GENERATED_GBL_DATA_SIZE)
  #define CONFIG_SYS_INIT_SP_ADDR		CONFIG_SYS_GBL_DATA_OFFSET
  
@@ -118,7 +134,7 @@ index db78c85..1dd069b 100644
  #elif defined(CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP)
  #define CONFIG_PLATFORM_ENV_SETTINGS \
  		"loadaddr=0xa0008000\0" \
-@@ -240,7 +251,8 @@
+@@ -234,7 +244,8 @@
  			"devtmpfs.mount=0  vmalloc=256M\0" \
  		"bootflash=run flashargs; " \
  			"cp ${ramdisk_addr} ${ramdisk_addr_r} ${maxramdisk}; " \
@@ -128,14 +144,14 @@ index db78c85..1dd069b 100644
  
  /* FLASH and environment organization */
  #define PHYS_FLASH_SIZE			0x04000000	/* 64MB */
-@@ -294,7 +306,6 @@
+@@ -287,7 +298,6 @@
+ 
  #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE /* Boot args buffer */
- #define CONFIG_CMD_SOURCE
  #define CONFIG_SYS_LONGHELP
 -#define CONFIG_CMDLINE_EDITING		1
  #define CONFIG_SYS_MAXARGS		16	/* max command args */
  
  #endif /* VEXPRESS_COMMON_H */
 -- 
-2.4.4
+2.4.5
 
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 23f8b0e16e3d..668bbf7d5718 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -647,7 +647,10 @@ rec {
     buildInputs = [ which ];
 
     buildPhase = ''
-      sed -i 's/vimproc_mac\.so/vimproc_unix\.so/' autoload/vimproc.vim
+      substituteInPlace autoload/vimproc.vim \
+        --replace vimproc_mac.so vimproc_unix.so \
+        --replace vimproc_linux64.so vimproc_unix.so \
+        --replace vimproc_linux32.so vimproc_unix.so
       make -f make_unix.mak
     '';
   };
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index f68b436bed1c..22413b2ed314 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , autoconf, automake, libtool, makeWrapper
-, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext
+, perl, bison, flex, glibc, gettext, which, rpm, LocaleGettext
 , bash, pam, TermReadKey, RpcXML, swig, python}:
 stdenv.mkDerivation rec {
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoconf automake libtool perl bison flex gettext which rpm tetex
+    autoconf automake libtool perl bison flex gettext which rpm
     LocaleGettext pam TermReadKey RpcXML swig makeWrapper python ];
 
   prePatch = ''
diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index b76ce583b23c..2db57ecef92a 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "ipset-6.24";
+  name = "ipset-6.26";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${name}.tar.bz2";
-    sha256 = "1l4mx78473azf7cb19fxf37gmj95k1zzabimbcmlg9h07wlgqw9h";
+    sha256 = "0lbsg1fbiw9m959lgqziyivmx32z3vbnp3jhgnprkq31ia7a29kn";
   };
 
-  buildInputs = [ pkgconfig libmnl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libmnl ];
 
   configureFlags = [ "--with-kmod=no" ];
 
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 904aebd75be5..8146f4a5decb 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.46";
+  version = "3.12.47";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "01w0b1sifzivbagm724bz0mlfrm7hpbj5a3lx1yrv8xg64gni3m1";
+    sha256 = "0mcchrm79zjsnxvwf1v3glhv0zs4dszi9qwhmnws3dqxaj9brgyn";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index aa1b197e83ff..c6ca6d21d2d0 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "123"; in
+let version = "124"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0hrpqx0wfwribzm3j132k0869xbh5wa89pzhwcych5w2w0n2i890";
+    sha256 = "02yqf9vcbkw9kpl0dl619scb9njkwklspvr5mhjb307004b71qqd";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";
diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index e5e579081f67..99f52dc5aed3 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.5";
+  version = "0.6.2";
   name = "reptyr-${version}";
   src = fetchurl {
     url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz";
-    sha256 = "077cvjjf534nxh7qqisw27a0wa61mdgyik43k50f8v090rggz2xm";
+    sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7";
   };
   makeFlags = ["PREFIX=$(out)"];
   meta = {
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 5b6ff15cb10a..efa70875549f 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
-, libzrtpcpp }:
+, libzrtpcpp, gcc48 }:
 
 stdenv.mkDerivation rec {
   name = "freeswitch-1.2.3";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
-    libzrtpcpp ];
+    libzrtpcpp gcc48 ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
 
diff --git a/pkgs/servers/softether/4.18.nix b/pkgs/servers/softether/4.18.nix
new file mode 100644
index 000000000000..4b5b67cf85b2
--- /dev/null
+++ b/pkgs/servers/softether/4.18.nix
@@ -0,0 +1,53 @@
+{ stdenv, fetchurl
+, openssl, readline, ncurses, zlib }:
+
+let
+  os = if stdenv.isLinux then "1"
+       else if stdenv.isFreeBSD then "2"
+       else if stdenv.isSunOS then "3"
+       else if stdenv.isDarwin then "4"
+       else if stdenv.isOpenBSD then "5"
+       else "";
+  cpuBits = if stdenv.is64bit then "2" else "1";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "softether-${version}";
+  version = "4.18";
+  build = "9570";
+  compiledDate = "2015.07.26";
+  dataDir = "/var/lib/softether";
+
+  src = fetchurl {
+    url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
+    sha256 = "585d61e524d3cad90806cbeb52ebe54b5144359e6c44676e8e7fb5683ffd4574";
+  };
+
+  buildInputs = [ openssl readline ncurses zlib ];
+
+  preConfigure = ''
+      echo "${os}
+      ${cpuBits}
+      " | ./configure
+      rm configure
+  '';
+
+  buildPhase = ''
+      mkdir -p $out/bin
+      sed -i \
+          -e "/INSTALL_BINDIR=/s|/usr/bin|/bin|g" \
+          -e "/_DIR=/s|/usr|${dataDir}|g" \
+          -e "s|\$(INSTALL|$out/\$(INSTALL|g" \
+          -e "/echo/s|echo $out/|echo |g" \
+          Makefile
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An Open-Source Free Cross-platform Multi-protocol VPN Program";
+    homepage = https://www.softether.org/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.rick68 ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index fe7bec54ba02..249e4845bc28 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -27,7 +27,7 @@ let
     lib.lists.all (license:
       let l = lib.licenses.${license.shortName or "BROKEN"} or false; in
       if license == l then true else
-        throw ''‘${builtins.toJSON license}’ is not an attribute of lib.licenses''
+        throw ''‘${showLicense license}’ is not an attribute of lib.licenses''
     ) list;
 
   mutuallyExclusive = a: b:
@@ -73,6 +73,8 @@ let
     isUnfree (lib.lists.toList attrs.meta.license) &&
     !allowUnfreePredicate attrs;
 
+  showLicense = license: license.shortName or "unknown";
+
   defaultNativeBuildInputs = extraBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
@@ -121,9 +123,9 @@ let
 
       licenseAllowed = attrs:
         if hasDeniedUnfreeLicense attrs && !(hasWhitelistedLicense attrs) then
-          throwEvalHelp "Unfree" "has an unfree license ‘${builtins.toJSON attrs.meta.license}’ which is not whitelisted"
+          throwEvalHelp "Unfree" "has an unfree license (‘${showLicense attrs.meta.license}’)"
         else if hasBlacklistedLicense attrs then
-          throwEvalHelp "blacklisted" "has the ‘${builtins.toJSON attrs.meta.license}’ license which is blacklisted"
+          throwEvalHelp "blacklisted" "has a blacklisted license (‘${showLicense attrs.meta.license}’)"
         else if !allowBroken && attrs.meta.broken or false then
           throwEvalHelp "Broken" "is marked as broken"
         else if !allowBroken && attrs.meta.platforms or null != null && !lib.lists.elem result.system attrs.meta.platforms then
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index adfdad1f9b1f..c5fbf621e2de 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, python27, python27Packages, makeWrapper}:
 
 stdenv.mkDerivation rec {
-  version = "0.9.65";
+  version = "0.9.74";
   name = "google-cloud-sdk-${version}";
 
   src = fetchurl {
-    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150619081534.tar.gz";
-    sha256 = "10158kyihkmwmb6i8n0fh1dzjvqs8xpwqp6i9xfaxsr2yzxdkqs2";
+    url = "https://dl.google.com/dl/cloudsdk/release/packages/google-cloud-sdk-coretools-linux-static-20150817103450.tar.gz";
+    sha256 = "0qdry40xk23c6dvr6qzqn23bg8yfflm1m00gw1mqnpr4m1425vfg";
   };
 
   buildInputs = [python27 makeWrapper];
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index 7537451595f8..e2857eed7d86 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,6 +1,11 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 let
+  bashCompletion = fetchurl {
+    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
+    sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
+  };
+
   zshCompletion = fetchurl {
     url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
     sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
@@ -8,20 +13,18 @@ let
 in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
-  version = "1.0.36.1";
+  version = "1.0.35";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
-    sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
+    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
   };
 
-  preConfigure = ''
-    configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
-  '';
-
   postInstall = ''
     # Install some handy-dandy shell completions
-    install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
+    mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions
+    cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
+    cp ${zshCompletion}  $out/share/zsh/site-functions/_tarsnap
   '';
 
   buildInputs = [ openssl zlib e2fsprogs ];
diff --git a/pkgs/tools/filesystems/ceph/0.94-pre.nix b/pkgs/tools/filesystems/ceph/0.94-pre.nix
deleted file mode 100644
index fcf57526fd1c..000000000000
--- a/pkgs/tools/filesystems/ceph/0.94-pre.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ callPackage, fetchgit, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "0.94.3";
-
-  src = fetchgit {
-    url = "https://github.com/wkennington/ceph.git";
-    rev = "6218aa41e04533f0d6e62b5c7be591c2e99716ec";
-    sha256 = "0cyl5i1q6lap5a6vk8fjxfpikhxzwm9zkybg37nibahi2bwjr7rr";
-  };
-
-  patches = [ ./fix-pgrefdebugging.patch ];
-})
diff --git a/pkgs/tools/filesystems/ceph/0.94.nix b/pkgs/tools/filesystems/ceph/0.94.nix
index 4dca90e5f273..f564e28c5a3b 100644
--- a/pkgs/tools/filesystems/ceph/0.94.nix
+++ b/pkgs/tools/filesystems/ceph/0.94.nix
@@ -1,16 +1,13 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "0.94.2";
+  version = "0.94.3";
 
   src = fetchgit {
     url = "https://github.com/ceph/ceph.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1nhqzmxv7bz93b8rbd88wgmw9icm2lhmc94dfscgh23kfpipyd6l";
+    sha256 = "020khb9978wayi4jnx7f9g1fzfg3r2xn9qw66snpd3k8w2dmycxy";
   };
 
-  patches = [
-    ./fix-pgrefdebugging.patch
-    ./boost-158.patch
-  ];
+  patches = [ ./fix-pgrefdebugging.patch ];
 })
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 1f616d8d9af1..4a3b90f56d8f 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,23 +1,22 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20150722";
+  name = "parallel-20150822";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0jpklc4awr5z6slgn7xjhrcpk6i8jp9mwhkkaczikvbaqzbyabkx";
+    sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d";
   };
 
-  patchPhase =
-    '' sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
-    '';
+  patchPhase = ''
+    sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g'
+  '';
 
-  preBuild =
-    # The `sem' program wants to write to `~/.parallel'.
-    '' export HOME="$PWD"
-    '';
+  # The `sem' program wants to write to `~/.parallel'.
+  preBuild = ''
+    export HOME="$PWD"
+  '';
 
-  buildInputs = [ perl ];
   doCheck = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index d84d00e2ba2c..32f6312a798f 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.10.2015.05.24";
+  version = "0.10.2015.08.24";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "0dzd5n4zvrplvm3sx017ym7jlngp4pn8nra9qx9n4wq6h4c6n6a5";
+    sha256 = "1w5jknqdlyw60pxx1wmx2xqkp968r9m3xdgm95ls1pjjp0pm047c";
   };
 
   pythonPaths = [ pycrypto ];
diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix
index 04f3a31aa48a..cc51af22f851 100644
--- a/pkgs/tools/misc/umlet/default.nix
+++ b/pkgs/tools/misc/umlet/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   major = "13";
-  minor = "2";
+  minor = "3";
   version = "${major}.${minor}";
   name = "umlet-${version}";
 
   src = fetchurl {
     url = "http://www.umlet.com/umlet_${major}_${minor}/umlet_${version}.zip";
-    sha256 = "19jngb2sr212lh3yi43bqq2skhd9cxa8yfbfc3i6fbm2v0b7i2xf";
+    sha256 = "0fbr51xknk98qz576lcl25qz0s1snns2yb0j54d77xkw7pnxmvzr";
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index 16a54c819464..33c9489a70d0 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -1,52 +1,27 @@
-x@{builderDefsPackage
-  , libX11, xproto, libXt, libICE
-  , libSM, libXext
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{ stdenv, fetchurl, libX11, xproto, libXt, libICE, libSM, libXext }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="xdaliclock";
-    version = "2.43";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="http://www.jwz.org/${project}/${name}.tar.gz";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
+stdenv.mkDerivation rec {
+  name = "xdaliclock-${version}";
+  version = "2.43";
+
+  src = fetchurl {
+    url="http://www.jwz.org/xdaliclock/${name}.tar.gz";
     sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "prepareDirs" "doMakeInstall"];
+  sourceRoot = "${name}/X11";
 
-  prepareDirs = a.fullDepEntry ''
-    mkdir -p "$out/bin" "$out/share" "$out/share/man/man1"
-  '' ["minInit" "defEnsureDir"];
+  buildInputs = [ libX11 xproto libXt libICE libSM libXext ];
 
-  goSrcDir = "cd X11";
+  preInstall = ''
+    mkdir -vp $out/bin $out/share/man/man1
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A clock application that morphs digits when they are changed";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux ++ freebsd;
-    license = a.lib.licenses.free; #TODO BSD on Gentoo, looks like MIT
-    downloadPage = "http://www.jwz.org/xdaliclock/";
-    inherit version;
-    updateWalker = true;
+    maintainers = with maintainers; [ raskin rycee ];
+    platforms = with platforms; linux ++ freebsd;
+    license = licenses.free; #TODO BSD on Gentoo, looks like MIT
+    downloadPage = http://www.jwz.org/xdaliclock/;
   };
-}) x
+}
diff --git a/pkgs/tools/networking/fuppes/default.nix b/pkgs/tools/networking/fuppes/default.nix
index 711c3516bda2..67e3b581f24f 100644
--- a/pkgs/tools/networking/fuppes/default.nix
+++ b/pkgs/tools/networking/fuppes/default.nix
@@ -50,5 +50,7 @@ stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.pierron ];
     platforms = stdenv.lib.platforms.all;
+
+    broken = true;
   };
 }
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 9dd16be41546..b2bf65ff9eea 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.6";
+  name = "openvpn-2.3.8";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "09jvxr4wcsmk55gqv3cblm60kzs9ripv9h4y50d1lbn177zx5bkv";
+    sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;
diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix
index 2835c9016ab4..0181f1891c6b 100644
--- a/pkgs/tools/networking/proxychains/default.nix
+++ b/pkgs/tools/networking/proxychains/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation {
     description = "Proxifier for SOCKS proxies";
     homepage = http://proxychains.sourceforge.net;
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index b08edaa0fc67..c6a456e202ab 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, openssl, lzo, zlib, gcc }:
+{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.0.2";
+  version = "1.0.4";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "002ay4f6l9h79j1708klwjvinsv6asv24a0hql85jq27587sv6mq";
+    sha256 = "1klnsjajlas71flbf6w2q3iqhhqrmzqpd2g4qw9my66l7kcsbxfd";
   };
 
   preConfigure = ''
@@ -16,12 +16,16 @@ stdenv.mkDerivation rec {
           --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc";
       substituteInPlace ./make-linux.mk \
           --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++";
+      substituteInPlace ./osdep/LinuxEthernetTap.cpp \
+          --replace '/sbin/ip' "${iproute}/bin/ip"
   '';
 
-  buildInputs = [ openssl lzo zlib gcc ];
+  buildInputs = [ openssl lzo zlib gcc iproute ];
 
   installPhase = ''
     installBin zerotier-one
+    ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool
+    ln -s $out/bin/zerotier-one $out/bin/zerotier-cli
   '';
 
   meta = {
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 2131a5bad868..023ceef40f23 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -1,23 +1,34 @@
 source $stdenv/setup
 
-tar xvfz $src
+export PLAN9=$out/plan9
 
-cd plan9port
+configurePhase()
+{
+    echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
+    echo X11=\"${libXt}/include\" >> LOCAL.config
 
-echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
-echo X11=\"${libXt}/include\" >> LOCAL.config
+    for f in `grep -l -r /usr/local/plan9`; do
+        sed "s,/usr/local/plan9,${PLAN9},g" -i $f
+    done
+}
 
-for p in $patches; do
-  echo "applying patch $p"
-  patch -p1 < $p
-done
+buildPhase()
+{
+    mkdir -p $PLAN9
+    ./INSTALL -b $PLAN9
+}
 
-export PLAN9=$out/plan9
-mkdir -p $PLAN9
+installPhase()
+{
+    ./INSTALL -c -r $PLAN9
+    # Copy sources
+    cp -R * $PLAN9
 
-for f in `grep -l -r /usr/local/plan9`; do
-  sed "s,/usr/local/plan9,${PLAN9},g" -i $f
-done
+    # Copy the `9' utility. This way you can use
+    # $ 9 awk
+    # to use the plan 9 awk
+    mkdir $out/bin
+    ln -s $PLAN9/bin/9 $out/bin
+}
 
-./INSTALL -r $PLAN9
-cp -R * $PLAN9
+genericBuild
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index ca248da56cf1..86ce1f14a8c5 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, which, libX11, libXt, fontconfig
+{stdenv, fetchgit, which, libX11, libXt, fontconfig
 , xproto ? null
 , xextproto ? null
 , libXext ? null }:
 
 stdenv.mkDerivation rec {
-  name = "plan9port-20140306";
+  name = "plan9port-2015-06-29";
+
+  src = fetchgit {
+    # Latest, same as on github, google code is old
+    url = "https://plan9port.googlesource.com/plan9";
+    rev = "71de840";
+    sha256 = "1ffece7c0a5775a8bde6a0618c7ae3da4048449008a19e6623e8e5553f133b4c";
+  };
 
   patches = [ ./fontsrv.patch ];
   postPatch =
@@ -15,13 +22,6 @@ stdenv.mkDerivation rec {
 
   builder = ./builder.sh;
 
-  src = fetchurl {
-    url = "https://plan9port.googlecode.com/files/${name}.tgz";
-    # Google code is much faster than swtch
-    # url = "http://swtch.com/plan9port/${name}.tgz";
-    sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b";
-  };
-
   NIX_LDFLAGS="-lgcc_s";
   buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "http://swtch.com/plan9port/";
     description = "Plan 9 from User Space";
     license = licenses.lpl-102;
-    maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ];
+    maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx kovirobi ];
     platforms = platforms.unix;
   };
 
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index cabb931c4470..944b4221844a 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "html-xml-utils-6.4";
+  name = "html-xml-utils-6.9";
 
   src = fetchurl {
     url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
 
-    sha256 = "0dqa8vjk5my728hmb7dhl6nbg7946fh905j0yzlwx7p7rg2zrxcp";
+    sha256 = "1cpshwz60h7xsw1rvv84jl4bn9zjqii9hb8zvwm7a0fahkf03x4w";
   };
 
-  patches = [ ./no-Boolean-type.patch ];
-
   meta = {
     description = "Utilities for manipulating HTML and XML files";
     homepage = http://www.w3.org/Tools/HTML-XML-utils/;
diff --git a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch b/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch
deleted file mode 100644
index f675c4280e78..000000000000
--- a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur html-xml-utils-6.4-orig/openurl.c html-xml-utils-6.4/openurl.c
---- html-xml-utils-6.4-orig/openurl.c	2012-10-23 09:55:12.000000000 -0400
-+++ html-xml-utils-6.4/openurl.c	2013-10-17 14:05:11.424077842 -0400
-@@ -66,6 +66,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <assert.h>
-+#include <stdbool.h>
- #include "export.h"
- #if HAVE_LIBCURL && !HAVE_FOPENCOOKIE
- # include "fopencookie.e"	/* Use our own fopencookie() */
-@@ -505,7 +506,7 @@
- 			const conststring path, Dictionary request,
- 			Dictionary response, int maxredirs, int *status)
- {
--  Boolean delete_response = !response;
-+  bool delete_response = !response;
-   conststring h, v;
-   char buf[BUFLEN];
-   int fd, n, i;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83edf273f82e..b19e384f823f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -296,7 +296,7 @@ let
 
   buildFHSUserEnv = args: userFHSEnv {
     env = buildFHSEnv (removeAttrs args [ "runScript" ]);
-    runScript = args.runScript;
+    runScript = args.runScript or "bash";
   };
 
   buildMaven = callPackage ../build-support/build-maven.nix {};
@@ -1068,7 +1068,6 @@ let
   libceph = ceph.lib;
   ceph-0_80 = callPackage ../tools/filesystems/ceph/0.80.nix { };
   ceph-0_94 = callPackage ../tools/filesystems/ceph/0.94.nix { };
-  ceph-0_94-pre = callPackage ../tools/filesystems/ceph/0.94-pre.nix { };
   ceph = callPackage ../tools/filesystems/ceph { };
   ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { });
   ceph-git = lowPrio (callPackage ../tools/filesystems/ceph/git.nix { });
@@ -1244,6 +1243,8 @@ let
 
   cutter = callPackage ../tools/networking/cutter { };
 
+  cvs_fast_export = callPackage ../applications/version-management/cvs-fast-export { };
+
   dadadodo = callPackage ../tools/text/dadadodo { };
 
   daemonize = callPackage ../tools/system/daemonize { };
@@ -1346,7 +1347,7 @@ let
 
   doomseeker = callPackage ../applications/misc/doomseeker { };
 
-  drive = callPackage ../applications/networking/drive { };
+  drive = callPackage ../applications/networking/drive { goPackages = go14Packages; };
 
   driftnet = callPackage ../tools/networking/driftnet {};
 
@@ -2081,7 +2082,7 @@ let
 
   iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; };
 
-  npm2nix = nodePackages_0_10.npm2nix;
+  npm2nix = nodePackages.npm2nix;
 
   ldapvi = callPackage ../tools/misc/ldapvi { };
 
@@ -2842,6 +2843,8 @@ let
 
   replace = callPackage ../tools/text/replace { };
 
+  reposurgeon = callPackage ../applications/version-management/reposurgeon { };
+
   reptyr = callPackage ../os-specific/linux/reptyr {};
 
   rescuetime = callPackage ../applications/misc/rescuetime { };
@@ -2885,6 +2888,8 @@ let
 
   rockbox_utility = callPackage ../tools/misc/rockbox-utility { };
 
+  rosegarden = callPackage ../applications/audio/rosegarden { };
+
   rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) {
     inherit ppp;
   };
@@ -3042,6 +3047,9 @@ let
 
   socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { });
 
+  softether_4_18 = callPackage ../servers/softether/4.18.nix { };
+  softether = softether_4_18;
+
   sourceHighlight = callPackage ../tools/text/source-highlight { };
 
   spaceFM = callPackage ../applications/misc/spacefm { };
@@ -3735,7 +3743,11 @@ let
 
   cmucl_binary = callPackage ../development/compilers/cmucl/binary.nix { };
 
-  compcert = callPackage ../development/compilers/compcert {};
+  compcert = callPackage ../development/compilers/compcert (
+    if system == "x86_64-linux"
+    then { tools = pkgsi686Linux.stdenv.cc; }
+    else {}
+  );
 
   cryptol = haskellPackages.cryptol;
 
@@ -6093,6 +6105,8 @@ let
 
   cryptopp = callPackage ../development/libraries/crypto++ { };
 
+  cwiid = callPackage ../development/libraries/cwiid { };
+
   cyrus_sasl = callPackage ../development/libraries/cyrus-sasl { };
 
   # Make bdb5 the default as it is the last release under the custom
@@ -6261,6 +6275,10 @@ let
   freealut = callPackage ../development/libraries/freealut { };
 
   freeglut = callPackage ../development/libraries/freeglut { };
+  
+  freenect = callPackage ../development/libraries/freenect { 
+      inherit (xlibs) libXi libXmu;
+  };
 
   freetype = callPackage ../development/libraries/freetype { };
 
@@ -6774,6 +6792,8 @@ let
 
   libavc1394 = callPackage ../development/libraries/libavc1394 { };
 
+  libb2 = callPackage ../development/libraries/libb2 { };
+
   libbluedevil = callPackage ../development/libraries/libbluedevil { };
 
   libbdplus = callPackage ../development/libraries/libbdplus { };
@@ -7086,7 +7106,7 @@ let
 
   libplist = callPackage ../development/libraries/libplist { };
 
-  libQGLViewer = callPackage ../development/libraries/libqglviewer { };
+  libqglviewer = callPackage ../development/libraries/libqglviewer { };
 
   libre = callPackage ../development/libraries/libre {};
   librem = callPackage ../development/libraries/librem {};
@@ -7562,6 +7582,8 @@ let
   # failed to build
   mediastreamer = callPackage ../development/libraries/mediastreamer { };
 
+  mediastreamer-openh264 = callPackage ../development/libraries/mediastreamer/msopenh264.nix { };
+
   menu-cache = callPackage ../development/libraries/menu-cache { };
 
   mesaSupported = lib.elem system lib.platforms.mesaPlatforms;
@@ -7774,6 +7796,8 @@ let
 
   opal = callPackage ../development/libraries/opal {};
 
+  openh264 = callPackage ../development/libraries/openh264 { };
+
   openjpeg_1 = callPackage ../development/libraries/openjpeg/1.x.nix { };
   openjpeg_2_0 = callPackage ../development/libraries/openjpeg/2.0.nix { };
   openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { };
@@ -8898,8 +8922,8 @@ let
 
   bird = callPackage ../servers/bird { };
 
-  bosun = callPackage ../servers/monitoring/bosun {};
-  scollector = callPackage ../servers/monitoring/bosun/scollector.nix {};
+  bosun = callPackage ../servers/monitoring/bosun { goPackages = go14Packages; };
+  scollector = callPackage ../servers/monitoring/bosun/scollector.nix { goPackages = go14Packages; };
 
   charybdis = callPackage ../servers/irc/charybdis {};
 
@@ -10247,7 +10271,7 @@ let
   ubootJetsonTK1 = callPackage ../misc/uboot {
     defconfig = "jetson-tk1_defconfig";
     targetPlatforms = ["armv7l-linux"];
-    filesToInstall = ["u-boot-dtb-tegra.bin"];
+    filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
   };
 
   ubootPcduino3Nano = callPackage ../misc/uboot {
@@ -10486,14 +10510,14 @@ let
 
   docbook_xml_ebnf_dtd = callPackage ../data/sgml+xml/schemas/xml-dtd/docbook-ebnf { };
 
-  docbook_xml_xslt = docbook_xsl;
+  inherit (callPackages ../data/sgml+xml/stylesheets/xslt/docbook-xsl { })
+    docbook_xsl
+    docbook_xsl_ns;
 
-  docbook_xsl = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl { };
+  docbook_xml_xslt = docbook_xsl;
 
   docbook5_xsl = docbook_xsl_ns;
 
-  docbook_xsl_ns = callPackage ../data/sgml+xml/stylesheets/xslt/docbook-xsl-ns { };
-
   dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };
 
   eb-garamond = callPackage ../data/fonts/eb-garamond { };
@@ -10755,6 +10779,8 @@ let
 
   arora = callPackage ../applications/networking/browsers/arora { };
 
+  artha = callPackage ../applications/misc/artha { };
+
   atom = callPackage ../applications/editors/atom {
     gconf = gnome.GConf;
   };
@@ -11071,7 +11097,7 @@ let
   dmtx-utils = callPackage (import ../tools/graphics/dmtx-utils) {
   };
 
-  docker = callPackage ../applications/virtualization/docker { };
+  docker = callPackage ../applications/virtualization/docker { go = go_1_4; };
 
   doodle = callPackage ../applications/search/doodle { };
 
@@ -12315,6 +12341,8 @@ let
 
   ncdc = callPackage ../applications/networking/p2p/ncdc { };
 
+  ne = callPackage ../applications/editors/ne { };
+
   nedit = callPackage ../applications/editors/nedit {
     motif = lesstif;
   };
@@ -12528,6 +12556,8 @@ let
 
   QmidiNet = callPackage ../applications/audio/QmidiNet { };
 
+  qmidiroute = callPackage ../applications/audio/qmidiroute { };
+
   qmmp = callPackage ../applications/audio/qmmp { };
 
   qrcode = callPackage ../tools/graphics/qrcode {};
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 470548ed6b77..7c319e365178 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -118,11 +118,11 @@ let
   };
 
   tools = buildFromGitHub {
-    rev = "93604a3dc2a5ae0168456c672ec35cc90ea881e6";
-    date = "2015-08-19";
+    rev = "b48dc8da98ae78c3d11f220e7d327304c84e623a";
+    date = "2015-08-24";
     owner = "golang";
     repo = "tools";
-    sha256 = "1yd3hwsbsjrmx85nihss55wy91y8sld7p0599j5k9xi0n1mrxdci";
+    sha256 = "187p3jjxrw2qjnzqwwrq7f9w10zh6vcnwnfl3q7ms8rbiffpjy5c";
     goPackagePath = "golang.org/x/tools";
     goPackageAliases = [ "code.google.com/p/go.tools" ];
 
@@ -136,7 +136,9 @@ let
       export GOTOOLDIR=$out/bin
     '';
 
-    excludedPackages = "testdata";
+    excludedPackages = "\\("
+      + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ])
+      + "\\)";
 
     buildInputs = [ net ];
 
@@ -327,10 +329,10 @@ let
   };
 
   cli-go = buildFromGitHub {
-    rev    = "v1.2.0";
+    rev    = "142e6cd241a4dfbf7f07a018f1f8225180018da4";
     owner  = "codegangsta";
     repo   = "cli";
-    sha256 = "1axcpc8wgs0b66dpl36pz97pqbxkgvvbwz1b6rf7gl103jqpii40";
+    sha256 = "1w8naax4gvkkxw5h31a2c2dwniw5hj92nv0hn6ybdlavffyax9h5";
   };
 
   columnize = buildFromGitHub {
@@ -646,11 +648,11 @@ let
   };
 
   glide = buildFromGitHub {
-    rev    = "0.4.1";
+    rev    = "0.5.0";
     owner  = "Masterminds";
     repo   = "glide";
-    sha256 = "0237l8s7z1ysfkv3kmw4788fg4kjcq2sh6073bjcwynz3hldkrlr";
-    buildInputs = [ cookoo cli-go go-gypsy ];
+    sha256 = "10jg3h1zprx2ylmmcvmy94k4pw7lc9a6xfgr2ld8rih642sqg9wh";
+    buildInputs = [ cookoo cli-go go-gypsy vcs ];
   };
 
   gls = buildFromGitHub {
@@ -1531,17 +1533,12 @@ let
     sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
   };
 
-  ipfs = buildGoPackage rec {
-    rev = "952dc9c60fdff27902749222fdc30164e7eea1ee";
-    name = "ipfs-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/ipfs/go-ipfs";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "ipfs";
-      repo   = "go-ipfs";
-      sha256 = "1mlilx1i77px85jag4jwpcy8fy0vv15hsmpr1d9zvcs3b7qhskqp";
-    };
+  ipfs = buildFromGitHub{
+    rev = "ff26c312000da12d395c9cdba05c43f29b68b456";
+    owner  = "ipfs";
+    repo   = "go-ipfs";
+    sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg";
+    excludedPackages = "Godeps";
   };
 
   ldap = buildGoPackage rec {
@@ -1735,10 +1732,10 @@ let
   };
 
   mongo-tools = buildFromGitHub {
-    rev    = "621464ebd2ba0c6ee373600b0cb7fd4216405550";
+    rev    = "4fcfd3e57415de95c0c016def07b95bca63cccb4";
     owner  = "mongodb";
     repo   = "mongo-tools";
-    sha256 = "0hgh5h7bpn5xxnxgmw30fi51l4cb4g029nih8j8m0sr4if0n9vkf";
+    sha256 = "0rm7bnb81hr0byxhvagwv8an1bky882nz68cmm2kbznzyprvhyaa";
     buildInputs = [ gopass go-flags mgo openssl tomb ];
     excludedPackages = "vendor";
 
@@ -2404,6 +2401,13 @@ let
     ];
   };
 
+  vcs = buildFromGitHub {
+    rev    = "c709a4244b817af98a8ecb495ca4ab0b11f27ecd";
+    owner  = "Masterminds";
+    repo   = "vcs";
+    sha256 = "04gw4pp1f9wp36nvp9y234bmp267c4ajwcc39wa975cd89zhlhn4";
+  };
+
   vulcand = buildGoPackage rec {
     rev = "v0.8.0-beta.3";
     name = "vulcand-${rev}";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d89c0a24040..3ab9738c6c73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1343,16 +1343,16 @@ let
       maintainers = with maintainers; [ bjornfor ];
     };
   };
-  
+
   blaze = buildPythonPackage rec {
     name = "blaze-${version}";
     version = "0.8.2";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz";
       sha256 = "1abedabf2a1e62dd059e0942d60f27337763de26f5e3f61ed55baaf97723b624";
     };
-    
+
     propagatedBuildInputs = with self; [
       numpy
       pandas
@@ -1363,7 +1363,7 @@ let
       sqlalchemy9 # sqlalchemy8 should also work
       psutil
     ];
-    
+
     meta = {
       homepage = https://github.com/ContinuumIO/blaze;
       description = "Allows Python users a familiar interface to query data living in other data storage systems";
@@ -1556,7 +1556,7 @@ let
 
     patches = [ ../development/python-modules/box2d/disable-test.patch ];
 
-    propagatedBuildInputs = [ pkgs.swig pkgs.box2d ];
+    propagatedBuildInputs = [ pkgs.swig2 pkgs.box2d ];
 
     meta = {
       homepage = https://code.google.com/p/pybox2d/;
@@ -2448,7 +2448,7 @@ let
 
   cffi_0_8 = buildPythonPackage rec {
     name = "cffi-0.8.6";
- 
+
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
       sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5";
@@ -3531,6 +3531,7 @@ let
 
   gmpy = buildPythonPackage rec {
     name = "gmpy-1.17";
+    disabled = isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/g/gmpy/${name}.zip";
@@ -3550,7 +3551,8 @@ let
 
   gmpy2 = buildPythonPackage rec {
     name = "gmpy2-2.0.6";
-
+    disabled = isPyPy;
+    
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip";
       md5 = "7365d880953ba54c2cdcf171c7e19b2b";
@@ -3698,6 +3700,24 @@ let
     };
   };
 
+  hglib = buildPythonPackage rec {
+    version = "1.7";
+    name = "hglib-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-hglib/python-hglib-${version}.tar.gz";
+      sha256 = "0dc087d15b774cda82d3c8096fb0e514caeb2ddb60eed38e9056b16e279ba3c5";
+    };
+
+    meta = {
+      description = "Mercurial Python library";
+      homepage = "http://selenic.com/repo/python-hglib";
+      license = licenses.mit;
+      maintainers = with maintainers; [ dfoxfranke ];
+      platforms = platforms.all;
+    };
+  };
+
   humanize = buildPythonPackage rec {
     version = "0.5.1";
     name = "humanize-${version}";
@@ -5130,12 +5150,12 @@ let
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8.3";
+    version = "1.8.4";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "1fjv63rdm45j5057zb7qj4ya4pjwig1jpbwcr0bk1mazq3y59dib";
+      sha256 = "1n3hb80v7wl5j2mry5pfald6i9z42a9c3m9405877iqw3v49csc2";
     };
 
     # error: invalid command 'test'
@@ -5155,12 +5175,12 @@ let
 
   django_1_7 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.7.9";
+    version = "1.7.10";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz";
-      sha256 = "0q3q46yjjsqwp0ywrkbqwiac13rdvzrd5dchdbnzh3yjwpj9ygsg";
+      sha256 = "0xbwg6nyvwcbp2hvk0x3s5y823k5kizn0za1bl2rf6g6xcn7sddr";
     };
 
     # error: invalid command 'test'
@@ -5225,11 +5245,11 @@ let
 
   django_1_4 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.4.21";
+    version = "1.4.22";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz";
-      sha256 = "1x5wk3yh6ydbp4sgsxl4qjmdvcazphwkmmm99lfdb04645sijkwk";
+      sha256 = "110p1mgdcf87kyr64mr2jgmyapyg27kha74yq3wjrazwfbbwkqnh";
     };
 
     # error: invalid command 'test'
@@ -5651,7 +5671,7 @@ let
   pyfribidi = buildPythonPackage rec {
     version = "0.11.0";
     name = "pyfribidi-${version}";
-    disabled = isPy3k;
+    disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pyfribidi/${name}.zip";
@@ -8076,22 +8096,22 @@ let
   plover = pythonPackages.buildPythonPackage rec {
     name = "plover-${version}";
     version = "2.5.8";
-    
+
     meta = {
       description = "OpenSteno Plover stenography software";
       maintainers = [ maintainers.twey ];
       license = licenses.gpl2;
     };
-    
+
     src = pkgs.fetchurl {
       url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
       sha256 = "23f7824a715f93eb2c41d5bafd0c6f3adda92998e9321e1ee029abe7a6ab41e5";
     };
-    
+
     propagatedBuildInputs = with self; [ wxPython pyserial xlib appdirs pkgs.wmctrl ];
     preConfigure = "substituteInPlace setup.py --replace /usr/share usr/share";
   };
-  
+
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
     version = "0.6.6";
@@ -8386,11 +8406,17 @@ let
       nose
       modules.sqlite3
     ];
+    
+    # Test does not work on Py3k because it calls 'python'.
+    # https://github.com/nipy/nibabel/issues/341
+    preCheck = ''
+      rm nisext/tests/test_testers.py
+    '';
 
     meta = {
       homepage = http://nipy.org/nibabel/;
       description = "Access a multitude of neuroimaging data formats";
-      license = "BSD";
+      license = licenses.mit;
     };
   };
 
@@ -8608,7 +8634,7 @@ let
       url = "https://pypi.python.org/packages/source/n/numexpr/${name}.tar.gz";
       sha256 = "3ae7191c89df40db6b0a8637a4dace7c5956bc910793a53225f985f3b443c722";
     };
-    
+
     # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177
     doCheck = !isPy3k;
 
@@ -9356,17 +9382,15 @@ let
   };
 
 
-  pexpect = buildPythonPackage {
-    name = "pexpect-2.3";
+  pexpect = buildPythonPackage rec {
+    version = "3.3";
+    name = "pexpect-${version}";
 
     src = pkgs.fetchurl {
-      url = "mirror://sourceforge/pexpect/pexpect-2.3.tar.gz";
-      sha256 = "0x8bfjjqygriry1iyygm5048ykl5qpbpzqfp6i8dhkslm3ryf5fk";
+      url = "https://pypi.python.org/packages/source/p/pexpect/${name}.tar.gz";
+      sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
-
     meta = {
       homepage = http://www.noah.org/wiki/Pexpect;
       description = "Automate interactive console applications such as ssh, ftp, etc";
@@ -9415,7 +9439,7 @@ let
       sha256 = "1r34bbqbd4h72cl0cxi9w6q2nwx806wpxq220mzyiy8g45xv0ghj";
       rev = "v${version}";
       repo = "pgcli";
-      owner = "amjith";
+      owner = "dbcli";
     };
 
     propagatedBuildInputs = with self; [
@@ -9937,6 +9961,12 @@ let
       url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz";
       md5 = "a904aabfe4765cb754f2db84ec7bb03a";
     };
+
+    meta = {
+      description = "Library with cross-python path, ini-parsing, io, code, log facilities";
+      homepage = http://pylib.readthedocs.org/;
+      license = licenses.mit;
+    };
   };
 
 
@@ -11036,15 +11066,21 @@ let
   };
 
   python_fedora = buildPythonPackage (rec {
-    name = "python-fedora-0.3.33";
+    version = "0.5.5";
+    name = "python-fedora-${version}";
     meta.maintainers = with maintainers; [ mornfall ];
 
     src = pkgs.fetchurl {
-      url = "https://fedorahosted.org/releases/p/y/python-fedora/${name}.tar.gz";
-      sha256 = "1g05bh7d5d0gzrlnhpnca7jpqbgs2rgnlzzbvzzxmdbmlkqi3mws";
+      url = "https://pypi.python.org/packages/source/p/python-fedora/${name}.tar.gz";
+      sha256 = "15m8lvbb5q4rg508i4ah8my872qrq5xjwgcgca4d3kzjv2x6fhim";
     };
     propagatedBuildInputs = with self; [ kitchen requests bunch paver ];
     doCheck = false;
+
+    # https://github.com/fedora-infra/python-fedora/issues/140
+    preBuild = ''
+      sed -i '4,15d' setup.py
+    '';
   });
 
   python_simple_hipchat = buildPythonPackage rec {
@@ -12514,11 +12550,11 @@ let
 
   setuptools_scm = buildPythonPackage rec {
     name = "setuptools_scm-${version}";
-    version = "1.5.4";
+    version = "1.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://bitbucket.org/pypa/setuptools_scm/get/v${version}.tar.bz2";
-      sha256 = "0vd6xsl7r0vn5gpw87d31s195j33sqw5c26zdagimy9qzydgq6y6";
+      url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.gz";
+      sha256 = "f2f69c782b4f549003edf5b75b356b37f40a4e880b615996c5d9c117913d6f9c";
     };
 
     buildInputs = with self; [ pip ];
@@ -13652,12 +13688,12 @@ let
   };
 
   taskw = buildPythonPackage rec {
-    version = "1.0.2";
+    version = "1.0.3";
     name = "taskw-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/taskw/${name}.tar.gz";
-      sha256 = "0wa2hwplss2r56jrwib6j9sxxm02dz78878975jk9fj10p84w5kr";
+      sha256 = "1fa7bv5996ppfbryv02lpnlhk5dra63lhlwrb1i4ifqbziqfqh5n";
     };
 
     patches = [ ../development/python-modules/taskw/use-template-for-taskwarrior-install-path.patch ];
@@ -13666,6 +13702,9 @@ let
         --replace '@@taskwarrior@@' '${pkgs.taskwarrior}'
     '';
 
+    # https://github.com/ralphbean/taskw/issues/98
+    doCheck = false;
+
     buildInputs = with self; [ nose pkgs.taskwarrior tox ];
     propagatedBuildInputs = with self; [ six dateutil pytz ];
 
@@ -17241,11 +17280,11 @@ let
       maintainers = with maintainers; [ odi ];
     };
   };
-  
+
   suds = buildPythonPackage rec {
     name = "suds-0.4";
     disabled = isPy3k;
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/suds/suds-0.4.tar.gz";
       md5 = "b7502de662341ed7275b673e6bd73191";
author	William A. Kennington III <william@wkennington.com>	2015-08-28 17:55:20 -0700
committer	William A. Kennington III <william@wkennington.com>	2015-08-28 17:55:20 -0700
commit	5ca1c32a9d3705b36caef94bd8a8628a81c2d210 (patch)
tree	0baaad6405c8483726accb0b28c7aa5ffbea068b
parent	28a18999faeab25b92649027f4411e7f41d793da (diff)
parent	d2dce19793069b6104ff7df29af92316e7fe3b50 (diff)
download	nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.gz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.bz2 nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.lz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.xz nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.tar.zst nixlib-5ca1c32a9d3705b36caef94bd8a8628a81c2d210.zip